解决冲突

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

@@ -105,7 +105,7 @@ public class AnalyseController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "获取influxdb数据", notes = "获取influxdb数据")
     @GetMapping(value = "/getInfluxdbDataByConditon")
-    public ResponseModel<Map<String, Object>> getInfluxdbDataByConditon(@RequestParam String stationType, @RequestParam String pointId, @RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<Map<String, Object>> getInfluxdbDataByConditon(@RequestParam String stationType, @RequestParam String pointId, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
         if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
             Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
             Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());

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

@@ -941,17 +941,12 @@ public class CommonServiceImpl {
         String sql = "";
         List<IndicatorData> result = new ArrayList<>();
         if ("FD".equals(stationType)) {
-            IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification = idxBizFanPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().eq("SEQUENCE_NBR", pointId));
-            result = indicatorDataMapper.selectDataByAddressAndtime(idxBizFanPointProcessVariableClassification.getIndexAddress(), getUtcTimeString(startTime), getUtcTimeString(endTime),idxBizFanPointProcessVariableClassification.getGatewayId());
-
-            sql = String.format("select * from iot_data_%s where address ='%s' and time > '%s' and time < '%s' ;", idxBizFanPointProcessVariableClassification.getGatewayId(), idxBizFanPointProcessVariableClassification.getIndexAddress(), getUtcTimeString(startTime), getUtcTimeString(endTime));
+            IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification = idxBizFanPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId));
+            result = indicatorDataMapper.selectDataByAddressAndtime(idxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime,idxBizFanPointProcessVariableClassification.getGatewayId());
         } else {
-
-            IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification = idxBizPvPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().eq("SEQUENCE_NBR", pointId));
-            result = indicatorDataMapper.selectDataByAddressAndtime(idxBizPvPointProcessVariableClassification.getIndexAddress(), getUtcTimeString(startTime), getUtcTimeString(endTime),idxBizPvPointProcessVariableClassification.getGatewayId());
-            sql = String.format("select * from iot_data_%s where address ='%s' and time > '%s' and time < '%s' ;", idxBizPvPointProcessVariableClassification.getGatewayId(), idxBizPvPointProcessVariableClassification.getIndexAddress(), getUtcTimeString(startTime), getUtcTimeString(endTime));
+            IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification = idxBizPvPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId));
+            result = indicatorDataMapper.selectDataByAddressAndtime(idxBizPvPointProcessVariableClassification.getIndexAddress(), startTime, endTime,idxBizPvPointProcessVariableClassification.getGatewayId());
         }
-    //    List<Map<String, Object>> reuslt = influxdbUtil.query(sql);
         List<String> seriesData_valuse = new ArrayList<>();
         List<String> axisData_valuse = new ArrayList<>();
         result.forEach(item -> {

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

@@ -274,15 +274,15 @@ public class MonitoringServiceImpl {
         });
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         List<SocialContributionDto> socialContributionDtoList = new ArrayList<>();
-        completionRatio = String.format("%.2f", (annualPower.get() * 100) / value);
+        completionRatio = String.format(CommonConstans.Twodecimalplaces, (annualPower.get() * 100) / value);
         SocialContributionDto dailyPowerdto = new SocialContributionDto();
-        dailyPowerdto.setTitle(String.format(CommonConstans.Twodecimalplaces, dailyPower.get()));
+        dailyPowerdto.setTitle(String.format(CommonConstans.Fourdecimalplaces, dailyPower.get()));
         dailyPowerdto.setUnit("万kWh");
         SocialContributionDto monthlyPowerdto = new SocialContributionDto();
-        monthlyPowerdto.setTitle(String.format(CommonConstans.Twodecimalplaces, monthlyPower.get()));
+        monthlyPowerdto.setTitle(String.format(CommonConstans.Fourdecimalplaces, monthlyPower.get()));
         monthlyPowerdto.setUnit("万kWh");
         SocialContributionDto annualPowerdto = new SocialContributionDto();
-        annualPowerdto.setTitle(String.format(CommonConstans.Twodecimalplaces, annualPower.get()));
+        annualPowerdto.setTitle(String.format(CommonConstans.Fourdecimalplaces, annualPower.get()));
         annualPowerdto.setUnit("万kWh");
         SocialContributionDto completionRatioDto = new SocialContributionDto();
         completionRatioDto.setTitle(completionRatio);
@@ -299,7 +299,7 @@ public class MonitoringServiceImpl {
         socialContributionDtoPage.setTotal(100);
         socialContributionDtoPage.setCurrent(1);
         try {
-            emqKeeper.getMqttClient().publish("completionofpowerindicator_topic", JSON.toJSON(socialContributionDtoPage).toString().getBytes("UTF-8"), 1, false);
+            emqKeeper.getMqttClient().publish("completion_of_powerindicator_topic", JSON.toJSON(socialContributionDtoPage).toString().getBytes("UTF-8"), 1, true);
             logger.info("-----------------发送区域实时生产数据消息=================== 成功！" + JSON.toJSONString(socialContributionDtoPage));
         } catch (Exception exception) {
             logger.error("-----------------发送区域实时生产数据消息=================== 失败！");