修改

Fixiaobai

2023-08-31 95831e5932a2571feaeb8cbc9bba3bfbdb1667fe

修改

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java

@@ -29,6 +29,7 @@
     * 项目id
     **/
    @TableId(type = IdType.AUTO)
    @TableField("id")
    private Integer id;

    /**

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java

@@ -10,6 +10,11 @@
@Data
public class InsProductVo implements Serializable {


    @JsonSerialize
    private Integer id;


    /**
     * 项目名称
     **/

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java

@@ -239,8 +239,10 @@
        BeanUtils.copyProperties(inspectionMaterial, inspectDetailVo);
        /*查询检验单里面的检验项目,并封装到RawInspectVo对象中*/
        LambdaQueryWrapper<InspectionProduct> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
        queryWrapper
                .eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
        List<InspectionProduct> inspectionProducts = inspectionProductMapper.selectList(queryWrapper);
        System.out.println(inspectionProducts);
        //这里查到的设备id和检验员id要查询名称
        List<InsProductVo> insProductVos = inspectionProducts.stream().map(insProduct -> {
            //将一个对象的值赋值给另一个对象
@@ -258,6 +260,7 @@
            }
            //项目关联物料id
            insProductVo.setInspectionMaterialId(inspectionMaterial.getId());
            insProductVo.setId(insProduct.getId());
            return insProductVo;
        }).collect(Collectors.toList());
        inspectDetailVo.setInsProducts(insProductVos);

 sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java

@@ -41,7 +41,7 @@

    @SneakyThrows
    @Override
    public void run(String... args) throws Exception {
    public void run(String... args){
        log.info("容器生成之后执行");
        List<Class<?>> classList = MyClassUtil.getClassList("com.yuanchu.limslaboratory.controller");
        List<Map<String, String>> requestListInfo = new ArrayList<Map<String, String>>();

 sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java

@@ -44,11 +44,11 @@

    @Test
    void TT2(){
        String adminMD5 = SecureUtil.md5(SecureUtil.md5("admin"));
        String adminMD5 = SecureUtil.md5(SecureUtil.md5("Fixiaobai"));
        System.out.println(adminMD5);
        // 构建
        AES aes = SecureUtil.aes(adminMD5.getBytes(StandardCharsets.UTF_8));
        String admins = aes.encryptHex("admin");
        String admins = aes.encryptHex("Fixiaobai");
        System.out.println(SecureUtil.md5(admins));
    }