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

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

@@ -259,6 +259,7 @@ hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
 hygf.icbc.camsPublicKey=7E095625BE87DF744C916E40BD6B1C1EA486125CA566006062D8FFBBD8BD536ABA64DA6B6A6070D65148A734F660A2A742372E5965E87F99CD644FAB5F6DF2B2hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171
+hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 
 ## 聚富通工行 生产环境配置
 #hygf.icbc.appId=11000000000000028870
@@ -269,4 +270,4 @@ hygf.icbc.projectId=PJ14001401B000160171
 #hygf.icbc.camsPublicKey=655CE8706E6ED9A30B92E57D8D645ADDE8C541C27C5C5AFD529C610C4C0B04F9074E3B6E933C50A3316AEA60CEF461BE4C7916D2AF51170D3A2631394A7F3939
 #hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB
 #hygf.icbc.outVendorId=071301
-#hygf.icbc.projectId=PJ14001401B000160171
\ No newline at end of file
+#hygf.icbc.projectId=PJ14001401B000160171

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

@@ -162,8 +162,13 @@ public class TDBigScreenAnalyseController extends BaseController {
                 wrapper.eq(FanHealthIndex::getAnalysisObjType, "场站");
                 wrapper.eq(FanHealthIndex::getGatewayId, stationCode);
                 FanHealthIndex fanHealthIndex = fanHealthIndexMapper.selectOne(wrapper);
-                stringBigDecimalHashMap.put("value",
-                        BigDecimal.valueOf(fanHealthIndex.getHealthIndex()).setScale(1, BigDecimal.ROUND_HALF_UP));
+                //预防空指针
+                if(Objects.isNull(fanHealthIndex)){
+                    stringBigDecimalHashMap.put("value", "");
+                }else {
+                    stringBigDecimalHashMap.put("value",
+                            BigDecimal.valueOf(fanHealthIndex.getHealthIndex()).setScale(1, BigDecimal.ROUND_HALF_UP));
+                }
             } else {
                 LambdaQueryWrapper<PvHealthIndex> pvwrapper = new LambdaQueryWrapper<PvHealthIndex>();
                 pvwrapper.eq(PvHealthIndex::getAnalysisObjType, "场站");
@@ -171,8 +176,13 @@ public class TDBigScreenAnalyseController extends BaseController {
                 pvwrapper.orderByDesc(PvHealthIndex::getTs);
                 pvwrapper.last("limit 1");
                 PvHealthIndex pvHealthIndex = pvHealthIndexMapper.selectOne(pvwrapper);
-                stringBigDecimalHashMap.put("value",
-                        BigDecimal.valueOf(pvHealthIndex.getHealthIndex()).setScale(1, BigDecimal.ROUND_HALF_UP));
+                //预防空指针
+                if(Objects.isNull(pvHealthIndex)){
+                    stringBigDecimalHashMap.put("value", "");
+                }else {
+                    stringBigDecimalHashMap.put("value",
+                            BigDecimal.valueOf(pvHealthIndex.getHealthIndex()).setScale(1, BigDecimal.ROUND_HALF_UP));
+                }
 
             }
             return ResponseHelper.buildResponse(stringBigDecimalHashMap);
@@ -1573,10 +1583,9 @@ public class TDBigScreenAnalyseController extends BaseController {
             @RequestParam(value = "stationId", required = false) String stationId) {
 
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-        Date currentDayStartTime = DateUtils.getCurrentDayStartTime(DateUtils.dateAddDays(new Date(), -15));
-        Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
-        String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
-        String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+
+        String startTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(new Date(), -10), DateUtils.DATE_TIME_PATTERN);
+        String endTime = DateUtils.convertDateToString(new Date(), DateUtils.DATE_TIME_PATTERN);
 
         LambdaQueryWrapper<FanHealthIndexDay> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(FanHealthIndexDay::getIndexAddress, indexAddress);
@@ -1614,10 +1623,8 @@ public class TDBigScreenAnalyseController extends BaseController {
             @RequestParam(value = "stationId", required = false) String stationId) {
 
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-        Date currentDayStartTime = DateUtils.getCurrentDayStartTime(DateUtils.dateAddDays(new Date(), -15));
-        Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
-        String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
-        String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        String startTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(new Date(), -10), DateUtils.DATE_TIME_PATTERN);
+        String endTime = DateUtils.convertDateToString(new Date(), DateUtils.DATE_TIME_PATTERN);
 
         LambdaQueryWrapper<PvHealthIndexDay> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(PvHealthIndexDay::getIndexAddress, indexAddress);

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

@@ -12,8 +12,8 @@ import java.util.Map;
 public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     @Select("<script>"+
             "SELECT distinct `health_index` AS healthIndex,anomaly,rec_date as recDate, `health_index` AS `value`, substr(analysis_time,1,10) as   analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +
@@ -36,8 +36,8 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     @Select("<script>"+
             "SELECT  count(1) from ( SELECT distinct  `health_index` AS healthIndex,anomaly,rec_date as recDate, `health_index` AS `value`, substr(analysis_time,1,10) as   analysisTime, station,equipment_name AS equipmentName,point_name as pointName,\n" +
             "( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day  WHERE analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +

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

@@ -11,8 +11,8 @@ import java.util.List;
 public interface FanHealthIndexHourMapper extends BaseMapper<FanHealthIndexHour> {
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex, anomaly, `health_index` AS `value`,  rec_date AS recDate, analysis_time AS  analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_hour WHERE analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +

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

@@ -11,8 +11,8 @@ import java.util.List;
 public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMoment> {
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate,anomaly, analysis_time AS  analysisTime,point_name as pointName,  station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_moment WHERE analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +

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

@@ -13,8 +13,8 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
             "SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `health_index` AS `value`, rec_date AS recDate, anomaly, substr(analysis_time,1,10) as analysisTime,station,equipment_name AS equipmentName, point_name as pointName, index_address as indexAddress, ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_day WHERE  analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
@@ -44,8 +44,8 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
             "SELECT count(1) FROM (SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `health_index` AS `value`, anomaly, substr(analysis_time,1,10) as analysisTime,station,equipment_name AS equipmentName, point_name as pointName, index_address as indexAddress, ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_day WHERE  analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +

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

@@ -12,8 +12,8 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex, `health_index` AS `value`, rec_date AS recDate, anomaly,  analysis_time,station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_hour WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
@@ -31,8 +31,8 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
     @Select("<script>"+
             "SELECT count(1)" +
             " FROM analysis_data.pv_health_index_hour WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +

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

@@ -12,8 +12,8 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate, anomaly, analysis_time,station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_moment WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
@@ -32,8 +32,8 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
     @Select("<script>"+
             "SELECT count(1)" +
             " FROM analysis_data.pv_health_index_moment WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +

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

@@ -100,6 +100,7 @@ public class FDZJCServiceImpl implements IJXDZService {
                 windStationDataVO.setOnGridEnergyMonth(data.getDouble("on_grid_energy_month"));
                 windStationDataVO.setOnGridEnergyYear(data.getDouble("on_grid_energy_year")/10000);
                 windStationDataVO.setOnGridEnergyGross(data.getDouble("on_grid_energy")/10000);
+                windStationDataVO.setGenerationGross(data.getDouble("generating_capacity")/10000);
             }
         }
     }
@@ -133,7 +134,6 @@ public class FDZJCServiceImpl implements IJXDZService {
                     }
                     if ("年发电量总和".equals(pointName)) {
                         windStationDataVO.setGenerationYear(jsonObject.getDouble("value"));
-                        windStationDataVO.setGenerationGross(jsonObject.getDouble("value"));
                     }
                     if ("日利用小时数".equals(pointName)) {
                         windStationDataVO.setUtilizeHours(jsonObject.getDouble("value"));