解决冲突

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

@@ -109,8 +109,13 @@ public class AnalyseController extends BaseController {
     @GetMapping(value = "/getInfluxdbDataByConditon")
     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());
+            Date currentDayStartTime = null;
+            try {
+                currentDayStartTime = DateUtils.minDateOfMonth(new Date());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            Date currentDayEndTime = DateUtils.getCurrentMonthEndTime(new Date());
             startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
             endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
         }

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

@@ -945,10 +945,10 @@ public class CommonServiceImpl {
         String sql = "";
         List<IndicatorData> result = new ArrayList<>();
         if ("FD".equals(stationType)) {
-            IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification = idxBizFanPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId));
+            IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification = idxBizFanPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId).eq("TAG_CODE","分析变量"));
             result = indicatorDataMapper.selectDataByAddressAndtime(idxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime,idxBizFanPointProcessVariableClassification.getGatewayId());
         } else {
-            IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification = idxBizPvPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId));
+            IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification = idxBizPvPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId).eq("TAG_CODE","分析变量"));
             result = indicatorDataMapper.selectDataByAddressAndtime(idxBizPvPointProcessVariableClassification.getIndexAddress(), startTime, endTime,idxBizPvPointProcessVariableClassification.getGatewayId());
         }
         List<String> seriesData_valuse = new ArrayList<>();

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

@@ -46,7 +46,7 @@ public class CommonConstans {
     //万Kwh转MV
     public static final Integer wkwhToMv = 10;
     //kw转MV
-    public static final Double kwToMv = 0.0001;
+    public static final Double kwToMv = 0.001;
 
 //    正常运行	发电状态=1
 //    告警运行	报警状态=1

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

@@ -75,7 +75,7 @@ public class LargeScreenImpl {
         value.add(ZFSLJ);
         Map<String, List<String>> map = new HashMap<>();
         map.put("equipmentIndexName.keyword", value);
-
+        List<StationCacheInfoDto> stationCacheInfoDtos = commonServiceImpl.getListStationCacheInfoDto();
         List<? extends Terms.Bucket> lidate = commonServiceImpl.getgroupavg(map, "valueF", "equipmentIndexName.keyword", ESEquipments.class);
         DecimalFormat format2 = new DecimalFormat("#.0000");
         for (Terms.Bucket bucket : lidate) {
@@ -99,34 +99,65 @@ public class LargeScreenImpl {
                 }
             }
         }
+        //日发电量
+        AtomicReference<Double> dailyPower = new AtomicReference<>(0.0);
+        //月发电量
+        AtomicReference<Double> monthlyPower = new AtomicReference<>(0.0);
+        //年发电量
+        AtomicReference<Double> annualPower = new AtomicReference<>(0.0);
+        for (StationCacheInfoDto stationCacheInfoDto : stationCacheInfoDtos) {
 
-        //总和
-        value.clear();
-        value.add(RSD);
-        value.add(YFD);
-        value.add(NFD);
-        List<? extends Terms.Bucket> lidatesum = commonServiceImpl.getgroupsum(map, "valueF", "equipmentIndexName.keyword", ESEquipments.class);
-
-        for (Terms.Bucket bucket : lidatesum) {
-            Aggregations aggregation = bucket.getAggregations();
-            List<Aggregation> listdata = Objects.nonNull(aggregation) ? aggregation.asList() : null;
-            for (Aggregation agg : listdata) {
-                ParsedSum parsedSum = (ParsedSum) agg;
-                switch (bucket.getKeyAsString()) {
-                    case RSD:
-                        mapdta.put("RSD", Double.valueOf(format2.format(parsedSum.getValue()*CommonConstans.pvGenPoweActor* CommonConstans.pvGenPoweActorDay)));
-                        break;
-                    case YFD:
-                        mapdta.put("YFD", Double.valueOf(format2.format(parsedSum.getValue()*CommonConstans.pvGenPoweActornew)));
-                        break;
-                    case NFD:
-                        mapdta.put("NFD", Double.valueOf(format2.format(parsedSum.getValue()*CommonConstans.pvGenPoweActorYear)));
-                        break;
-                    default:
-                        break;
-                }
+            if ("FDZ".equals(stationCacheInfoDto.getStationType())) {
+                Map<String, List<String>> queryCondtion = new HashMap<>();
+                queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("日发电量", "月发电量", "年发电量"));
+                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getFanGatewayId()));
+                List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+                dailyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量")));
+                monthlyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量")));
+                annualPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量")));
+            } else {
+                Map<String, List<String>> queryCondtion = new HashMap<>();
+                queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, CommonConstans.taiHeGenIndicator);
+                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getBoosterGatewayId()));
+                List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+                dailyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorDay)));
+                monthlyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorMonth)));
+                annualPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorYear)));
             }
+
         }
+
+        mapdta.put("RSD", keepFourdecimalPlaces(dailyPower.get()));
+        mapdta.put("YFD", keepFourdecimalPlaces(monthlyPower.get()));
+        mapdta.put("NFD", keepFourdecimalPlaces(annualPower.get()));
+
+        //总和
+//        value.clear();
+//        value.add(RSD);
+//        value.add(YFD);
+//        value.add(NFD);
+//        List<? extends Terms.Bucket> lidatesum = commonServiceImpl.getgroupsum(map, "valueF", "equipmentIndexName.keyword", ESEquipments.class);
+//
+//        for (Terms.Bucket bucket : lidatesum) {
+//            Aggregations aggregation = bucket.getAggregations();
+//            List<Aggregation> listdata = Objects.nonNull(aggregation) ? aggregation.asList() : null;
+//            for (Aggregation agg : listdata) {
+//                ParsedSum parsedSum = (ParsedSum) agg;
+//                switch (bucket.getKeyAsString()) {
+//                    case RSD:
+//                        mapdta.put("RSD", Double.valueOf(format2.format(parsedSum.getValue()*CommonConstans.pvGenPoweActor* CommonConstans.pvGenPoweActorDay)));
+//                        break;
+//                    case YFD:
+//                        mapdta.put("YFD", Double.valueOf(format2.format(parsedSum.getValue()*CommonConstans.pvGenPoweActornew)));
+//                        break;
+//                    case NFD:
+//                        mapdta.put("NFD", Double.valueOf(format2.format(parsedSum.getValue()*CommonConstans.pvGenPoweActorYear)));
+//                        break;
+//                    default:
+//                        break;
+//                }
+//            }
+//        }
         //计算月完成百分比
         //当前月份 获取
         LocalDate currentDate = LocalDate.now();
@@ -238,17 +269,14 @@ public class LargeScreenImpl {
                 annualPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量")));
             } else {
                 Map<String, List<String>> queryCondtion = new HashMap<>();
-                Map<String, String> shouldQueryCondtion = new HashMap<>();
-                shouldQueryCondtion.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
-                queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("日发电量", "月发电量", "年发电量"));
-                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
-                List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, shouldQueryCondtion);
-                dailyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量") * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
-                monthlyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量") * CommonConstans.pvGenPoweActornew));
-                annualPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量") * CommonConstans.pvGenPoweActorYear));
+                queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, CommonConstans.taiHeGenIndicator);
+                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
+                List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+                dailyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorDay)));
+                monthlyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorMonth)));
+                annualPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorYear)));
             }
 
-
         }
 
         mapdta.put("RSD", keepFourdecimalPlaces(dailyPower.get()));

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.ElectricQuantity;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.KGName;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
@@ -1936,22 +1937,27 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> likeQuerCondtion = new HashMap<>();
         if(query!=null){
-            likeQuerCondtion.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+            queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName,CommonConstans.taiHeGenIndicator);
+        }
+        List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+        Double powerOfDay = 0.0000;
+        Double powerOfMonth = 0.0000;
+        Double powerOfAnnual = 0.0000;
+        if(ObjectUtils.isEmpty(query)){
+            powerOfDay = powerOfDay + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量"));
+            powerOfMonth = powerOfMonth + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量"));
+            powerOfAnnual = powerOfAnnual + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量"));
+        }else {
+            powerOfDay = powerOfDay + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorDay));
+            powerOfMonth = powerOfMonth + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorMonth));
+            powerOfAnnual = powerOfAnnual + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorYear));
         }
 
-        List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeQuerCondtion);
-        Double powerOfDayFD = 0.0000;
-        Double powerOfMonthFD = 0.0000;
-        Double powerOfAnnualFD = 0.0000;
-
-        powerOfDayFD = powerOfDayFD + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量"));
-        powerOfMonthFD = powerOfMonthFD + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量"));
-        powerOfAnnualFD = powerOfAnnualFD + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "年发电量"));
 
         Map<String, Object> hashMap = new HashMap<>();
-        hashMap.put("日发电量",powerOfDayFD);
-        hashMap.put("月发电量",powerOfMonthFD);
-        hashMap.put("年发电量",powerOfAnnualFD);
+        hashMap.put("日发电量",powerOfDay);
+        hashMap.put("月发电量",powerOfMonth);
+        hashMap.put("年发电量",powerOfAnnual);
         return hashMap;
     }
 

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

@@ -88,16 +88,15 @@ public class PowerGenerationImpl {
             //"日发电量"
             if("日发电量".equals(value)){
                 //"日发电量"
-                flags=  CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay;
+                value=  CommonConstans.taiHeGenIndicatorDay;
             }else if("月发电量".equals(value)){
                 //"月发电量"
-                flags= CommonConstans.pvGenPoweActornew;
+                value= CommonConstans.taiHeGenIndicatorMonth;
             }else{
                 //"年发电量"
-                flags=  CommonConstans.pvGenPoweActorYear;
+                value=  CommonConstans.taiHeGenIndicatorYear;
             }
-
-            indexDto=  indicatorDataMapper.selectlastgf(value,  gatewayId,  startTime, endTime);
+            indexDto=  indicatorDataMapper.selectlastgf(value,  stationCacheInfoDto.getBoosterGatewayId(),  startTime, endTime);
             //indexDto= this.getlastgf(gatewayId,value,datyvalue);
         }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/PersonYardMessage.java

 package com.yeejoin.amos.boot.module.jxiop.biz.emqx;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PersonBasicServiceImpl;
-import com.yeejoin.amos.component.robot.AmosRequestContext;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.annotation.PostConstruct;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 @Component
-@EnableScheduling
 @Slf4j
 public class PersonYardMessage extends EmqxListener {
-    @Autowired
-    private AmosRequestContext amosAuth;
 
     @Autowired
     protected EmqKeeper emqKeeper;

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/StationYardMessage.java

@@ -3,15 +3,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.emqx;
 import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import lombok.extern.slf4j.Slf4j;
-import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
@@ -20,12 +16,9 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 @Component
-@EnableScheduling
 @Slf4j
 public class StationYardMessage extends EmqxListener {
 
-    @Autowired
-    private AmosRequestContext amosAuth;
 
     @Autowired
     protected EmqKeeper emqKeeper;
@@ -34,7 +27,9 @@ public class StationYardMessage extends EmqxListener {
     private StationBasicMapper stationBasicMapper;
 
 
-    // 江西电建接收红黄绿码主题
+    /**
+     * 江西电建接收红黄绿码主题
+     */
     private static final String JXIOP_STATION_YARD = "jxIop/station/yard";
 
     private static final BlockingQueue<List<Map<String, String>>> blockingQueue = new LinkedBlockingQueue<List<Map<String, String>>>();

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

@@ -77,7 +77,7 @@ public class MonitorFanIdxController extends BaseController {
     MonitorFanIndicatorMapper monitorFanIndicatorMapper;
     @Autowired
     EmqKeeper emqKeeper;
-//    @Autowired
+    //    @Autowired
 //    InfluxdbUtil influxdbUtil;
     @Value("${fan.statuts.stattuspath}")
     private String fanStatusImagePathPrefix;
@@ -523,11 +523,9 @@ public class MonitorFanIdxController extends BaseController {
         } else if (type.equals("1")) {
             StationBasic stationBasic = stationBasicMapper.selectById(stationId);
             String fanGatewayId = stationBasic.getFanGatewayId();
-            if("FDZ".equals(stationBasic.getStationType())) 
-            {
+            if ("FDZ".equals(stationBasic.getStationType())) {
                 resultsData = monitorFanIndicatorImpl.getNationWideInfo(current, size, fanGatewayId, null);
-            }else 
-            {
+            } else {
                 resultsData = equipAlarmEventServiceImpl.getEventByEquipIndex(fanGatewayId, current, size, null, null);
             }
 
@@ -637,8 +635,7 @@ public class MonitorFanIdxController extends BaseController {
         queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("南瑞光差保护_313P", "WTX-801_25_WTX-801_总辐射累计", "WTX-801_25_WTX-801_总辐射", "313光差保护_总反向有功电度"));
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
         List<ESEquipments> result1 = commonService.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
-        columnMap.put("有功功率", String.format("%.2f", commonService.getSumByEquipmentIndxName(result1, "南瑞光差保护_313P") * CommonConstans.kwToMv * 10));
-
+        columnMap.put("有功功率", String.format("%.2f", commonService.getSumByEquipmentIndxName(result1, "南瑞光差保护_313P") * CommonConstans.kwToMv));
         String num = monitorFanIndicator.getEquipCount(gatewayId, "GF");
         columnMap.put("风机台数", num);
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
@@ -676,10 +673,10 @@ public class MonitorFanIdxController extends BaseController {
         //综合效率 = 发电量/理论发电量
         //理论发电量 = 峰值日照数 * 总装机容量
         //峰值日照数 = 累计辐照度/3.6
-        Double powerAll = indicatorDataMapper.selectLastDataOfPower("313光差保护_总反向有功电度", boosterGatewayId).getValueF() * CommonConstans.kwToMv * 0.028;
+        Double todayPower = Double.valueOf(columnMap.get(CommonConstans.taiHeGenIndicatorDay).toString());
         Double total = commonService.getSumByEquipmentIndxName(result1, "WTX-801_25_WTX-801_总辐射累计");
-        if (powerAll > 0 && total > 0) {
-            Double overallEfficiency = powerAll / ((total / 3.6) * capacityl);
+        if (todayPower > 0 && total > 0) {
+            Double overallEfficiency = todayPower*CommonConstans.wkwhToMv / ((total / 3.6) * capacityl);
             data9.put("title", String.format("%.2f", overallEfficiency * 100) + "%");//综合效率
         } else {
             data9.put("title", "0.00%");//综合效率
@@ -690,7 +687,6 @@ public class MonitorFanIdxController extends BaseController {
         result.setCurrent(1);
         result.setTotal(objects.size());
         return ResponseHelper.buildResponse(result);
-
     }
 
 
@@ -863,8 +859,8 @@ public class MonitorFanIdxController extends BaseController {
     public ResponseModel<ResultsData> getEventByEquipIndex(@RequestParam(value = "current") int current,
                                                            @RequestParam(value = "size") int size,
                                                            @RequestParam(value = "stationId") String stationId,
-                                                           @RequestParam(value = "equipIndex",required = false) String equipIndex,
-                                                           @RequestParam(value = "frontModule",required = false) String frontModule) {
+                                                           @RequestParam(value = "equipIndex", required = false) String equipIndex,
+                                                           @RequestParam(value = "frontModule", required = false) String frontModule) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getFanGatewayId();
         ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex, frontModule);

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

@@ -2064,7 +2064,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return deaviationRateDtoPage;
     }
 
-    @Scheduled(cron = "0 */1 * * * ?")
+    @Scheduled(cron = "0 */5 * * * ?")
     public void addNbqAlarmEvent() {
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -2075,7 +2075,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             Map<String, String> shouldCondtion = new HashMap<>();
             queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
             queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("待机", "停机", "告警运行", "限额运行", "降额运行", "故障停机", "通讯故障", "运行"));
-            queryCondtion.put(CommonConstans.QueryStringValue, Arrays.asList("true"));
+            queryCondtion.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
 
             /**
              * 逆变器
@@ -2085,7 +2085,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
              * 汇流箱
              */
             queryCondtion.remove(CommonConstans.QueryStringEquipmentIndexName);
-            queryCondtion.remove(CommonConstans.QueryStringValue);
+            queryCondtion.remove(CommonConstans.QueryStringValueKeyword);
             queryCondtion.put(CommonConstans.QueryStringDataType, Arrays.asList("state"));
             shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "汇流箱");
             List<ESEquipments> indicatorsDtoListHLX = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondtion, ESEquipments.class);
@@ -2095,13 +2095,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "箱变");
             List<ESEquipments> indicatorsDtoListXB = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondtion, ESEquipments.class);
             ;
-
             indicatorsDtoList.addAll(indicatorsDtoListHLX);
            indicatorsDtoList.addAll(indicatorsDtoListXB);
 
             List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
             List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();
             long time = new Date().getTime();
+            if (CollectionUtils.isNotEmpty(indicatorsDtoList)){
                 for (ESEquipments esEquipments : indicatorsDtoList) {
                     EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
                     equipAlarmEvent.setEquipIndex(esEquipments.getEquipmentNumber());
@@ -2116,6 +2116,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     newEquipAlarmEvents.add(equipAlarmEvent);
                     newEquipAlarmEvent.add(equipAlarmEvent);
                 }
+            }
+
 
             String lastSort = equipAlarmEventMapper.getLastDataBySort(stationBasic.getFanGatewayId());
             if (null != lastSort) {

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -69,7 +70,7 @@ public class MonitoringServiceImpl {
 
     @Autowired
     EmqKeeper emqKeeper;
-//    @Autowired
+    //    @Autowired
 //    InfluxdbUtil influxdbUtil;
     @Autowired
     IndicatorDataMapper indicatorDataMapper;
@@ -257,7 +258,7 @@ public class MonitoringServiceImpl {
                     List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, null);
                     List<ESEquipments> result1 = commonServiceImpl.getListDataByCondtions(queryCondtion1, null, ESEquipments.class);
                     completionOfPowerIndicatorsDto.setWindSpeedOrIrradiance(String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result1, "WTX-801_25_WTX-801_总辐射")));
-                    completionOfPowerIndicatorsDto.setActivePower(String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result1, "南瑞光差保护_313P")*CommonConstans.kwToMv));
+                    completionOfPowerIndicatorsDto.setActivePower(String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result1, "南瑞光差保护_313P") * CommonConstans.kwToMv));
                     completionOfPowerIndicatorsDto.setDailyPower(String.format(CommonConstans.Fourdecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorDay)));
                     completionOfPowerIndicatorsDto.setMonthlyPower(String.format(CommonConstans.Fourdecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorMonth)));
                     completionOfPowerIndicatorsDto.setAnnualPower(String.format(CommonConstans.Fourdecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorYear)));
@@ -691,6 +692,12 @@ public class MonitoringServiceImpl {
     public Page<HashMap<String, String>> getDetailsOnPowergeneration(String areaName) {
         Page<HashMap<String, String>> hashMapPage = new Page<>(1, 99);
         List<HashMap<String, String>> hashMapList = new ArrayList<>();
+        List<StationCacheInfoDto> stationCacheInfoDtoList = new ArrayList<>();
+        stationCacheInfoDtoList = commonServiceImpl.getListStationCacheInfoDto();
+        if (!ObjectUtils.isEmpty(areaName)) {
+            stationCacheInfoDtoList = stationCacheInfoDtoList.stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getBelongArea().equals(areaName)).collect(Collectors.toList());
+        }
+
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("fan_gateway_id"));
         //日发电量
         AtomicReference<Double> dailyPower = new AtomicReference<>(0.0);
@@ -698,11 +705,11 @@ public class MonitoringServiceImpl {
         AtomicReference<Double> monthlyPower = new AtomicReference<>(0.0);
         //年发电量
         AtomicReference<Double> annualPower = new AtomicReference<>(0.0);
-        stationBasicList.forEach(stationBasic -> {
-            if ("FDZ".equals(stationBasic.getStationType())) {
+        stationCacheInfoDtoList.forEach( stationCacheInfoDto->{
+            if ("FDZ".equals(stationCacheInfoDto.getStationType())) {
                 Map<String, List<String>> queryCondtion = new HashMap<>();
                 queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("日发电量", "月发电量", "年发电量"));
-                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
+                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getFanGatewayId()));
                 List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
                 dailyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量")));
                 monthlyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量")));
@@ -710,7 +717,7 @@ public class MonitoringServiceImpl {
             } else {
                 Map<String, List<String>> queryCondtion = new HashMap<>();
                 queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, CommonConstans.taiHeGenIndicator);
-                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
+                queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getBoosterGatewayId()));
                 List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
                 dailyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorDay)));
                 monthlyPower.updateAndGet(v -> v + keepFourdecimalPlaces(commonServiceImpl.getSumByEquipmentIndxName(result, CommonConstans.taiHeGenIndicatorMonth)));

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdmapper/IndicatorDataMapper.java

@@ -11,17 +11,17 @@ import java.util.List;
 @Repository
 public interface IndicatorDataMapper extends BaseMapper<IndicatorData> {
 
-    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and equipment_number = #{equipmentNumber} and  ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
+    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and equipment_number = #{equipmentNumber} and  created_time >= #{startTime} and created_time <= #{endTime} and gateway_id =#{gatewayId}")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeAndEquipmentNumber(@Param("equipmentIndexName") String equipmentIndexName, @Param("equipmentNumber") String equipmentNumber, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
 
-    @Select("select `value`, created_time, `value_f` as valueF, equipment_index_name from iot_data.indicator_data where equipment_index_name like '%路电流%' and equipment_number = #{equipmentNumber} and  ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
+    @Select("select `value`, created_time, `value_f` as valueF, equipment_index_name from iot_data.indicator_data where equipment_index_name like '%路电流%' and equipment_number = #{equipmentNumber} and  created_time >= #{startTime} and created_time <= #{endTime} and gateway_id =#{gatewayId}")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeAndEquipmentNumberPv(@Param("equipmentNumber") String equipmentNumber, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
 
     @Select("select last(`value_f`) as `value_f`,created_time from  iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and gateway_id=#{gatewayId} ")
     IndicatorData selectLastDataOfPower(@Param("equipmentIndexName") String equipmentIndexName, @Param("gatewayId") String gatewayId);
 
-
-    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName}  and  ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
+    @Select("select last(`value_f`) as `value_f`,created_time from  iot_data.indicator_data where equipment_index_name =#{equipmentIndexName} and gateway_id=#{gatewayId} and created_time <= #{endTime} ")
+    IndicatorData selectLastDataOfPower(@Param("equipmentIndexName") String equipmentIndexName, @Param("gatewayId") String gatewayId,@Param("endTime") String endTime);
+    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName}  and  created_time >= #{startTime} and created_time <= #{endTime} and gateway_id =#{gatewayId}")
     List<IndicatorData> selectDataByequipmentIndexNameAndtime(@Param("equipmentIndexName") String equipmentIndexName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
-
 }

amos-boot-system-kgd/src/main/resources/application-dev.properties

@@ -44,8 +44,8 @@ lettuce.timeout=10000
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.3.18:2883
-emqx.user-name=super
-emqx.password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000