解决冲突

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

@@ -1048,19 +1048,19 @@ public class MonitorFanIdxController extends BaseController {
         });
         Double totalAnnual = (powerOfAnnualFD.get() + powerOfAnnualGF.get());
         HashMap<String, String> stringHashMap13 = new HashMap<>();
-        stringHashMap13.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide * CommonConstans.kgToT)));
+        stringHashMap13.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide )));
         stringHashMap13.put("unit", "二氧化碳减排量（t）");
         list3.add(stringHashMap13);
         HashMap<String, String> stringHashMap14 = new HashMap<>();
-        stringHashMap14.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal * CommonConstans.kgToT)));
+        stringHashMap14.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal )));
         stringHashMap14.put("unit", "节约标准煤（t）");
         list3.add(stringHashMap14);
         HashMap<String, String> stringHashMap15 = new HashMap<>();
-        stringHashMap15.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner * CommonConstans.kgToT)));
+        stringHashMap15.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner)));
         stringHashMap15.put("unit", "碳粉尘减排量（t）");
         list3.add(stringHashMap15);
         HashMap<String, String> stringHashMap16 = new HashMap<>();
-        stringHashMap16.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide * CommonConstans.kgToT)));
+        stringHashMap16.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide )));
         stringHashMap16.put("unit", "二氧化硫减排量（t）");
         list3.add(stringHashMap16);
         page3.setRecords(list3);

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

@@ -958,19 +958,19 @@ public class MonitoringServiceImpl {
         page2.setRecords(list2);
         Double totalAnnual = (powerOfAnnualFD.get() + powerOfAnnualGF.get());
         HashMap<String, String> stringHashMap13 = new HashMap<>();
-        stringHashMap13.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide*CommonConstans.kgToT)));
+        stringHashMap13.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide)));
         stringHashMap13.put("unit", "二氧化碳减排量（t）");
         list3.add(stringHashMap13);
         HashMap<String, String> stringHashMap14 = new HashMap<>();
-        stringHashMap14.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal*CommonConstans.kgToT)));
+        stringHashMap14.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal)));
         stringHashMap14.put("unit", "节约标准煤（t）");
         list3.add(stringHashMap14);
         HashMap<String, String> stringHashMap15 = new HashMap<>();
-        stringHashMap15.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner * CommonConstans.kgToT)));
+        stringHashMap15.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner )));
         stringHashMap15.put("unit", "碳粉尘减排量（t）");
         list3.add(stringHashMap15);
         HashMap<String, String> stringHashMap16 = new HashMap<>();
-        stringHashMap16.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide * CommonConstans.kgToT)));
+        stringHashMap16.put("title", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide )));
         stringHashMap16.put("unit", "二氧化硫减排量（t）");
          list3.add(stringHashMap16);
         page3.setRecords(list3);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -123,4 +123,8 @@ public class CommonConstans {
     public static final String taiHeGenIndicatorMonth = "泰和月发电量总和";
     public static final String taiHeGenIndicatorYear = "泰和年发电量总和";
 
+    public static final String taiheActivePowerPoint = "南瑞光差保护_313P";
+    public static final String taiheIrradiationPonit = "WTX-801_25_WTX-801_总辐射";
+    public static final String xiazaoActivePowerPoint = "220kV夏雩线212线路测控装置PCS-9705TA有功功率一次值";
+    public static final String xiazaoWindSpeedrPoint = "瞬时风速";
 }

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

@@ -291,19 +291,9 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "概览-全站功率曲线")
     @GetMapping("/overviewWindSpeed")
-    public ResponseModel<Map<String, Object>> getOverviewWindSpeed(@RequestParam(value = "stationId", required = false) String stationId, @RequestParam(value = "type", required = false) String type, @RequestParam(value = "areaCode", required = false) String areaCode) {
-        String gatewayId = "";
-        if (null != stationId) {
-            StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-            gatewayId = stationBasic.getBoosterGatewayId();
-            if (null == type) {
-                gatewayId = stationBasic.getFanGatewayId();
-            }
-        }
-
-        Map<String, Object> detailsWindSpeed = monitorFanIndicator.getDetailsWindSpeedAll(gatewayId);
-
-        return ResponseHelper.buildResponse(detailsWindSpeed);
+    public void getOverviewWindSpeed(@RequestParam(value = "stationId", required = true) String stationId, @RequestParam(value = "type", required = false) String type, @RequestParam(value = "areaCode", required = false) String areaCode) {
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        monitorFanIndicator.getDetailsWindSpeedAll(stationBasic);
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -676,7 +666,7 @@ public class MonitorFanIdxController extends BaseController {
         Double todayPower = Double.valueOf(columnMap.get(CommonConstans.taiHeGenIndicatorDay).toString());
         Double total = commonService.getSumByEquipmentIndxName(result1, "WTX-801_25_WTX-801_总辐射累计");
         if (todayPower > 0 && total > 0) {
-            Double overallEfficiency = todayPower*CommonConstans.wkwhToMv / ((total / 3.6) * capacityl);
+            Double overallEfficiency = todayPower * CommonConstans.wkwhToMv / ((total / 3.6) * capacityl);
             data9.put("title", String.format("%.2f", overallEfficiency * 100) + "%");//综合效率
         } else {
             data9.put("title", "0.00%");//综合效率

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

@@ -363,16 +363,16 @@ public class CommonServiceImpl {
          氮氧化物减排量（t）=发电量（万kW·h）*1.69
          */
         co2.setUnit("二氧化碳减排量（t）");
-        co2.setTitle(String.format("%.2f", totalSocialContribution * CommonConstans.carbonDioxide*CommonConstans.kgToT));
+        co2.setTitle(String.format("%.2f", totalSocialContribution * CommonConstans.carbonDioxide));
         socialContributionDtoList.add(co2);
         coal.setUnit("节约标准煤（t）");
-        coal.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.standardCoal*CommonConstans.kgToT)));
+        coal.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.standardCoal)));
         socialContributionDtoList.add(coal);
         toner.setUnit("碳粉尘减排量（t）");
-        toner.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.toner * CommonConstans.kgToT)));
+        toner.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.toner )));
         socialContributionDtoList.add(toner);
         so2.setUnit("二氧化硫减排量（t）");
-        so2.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.sulfurDioxide * CommonConstans.kgToT)));
+        so2.setTitle(String.format("%.2f", (totalSocialContribution * CommonConstans.sulfurDioxide )));
         socialContributionDtoList.add(so2);
         socialContributionDtoPage.setRecords(socialContributionDtoList);
         socialContributionDtoPage.setTotal(100);

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

@@ -76,7 +76,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     TpriDmpDatabookServiceImpl tpriDmpDatabookServiceImpl;
     @Autowired
     TemporaryDataMapper temporaryDataMapper;
-//    @Autowired
+    //    @Autowired
 //    InfluxDButils influxDButils;
     @Autowired
     AlarmEventMapper alarmEventMapper;
@@ -1749,7 +1749,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             List<ESEquipments> indicatorsDtos = collects.get(s);
             Map<String, Object> map = new HashMap<>();
             map.put("name", s);
-            map.put("sort", s.split("-")[0]);
+            if(s.split("-")[1].equals("A")){
+                map.put("sort", s.split("-")[0]+"1");
+            }else {
+                map.put("sort", s.split("-")[0]+"2");
+            }
             map.put("type", "兆能");//此处暂时未提供数据 待定 暂写死值
             map.put("status", "1");//此处暂时未提供数据 待定 暂写死值
             indicatorsDtos.forEach(e -> {

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

@@ -283,20 +283,20 @@ public class MonitoringServiceIMQTTmpl {
     /**
      * 实时推送-场站功率曲线总概览
      */
-    @Scheduled(cron = fanStationPowerBightCron)
-    public void getFanStationPowerBight() {
-        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("sequence_nbr").eq("station_type", "FDZ"));
-        stationBasicList.forEach(stationBasic -> {
-            String gatewayId = stationBasic.getFanGatewayId();
-            Map<String, Object> detailsWindSpeed = monitorFanIndicator.getDetailsWindSpeedAll(gatewayId);
-            try {
-                emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_fanStationPowerBight_topic", JSON.toJSON(detailsWindSpeed).toString().getBytes("UTF-8"), 1, true);
-                logger.info("-----------------发送风电站功率曲线数据消息=================== 成功！" + JSON.toJSONString(detailsWindSpeed));
-            } catch (Exception exception) {
-                logger.error("-----------------发送风电站功率曲线数据消息=================== 失败！");
-            }
-        });
-    }
+//    @Scheduled(cron = fanStationPowerBightCron)
+//    public void getFanStationPowerBight() {
+//        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("sequence_nbr").eq("station_type", "FDZ"));
+//        stationBasicList.forEach(stationBasic -> {
+//            String gatewayId = stationBasic.getFanGatewayId();
+//            Map<String, Object> detailsWindSpeed = monitorFanIndicator.getDetailsWindSpeedAll(gatewayId);
+//            try {
+//                emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_fanStationPowerBight_topic", JSON.toJSON(detailsWindSpeed).toString().getBytes("UTF-8"), 1, true);
+//                logger.info("-----------------发送风电站功率曲线数据消息=================== 成功！" + JSON.toJSONString(detailsWindSpeed));
+//            } catch (Exception exception) {
+//                logger.error("-----------------发送风电站功率曲线数据消息=================== 失败！");
+//            }
+//        });
+//    }
 
     /**
      * 实时同送-获取各场站的风机列表

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

@@ -830,7 +830,7 @@ public class MonitoringServiceImpl {
         sorted.forEach(stationBasic -> {
             HashMap<String, String> hashMap1 = new HashMap<>();
             hashMap1.put("stationName", stationBasic.getStationName());
-            hashMap1.put("value", stationBasic.getAddress());
+            hashMap1.put("value", stationBasic.getAddress()+"%");
             hashMap1.put("value1", stationBasic.getAddress());
             mapList.add(hashMap1);
         });
@@ -1051,19 +1051,19 @@ public class MonitoringServiceImpl {
         page2.setRecords(list2);
         Double totalAnnual = (powerOfAnnualFD + powerOfAnnualGF);
         HashMap<String, String> stringHashMap13 = new HashMap<>();
-        stringHashMap13.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide * CommonConstans.kgToT)));
+        stringHashMap13.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.carbonDioxide )));
         stringHashMap13.put("title2", "二氧化碳减排量（t）");
         list3.add(stringHashMap13);
         HashMap<String, String> stringHashMap14 = new HashMap<>();
-        stringHashMap14.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal * CommonConstans.kgToT)));
+        stringHashMap14.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.standardCoal )));
         stringHashMap14.put("title2", "节约标准煤（t）");
         list3.add(stringHashMap14);
         HashMap<String, String> stringHashMap15 = new HashMap<>();
-        stringHashMap15.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner * CommonConstans.kgToT)));
+        stringHashMap15.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.toner )));
         stringHashMap15.put("title2", "碳粉尘减排量（t）");
         list3.add(stringHashMap15);
         HashMap<String, String> stringHashMap16 = new HashMap<>();
-        stringHashMap16.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide * CommonConstans.kgToT)));
+        stringHashMap16.put("title1", String.format(CommonConstans.Twodecimalplaces, (totalAnnual * CommonConstans.sulfurDioxide )));
         stringHashMap16.put("title2", "二氧化硫减排量（t）");
         list3.add(stringHashMap16);
         page3.setRecords(list3);