Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -938,7 +938,7 @@ public class MonitorFanIdxController extends BaseController {
                 Map<String, Object> yearMap = new HashMap<>();
                 dayMap.put("name",name);
                 dayMap.put("gateWayId",stationBasic.getFanGatewayId());
-                dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("日发电量").toString())* CommonConstans.pvGenPoweActor));
+                dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("日发电量").toString())* CommonConstans.pvGenPoweActor*CommonConstans.pvGenPoweActorDay));
                 monthMap.put("name",name);
                 monthMap.put("gateWayId",stationBasic.getFanGatewayId());
                 monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",Double.parseDouble(map.get("月发电量").toString())* CommonConstans.pvGenPoweActor));

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

@@ -659,8 +659,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         map.put("seriesData", seriesData);
         map.put("axisData",time);
         map.put("mean",mean);
-        map.put("max",max);
-        map.put("min",min);
+        map.put("max",String.format("%.2f",max));
+        map.put("min",String.format("%.2f",min));
         map.put("maxTime",maxTime);
         map.put("minTime",minTime);
         map.put("load", format);

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

@@ -874,7 +874,7 @@ public class MonitoringServiceImpl {
             powerOfAnnualGF.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量"));
         });
         HashMap<String, String> stringHashMap4 = new HashMap<>();
-        stringHashMap4.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get()) + "/" + String.format(CommonConstans.Twodecimalplaces, powerOfDayGF.get() * CommonConstans.pvGenPoweActor));
+        stringHashMap4.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get()) + "/" + String.format(CommonConstans.Twodecimalplaces, powerOfDayGF.get() * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
         list1.add(stringHashMap4);
         HashMap<String, String> stringHashMap5 = new HashMap<>();
         stringHashMap5.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfMonthFD.get()) + "/" + String.format(CommonConstans.Twodecimalplaces, powerOfMonthGF.get() * CommonConstans.pvGenPoweActor));
@@ -890,9 +890,9 @@ public class MonitoringServiceImpl {
         list1.add(stringHashMap8);
         page1.setRecords(list1);
         HashMap<String, String> stringHashMap9 = new HashMap<>();
-        stringHashMap9.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get() + powerOfDayGF.get() * CommonConstans.pvGenPoweActor));
+        stringHashMap9.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get() + powerOfDayGF.get() * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
         HashMap<String, String> resultMap = new HashMap<>();
-        resultMap.put("Day", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get() + powerOfDayGF.get() * CommonConstans.pvGenPoweActor));
+        resultMap.put("Day", String.format(CommonConstans.Twodecimalplaces, powerOfDayFD.get() + powerOfDayGF.get() * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
         list2.add(stringHashMap9);
         HashMap<String, String> stringHashMap10 = new HashMap<>();
         stringHashMap10.put("title", String.format(CommonConstans.Twodecimalplaces, powerOfMonthFD.get() + powerOfMonthGF.get() * CommonConstans.pvGenPoweActor));

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

@@ -403,7 +403,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
         queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule);
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
         List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         List<String> xList = new ArrayList<>();
         List<String> yList = new ArrayList<>();
@@ -431,7 +431,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public String getFanDataByType(String stationId, String equipNum, String frontModule, String typeName) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule);
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(typeName));
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
@@ -779,7 +779,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         }
 
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule);
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
 
         List<Map<String, Object>> statusMaps = new ArrayList<>();
@@ -815,7 +815,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule);
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
         likeMap.put(CommonConstans.QueryStringSystemType, systemType);
         List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getDisplayName().equals("")).collect(Collectors.toList());
@@ -1054,7 +1054,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
 //        queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList("电量表计"));
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, "电量表计");
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "电量表计");
         List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         List<ESEquipments> windSqlList = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getDisplayName().equals("") && !esEquipments.getDisplayName().equals("检修状态")).collect(Collectors.toList());
         Map<String, List<ESEquipments>> maps = windSqlList.stream().collect(Collectors.groupingBy(ESEquipments::getSystemType));
@@ -1105,9 +1105,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             Map<String, String> likeMap = new HashMap<>();
             queryCodtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
             queryCodtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
-            likeMap.put(CommonConstans.QueryStringFrontMoudle, map.get("boosterName"));
+            likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, map.get("boosterName"));
             if ("1主变高压侧".equals(map.get("boosterName")) || "1主变低压侧".equals(map.get("boosterName"))) {
-                likeMap.put(CommonConstans.QueryStringFrontMoudle, map.get("压侧"));
+                likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, map.get("压侧"));
                 List<ESEquipments> listData = commonServiceImpl.getListDataByCondtionsAndLike(queryCodtion, null, ESEquipments.class, likeMap);
 
                 // 主变高压侧
@@ -1785,14 +1785,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryConditon.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("总直流功率"));
         queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
         List<ESEquipments> listData = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null, ESEquipments.class, likeMap);
 
         Map<String, List<String>> queryConditon1 = new HashMap<>();
         queryConditon1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
         queryConditon1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> likeMap1 = new HashMap<>();
-        likeMap1.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+        likeMap1.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
         List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon1, null, ESEquipments.class, likeMap1);
 
         // 将两组数据合并成一个集合中 将总直流功率数据 放入 另一个集合的valueLable中
@@ -1895,7 +1895,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("运行"));
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
         List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         // 逆变器总数量
         Integer totalNumber = result.size();
@@ -1905,7 +1905,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         queryCondtion1.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
         Map<String, String> likeMap1 = new HashMap<>();
-        likeMap1.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+        likeMap1.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
         List<ESEquipments> result1 = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion1, null, ESEquipments.class, likeMap1);
         List<String> equipmentNumberList = result1.stream().map(ESEquipments::getEquipmentNumber).distinct().collect(Collectors.toList());
         int djNum = 0;

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/TemporaryDataMapper.xml

@@ -5,7 +5,7 @@
 
 
     <select id="timingTemporarysSorageData" resultType="map">
-        SELECT avg(value) as value ,
+        SELECT FORMAT( avg(value),2)as value ,
         created_time as createdTime ,
         equipmentIndexName
         FROM