解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointVarCentralValue.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -27,7 +28,7 @@ public class IdxBizFanPointVarCentralValue{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId("SEQUENCE_NBR")
     private String sequenceNbr;
 
     /**
@@ -81,8 +82,8 @@ public class IdxBizFanPointVarCentralValue{
     /**
      * 
      */
-	@TableField("ANALYSIS_POINT_ID")
-    private String analysisPointId;
+//	@TableField("ANALYSIS_POINT_ID")
+//    private String analysisPointId;
 
     /**
      * 片区
@@ -135,8 +136,8 @@ public class IdxBizFanPointVarCentralValue{
     /**
      * 工况变量1ID
      */
-	@TableField("PROCESS_POINT1_ID")
-    private String processPoint1Id;
+//	@TableField("PROCESS_POINT1_ID")
+//    private String processPoint1Id;
 
     /**
      * 工况量2区间最小值
@@ -174,4 +175,39 @@ public class IdxBizFanPointVarCentralValue{
 	@TableField("PROCESS_POINT2_ID")
     private String processPoint2Id;
 
+    /**
+     * 工况变量1ID
+     */
+    @TableField("PROCESS_POINT1_ID")
+    private String processPoint1Id;
+
+    /**
+     *
+     */
+    @TableField("ANALYSIS_POINT_ID")
+    private String analysisPointId;
+
+    /**
+     * 工况变量3ID
+     */
+    @TableField("PROCESS_POINT3_NAME")
+    private String processPoint3Name;
+
+    /**
+     * 工况变量2ID
+     */
+    @TableField("PROCESS_POINT2_NAME")
+    private String processPoint2Name;
+
+    /**
+     * 工况变量1ID
+     */
+    @TableField("PROCESS_POINT1_NAME")
+    private String processPoint1Name;
+
+    /**
+     *
+     */
+    @TableField("ANALYSIS_POINT_NAME")
+    private String analysisPointName;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

@@ -80,8 +80,8 @@ public class IdxBizPvPointVarCentralValue{
     /**
      * 
      */
-	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+//	@TableField("ANALYSIS_POINT_ID")
+//    private Integer analysisPointId;
 
     /**
      * 片区
@@ -149,4 +149,45 @@ public class IdxBizPvPointVarCentralValue{
 	@TableField("EQUIPMENT_NAME")
     private String equipmentName;
 
+    /**
+     * 工况变量3ID
+     */
+    @TableField("PROCESS_POINT3_ID_NAME")
+    private String processPoint3IdName;
+
+    /**
+     * 工况变量2ID
+     */
+    @TableField("PROCESS_POINT2_ID_NAME")
+    private String processPoint2IdName;
+
+    /**
+     * 工况变量1ID
+     */
+    @TableField("PROCESS_POINT1_ID_NAME")
+    private String processPoint1IdName;
+
+    /**
+     *
+     */
+    @TableField("ANALYSIS_POINT_ID_NAME")
+    private String analysisPointIdName;
+
+    /**
+     * 工况变量3ID
+     */
+    @TableField("PROCESS_POINT3_ID")
+    private String processPoint3Id;
+
+    /**
+     * 工况变量2ID
+     */
+    @TableField("PROCESS_POINT2_ID")
+    private String processPoint2Id;
+
+    /**
+     * 工况变量1ID
+     */
+    @TableField("PROCESS_POINT1_ID")
+    private String processPoint1Id;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -70,7 +70,7 @@ public class CommonServiceImpl {
     String gkzxzjskey2;
 
     //----------------健康指数值计算相关请求属性配置------------------------
-    @Value("${jkzsjs.url:d6c175af-50e2-4ea9-9006-f091cdfe203e}")
+    @Value("${jkzsjs.url:80538a37-2c68-431b-9aa1-bcab88d88f9e}")
     String jkzsjsurl;
 
 
@@ -95,7 +95,8 @@ public class CommonServiceImpl {
     @Autowired
     IdxBizFanPointVarCentralValueMapper idxBizFanPointVarCentralValueMapper;
 
-
+    @Autowired
+    IdxBizPvPointVarCentralValueMapper idxBizPvPointVarCentralValueMapper;
 
     /**
      * @return
@@ -510,6 +511,30 @@ public class CommonServiceImpl {
             realParams.put(gkzxzjskey2, requestParams);
             logger.info("------------------------------风机中心值------请求参数---------------------------------------" + JSON.toJSONString(realParams));
             String response = HttpUtil.createPost(baseUrl + gkzxzjsurlfan).body(JSON.toJSONString(realParams)).execute().body();
+            List<IdxBizFanPointVarCentralValue> anaylseList  = idxBizFanPointVarCentralValueMapper.selectList(new QueryWrapper<IdxBizFanPointVarCentralValue>().eq("ANALYSIS_POINT_ID",IdxBizFanPointProcessVariableClassification.getSequenceNbr().toString()));
+            List<IdxBizFanPointVarCentralValue> precessList1  = idxBizFanPointVarCentralValueMapper.selectList(new QueryWrapper<IdxBizFanPointVarCentralValue>().eq("PROCESS_POINT1_ID",list.get(0).getProcessPointId()));
+            List<IdxBizFanPointVarCentralValue> precessList2  = idxBizFanPointVarCentralValueMapper.selectList(new QueryWrapper<IdxBizFanPointVarCentralValue>().eq("PROCESS_POINT2_ID",list.get(1).getProcessPointId()));
+            List<IdxBizFanPointVarCentralValue> precessList3  = idxBizFanPointVarCentralValueMapper.selectList(new QueryWrapper<IdxBizFanPointVarCentralValue>().eq("PROCESS_POINT3_ID",list.get(2).getProcessPointId()));
+            for (int i = 0; i < anaylseList.size(); i++) {
+                IdxBizFanPointVarCentralValue idxBizFanPointVarCentralValue =anaylseList.get(i);
+                idxBizFanPointVarCentralValue.setAnalysisPointName(IdxBizFanPointProcessVariableClassification.getPointName());
+                idxBizFanPointVarCentralValueMapper.updateById(idxBizFanPointVarCentralValue);
+            }
+            for (int i = 0; i < precessList1.size(); i++) {
+                IdxBizFanPointVarCentralValue idxBizFanPointVarCentralValue =precessList1.get(i);
+                idxBizFanPointVarCentralValue.setProcessPoint1Name(idxBizFanPointProcessVariableClassificationList.get(2).getPointName());
+                idxBizFanPointVarCentralValueMapper.updateById(idxBizFanPointVarCentralValue);
+            }
+            for (int i = 0; i < precessList2.size(); i++) {
+                IdxBizFanPointVarCentralValue idxBizFanPointVarCentralValue =precessList2.get(i);
+                idxBizFanPointVarCentralValue.setProcessPoint2Name(idxBizFanPointProcessVariableClassificationList.get(1).getPointName());
+                idxBizFanPointVarCentralValueMapper.updateById(idxBizFanPointVarCentralValue);
+            }
+            for (int i = 0; i < precessList3.size(); i++) {
+                IdxBizFanPointVarCentralValue idxBizFanPointVarCentralValue =precessList3.get(i);
+                idxBizFanPointVarCentralValue.setProcessPoint3Name(idxBizFanPointProcessVariableClassificationList.get(0).getPointName());
+                idxBizFanPointVarCentralValueMapper.updateById(idxBizFanPointVarCentralValue);
+            }
             try {
                 logger.info("------------------风机中心值--repsonse： " + response);
                 TimeUnit.SECONDS.sleep(zxzsleepTime);
@@ -758,10 +783,10 @@ public class CommonServiceImpl {
             if (idxBizUhef.getProcess1Min() <= value1 && value1 <= idxBizUhef.getProcess1Max() &&
                     idxBizUhef.getProcess2Min() <= value2 && value2 <= idxBizUhef.getPorcess2Max() &&
                     idxBizUhef.getProcess3Min() <= value3 && value3 <= idxBizUhef.getProcess3Max()){
-                map.put("analysVariable",value4);
+                map.put("analysisVariable",value4);
                 map.put("stdDev",idxBizUhef.getAnalysisStdDev());
                 map.put("centerValue",idxBizUhef.getAnalysisCenterValue());
-                map.put("analysVariableId",idxBizUhef.getAnalysisPointId());
+                map.put("analysisVariableId",idxBizUhef.getAnalysisPointId());
                 resultMap.put(idxBizUhef.getAnalysisPointId(),map);
             }
         }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -144,7 +144,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> list2 = new ArrayList<>();
         if (StringUtils.isNotEmpty(personUser.getPostName())) {
             String certificates = postNameMap.get(personUser.getPostName());
-            list2 = Arrays.asList(certificates.split(","));
+            if (!StringUtils.isEmpty(certificates)) {
+                list2 = Arrays.asList(certificates.split(","));
+            }
         }
         List<String> list = new ArrayList(list2);
         //人员资质信息
@@ -154,7 +156,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 
         if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
             for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-                Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
+                Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
                 if (list.contains(item.getCertificateName()) &&
                         DateUtils.dateCompare(date, new Date()) == -1) {
                     isOver = 1;
@@ -175,13 +178,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
         }
         this.baseMapper.insert(personBasic);
-
-        personCertificate.getCertificationInfo().forEach(item -> {
-            item.setPersonId(personBasic.getSequenceNbr());
-            personCertificateService.save(item);
-        });
-
-
+        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
+            personCertificate.getCertificationInfo().forEach(item -> {
+                item.setPersonId(personBasic.getSequenceNbr());
+                personCertificateService.save(item);
+            });
+        }
         //人员技能学历信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
         BeanUtils.copyProperties(personUser, personSkillEducation);
@@ -309,7 +311,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> list2 = new ArrayList<>();
         if (StringUtils.isNotEmpty(personUser.getPostName())) {
             String certificates = String.valueOf(postNameMap.get(personUser.getPostName()));
-            list2 = Arrays.asList(certificates.split(","));
+            if (!StringUtils.isEmpty(certificates)) {
+                list2 = Arrays.asList(certificates.split(","));
+            }
         }
         List<String> list = new ArrayList(list2);
         //人员资质信息
@@ -317,7 +321,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         Integer isOver = 0;
         if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
             for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-                Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
+                Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
                 if (list.contains(item.getCertificateName()) &&
                         DateUtils.dateCompare(date, new Date()) == -1) {
                     isOver = 1;

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonYardTimeTask.java

@@ -61,13 +61,16 @@ public class PersonYardTimeTask {
         personBasicList.forEach(personBasic -> {
             List<PersonCertificate> personCertificateList = perCertificateMap.get(personBasic.getSequenceNbr());
 
+            String yuanShiQrcodeColor = personBasic.getQrcodeColor();
             //默认红码
             personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
             // 该岗位应获得的证书
             List<String> list2 = new ArrayList<>();
             if (StringUtils.isNotEmpty(personBasic.getPostName())) {
                 String certificates = String.valueOf(postNameMap.get(personBasic.getPostName()));
-                list2 = Arrays.asList(certificates.split(","));
+                if (!StringUtils.isEmpty(certificates)) {
+                    list2 = Arrays.asList(certificates.split(","));
+                }
             }
             List<String> list = new ArrayList(list2);
             //人员资质信息
@@ -76,7 +79,8 @@ public class PersonYardTimeTask {
 
             if (CollectionUtils.isNotEmpty(personCertificateList)) {
                 for (PersonCertificate item : personCertificateList) {
-                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                    int validPeriod = StringUtils.isEmpty(item.getValidPeriod()) ? 3 : Integer.parseInt(item.getValidPeriod());
+                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), validPeriod);
                     if (list.contains(item.getCertificateName()) &&
                             DateUtils.dateCompare(date, new Date()) == -1) {
                         isOver = 1;
@@ -100,7 +104,10 @@ public class PersonYardTimeTask {
             } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
                 personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
             }
-            personBasics.add(personBasic);
+            if (!yuanShiQrcodeColor.equals(personBasic.getQrcodeColor())) {
+                personBasic.setRecDate(new Date());
+                personBasics.add(personBasic);
+            }
         });
         personBasicService.updateBatchById(personBasics);
     }