Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

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

@@ -92,10 +92,10 @@ public class IdxBizPvWeightController extends BaseController {
                     e.setType("场站");
                     break;
                 case "3":
-                    e.setType("设备");
+                    e.setType("子阵");
                     break;
                 case "4":
-                    e.setType("子阵");
+                    e.setType("设备");
                     break;
                 case "5":
                     e.setType("变量");

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

@@ -481,6 +481,7 @@ public class TDBigScreenAnalyseController extends BaseController {
 		FanHealthIndex fanHealthIndex = fanHealthIndexMapper.selectOne(wrapper);
 
 		LambdaQueryWrapper<FanHealthIndex> wrapperl = new LambdaQueryWrapper<FanHealthIndex>();
+		wrapperl.select(FanHealthIndex::getTs,FanHealthIndex::getArea,FanHealthIndex::getHealthIndex);
 		wrapperl.eq(FanHealthIndex::getAnalysisType, "按10分钟");
 		wrapperl.eq(FanHealthIndex::getAnalysisObjType, "片区");
 		wrapperl.eq(FanHealthIndex::getAnalysisTime, fanHealthIndex.getAnalysisTime());
@@ -519,9 +520,10 @@ public class TDBigScreenAnalyseController extends BaseController {
 		FanHealthIndex fanHealthIndex = fanHealthIndexMapper.selectOne(wrapper);
 
 		LambdaQueryWrapper<FanHealthIndex> wrapperl = new LambdaQueryWrapper<FanHealthIndex>();
+		wrapperl.select(FanHealthIndex::getTs,FanHealthIndex::getStation,FanHealthIndex::getHealthIndex);
 		wrapperl.eq(FanHealthIndex::getAnalysisType, "按10分钟");
 		wrapperl.eq(FanHealthIndex::getAnalysisObjType, "场站");
-		wrapperl.like(FanHealthIndex::getArea, areaCode);
+		wrapperl.eq(FanHealthIndex::getArea, areaCode+"区域");
 		wrapperl.eq(FanHealthIndex::getAnalysisTime, fanHealthIndex.getAnalysisTime());
 		List<FanHealthIndex> fanHealthIndexList = fanHealthIndexMapper.selectList(wrapper);
 
@@ -533,9 +535,10 @@ public class TDBigScreenAnalyseController extends BaseController {
 		PvHealthIndex pvHealthIndex = pvHealthIndexMapper.selectOne(wrapper1);
 
 		LambdaQueryWrapper<PvHealthIndex> pvWrapper = new LambdaQueryWrapper<PvHealthIndex>();
+		pvWrapper.select(PvHealthIndex::getTs,PvHealthIndex::getStation,PvHealthIndex::getHealthIndex);
 		pvWrapper.eq(PvHealthIndex::getAnalysisType, "按10分钟");
 		pvWrapper.eq(PvHealthIndex::getAnalysisObjType, "场站");
-		pvWrapper.like(PvHealthIndex::getArea, areaCode);
+		pvWrapper.eq(PvHealthIndex::getArea, areaCode+"区域");
 		pvWrapper.eq(PvHealthIndex::getAnalysisTime, pvHealthIndex.getAnalysisTime());
 		List<PvHealthIndex> pvHealthIndexList = pvHealthIndexMapper.selectList(pvWrapper);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -656,9 +656,7 @@ FROM (
 	</select>
 	<select id="getPvSubSystemInfo" resultType="java.util.Map">
 		SELECT
-        IFNULL ( ROUND( MAX(HEALTH_INDEX), 2 ), 100 ) AS avgHealthIndex
-
-        round(IFNULL( AVG( HEALTH_INDEX ), 100 ), 1) AS avgHealthIndex,
+        IFNULL ( ROUND( MAX(HEALTH_INDEX), 2 ), 100 ) AS avgHealthIndex,
         EQUIPMENT_NAME AS equipmentName
         FROM
         pv_health_index_latest_data

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/FDZSBJCServiceImpl.java

@@ -93,8 +93,8 @@ public class FDZSBJCServiceImpl implements IJXDZService {
                         windDeviceDataVO.setGenerationMonth(result.getDouble("value"));
                     }
                     if ("年发电量".equals(pointName)) {
-                        windDeviceDataVO.setGenerationYear(result.getDouble("value"));
-                        windDeviceDataVO.setGenerationGross(result.getDouble("value"));
+                        windDeviceDataVO.setGenerationYear(result.getDouble("value")/10000);
+                        windDeviceDataVO.setGenerationGross(result.getDouble("value")/10000);
                     }
                 }
             }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/GFDZSBJCServiceImpl.java

@@ -97,10 +97,10 @@ public class GFDZSBJCServiceImpl implements IJXDZService {
                             pvDeviceDataVO.setGenerationMonth(result.getDouble("value"));
                         }
                         if (pointName.contains("年发电量")) {
-                            pvDeviceDataVO.setGenerationYear(result.getDouble("value"));
+                            pvDeviceDataVO.setGenerationYear(result.getDouble("value")/10000);
                         }
                         if (pointName.contains("总发电量")) {
-                            pvDeviceDataVO.setGenerationGross(result.getDouble("value"));
+                            pvDeviceDataVO.setGenerationGross(result.getDouble("value")/10000);
                         }
                     }
                 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/JXDZExecute.java

@@ -57,10 +57,10 @@ public class JXDZExecute {
         fdzsbjcService.backupData(windDeviceDataVOList, needDataVO.getDateTime());
         gfdzsbjcService.backupData(pvDeviceDataVOList, needDataVO.getDateTime());
         //发送请求
-//        fdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windStationDataVOList);
-//        gfdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvStationDataVOList);
-//        fdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windDeviceDataVOList);
-//        gfdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvDeviceDataVOList);
+        fdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windStationDataVOList);
+        gfdzjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvStationDataVOList);
+        fdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, windDeviceDataVOList);
+        gfdzsbjcService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, pvDeviceDataVOList);
         log.info("小时任务执行成功");
     }