Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -172,16 +172,16 @@ hygf.user.group.empty=1775056568031645697
 
 
 
-#qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
-#qiyuesuo.accessKey = a1lcd3WRRV
-#qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
-#qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
+qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
+qiyuesuo.accessKey = a1lcd3WRRV
+qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
+qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
 
 
-qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
-qiyuesuo.accessKey = QcmHQu55pl
-qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
-qiyuesuo.secretKey=B6OYbHyfXikAghB2
+#qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
+#qiyuesuo.accessKey = QcmHQu55pl
+#qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
+#qiyuesuo.secretKey=B6OYbHyfXikAghB2
 
 
 

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

@@ -201,4 +201,10 @@ public class IdxBizFanPointVarCentralValue{
      */
     @TableField("ANALYSIS_POINT_NAME")
     private String analysisPointName;
+
+    /**
+     *
+     */
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

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

@@ -203,4 +203,7 @@ public class IdxBizPvPointVarCentralValue{
      */
     @TableField("PROCESS_POINT1_ID")
     private String processPoint1Id;
+
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

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

@@ -1009,6 +1009,7 @@ public class CommonServiceImpl {
                     idxBizFanPointVarCentralValue
                             .setSubSystem(IdxBizFanPointProcessVariableClassification.getSubSystem());
                     idxBizFanPointVarCentralValue.setNumber(IdxBizFanPointProcessVariableClassification.getNumber());
+                    idxBizFanPointVarCentralValue.setOrgCode(IdxBizFanPointProcessVariableClassification.getOrgCode());
                     idxBizFanPointVarCentralValue
                             .setEquipmentName(IdxBizFanPointProcessVariableClassification.getEquipmentName());
                     idxBizFanPointVarCentralValueMapper.insert(idxBizFanPointVarCentralValue);
@@ -1212,6 +1213,7 @@ public class CommonServiceImpl {
                     idxBizPvPointVarCentralValue.setArae(idxBizPvPointProcessVariableClassification.getArae());
                     idxBizPvPointVarCentralValue.setStation(idxBizPvPointProcessVariableClassification.getStation());
                     idxBizPvPointVarCentralValue.setSubarray(idxBizPvPointProcessVariableClassification.getSubarray());
+                    idxBizPvPointVarCentralValue.setOrgCode(idxBizPvPointProcessVariableClassification.getOrgCode());
                     idxBizPvPointVarCentralValue
                             .setManufacturer(idxBizPvPointProcessVariableClassification.getManufacturer());
                     idxBizPvPointVarCentralValue