修复健康指数生产问题

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

@@ -403,7 +403,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			item.setHealthIndex(roundedNumber);
 		});
 
-		int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+		int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,orgCode);
 		page.setRecords(fanHealthIndexDays);
 		page.setTotal(total);
 //		page.setTotal(Long.valueOf(fanHealthIndexDays.size()));

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

@@ -165,19 +165,19 @@ public class IdxBizPvPointVarCentralValue{
     /**
      * 工况变量3ID
      */
-    @TableField("PROCESS_POINT3_ID_NAME")
+    @TableField("PROCESS_POINT3_NAME")
     private String processPoint3IdName;
 
     /**
      * 工况变量2ID
      */
-    @TableField("PROCESS_POINT2_ID_NAME")
+    @TableField("PROCESS_POINT2_NAME")
     private String processPoint2IdName;
 
     /**
      * 工况变量1ID
      */
-    @TableField("PROCESS_POINT1_ID_NAME")
+    @TableField("PROCESS_POINT1_NAME")
     private String processPoint1IdName;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/listener/SyncESDataToTdengineMqttListener.java

@@ -40,5 +40,19 @@ public class SyncESDataToTdengineMqttListener extends EmqxListener {
             }).start();
 
         }
+        if ("pvsuccess".equals(flag)){
+            //开始异步计算光伏的健康指数算法
+            new Thread(()->{
+                //调用光伏的健康指数算法
+                commonServiceImpl.healthWarningMinuteByPv();
+            }).start();
+        }
+        if ("fansuccess".equals(flag)){
+            //开始异步计算光伏的健康指数算法
+            new Thread(()->{
+                //调用光伏的健康指数算法
+                commonServiceImpl.healthWarningMinuteByFan();
+            }).start();
+        }
     }
 }

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

@@ -2694,10 +2694,9 @@ public class CommonServiceImpl {
                         pvHealthIndex.setAnomaly(idxBizPvHealthIndex.getANOMALY());
                         pvHealthIndex.setRecDate(DateUtil.now());
                         pvHealthIndex.setArea(idxBizPvHealthIndex.getArae());
-                        pvHealthIndex.setAnalysisTime(DateUtil.now());
+                        pvHealthIndex.setAnalysisTime(format);
                         pvHealthIndex.setHealthLevel(idxBizPvHealthIndex.getHealthLevel());
                         pvHealthIndex.setKks(idxBizPvHealthIndex.getKks());
-                        pvHealthIndex.setRecDate(format);
                         pvHealthIndex.setOrgCode(obj.getOrgCode());
                         fanHealthIndices1.add(pvHealthIndex);
                     }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexDayMapper.java

@@ -46,7 +46,7 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '%${orgCode}%' </if>" +
             "</script>")
-    int selectDataTotal(@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("equipmentName")String equipmentName,@Param("subSystem")String subSystem,@Param("analysisType")String analysisType,@Param("analysisObjType")String analysisObjType,@Param("station")String station,@Param("pointName")String pointName, @Param("indexAddress")String indexAddress,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+    int selectDataTotal(@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("equipmentName")String equipmentName,@Param("subSystem")String subSystem,@Param("analysisType")String analysisType,@Param("analysisObjType")String analysisObjType,@Param("station")String station,@Param("pointName")String pointName, @Param("indexAddress")String indexAddress,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("orgCode")String orgCode);
 
 
     @Select("<script>"+