解决冲突

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.api.householdapi.face.service.GoodWeDataAcquisitionServi
 import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.server.Jsp;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -83,6 +84,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
     @Autowired
     TdJpStationMapper tdJpStationMapper;
     @Override
+    @Scheduled(cron = "${dataRequstScheduled.GoodWe}")
     public void stationList() {
         HashMap<String, Object> requestInfo = new HashMap<>();
         requestInfo.put("page_index", 1);

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -760,13 +761,23 @@ public class CommonServiceImpl {
 				List<IdxBizFanPointProcessVariableClassification> list = IdxBizFanPointProcessVariableClassificationHashMap
 						.get(s);
 				list.forEach(IdxBizFanPointProcessVariableClassification -> {
-					List<IdxBizFanPointVarCorrelation> gongkuangList = idxBizFanPointVarCorrelationMapper
+					List<IdxBizFanPointVarCorrelation> gongkuangList;
+					 gongkuangList = idxBizFanPointVarCorrelationMapper
 							.selectList(new QueryWrapper<IdxBizFanPointVarCorrelation>()
 									.eq("ANALYSIS_GATEWAY_ID",
 											IdxBizFanPointProcessVariableClassification.getGatewayId())
 									.eq("ANALYSIS_POINT_ID",
 											IdxBizFanPointProcessVariableClassification.getSequenceNbr())
-									.orderByDesc("CORRELATION_COEFFICIENT").last("limit 0,3"));
+									.eq("MATCH","匹配"));
+					if (CollectionUtil.isEmpty(gongkuangList) || gongkuangList.size() !=3 ){
+						gongkuangList = idxBizFanPointVarCorrelationMapper
+								.selectList(new QueryWrapper<IdxBizFanPointVarCorrelation>()
+										.eq("ANALYSIS_GATEWAY_ID",
+												IdxBizFanPointProcessVariableClassification.getGatewayId())
+										.eq("ANALYSIS_POINT_ID",
+												IdxBizFanPointProcessVariableClassification.getSequenceNbr())
+										.orderByDesc("CORRELATION_COEFFICIENT").last("limit 0,3"));
+					}
 					if (gongkuangList.size() > 0) {
 						foreachHandlerConditionVariabAnalyse1Fan(s, gongkuangList, startTime, endTime,
 								IdxBizFanPointProcessVariableClassification);
@@ -810,7 +821,18 @@ public class CommonServiceImpl {
 											idxBizPvPointProcessVariableClassification.getGatewayId())
 									.eq("ANALYSIS_POINT_ID",
 											idxBizPvPointProcessVariableClassification.getSequenceNbr())
-									.orderByDesc("CORRELATION_COEFFICIENT").last("limit 0,3"));
+									.eq("MATCH","匹配"));
+					if (CollectionUtil.isEmpty(gongkuangList) || gongkuangList.size() != 3){
+						 gongkuangList = idxBizPvPointVarCorrelationMapper
+								.selectList(new QueryWrapper<IdxBizPvPointVarCorrelation>()
+										.eq("ANALYSIS_GATEWAY_ID",
+												idxBizPvPointProcessVariableClassification.getGatewayId())
+										.eq("ANALYSIS_POINT_ID",
+												idxBizPvPointProcessVariableClassification.getSequenceNbr())
+										.orderByDesc("CORRELATION_COEFFICIENT").last("limit 0,3"));
+
+					}
+
 					if (gongkuangList.size() > 0) {
 						foreachHandlerConditionVariabAnalyse1Pv(s, gongkuangList, startTime, endTime,
 								idxBizPvPointProcessVariableClassification);

amos-boot-system-jxiop/pom.xml

@@ -103,12 +103,6 @@
             <artifactId>pooled-jms</artifactId>
             <version>1.0.5</version>
         </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-jxiop-das</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>