运行监盘移除缓存

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

@@ -7,7 +7,7 @@ import java.util.HashMap;
 public class CommonConstans {
     //光伏发电量系数
     public static final Double pvGenPoweActor = 0.00001;
-    public static final Double pvGenPoweActorDay = 0.01;
+    public static final Double pvGenPoweActorDay = 0.1;
     //    风电站：
 //            （日/月/年）发电量=场站所有风机（日/月/年）发电量总和
 //            装机容量=场站所有风机装机容量总和

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

@@ -4,21 +4,14 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.MonitorFanIndicatorMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESDailyPowerGeneration;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
-import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
-import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESYearPowerGeneration;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.QueryDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
-import com.yeejoin.amos.boot.module.jxiop.biz.initdata.StationCacheDataInit;
 import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESEquipmentsRepository;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
@@ -26,35 +19,23 @@ import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.ParsedAvg;
 import org.elasticsearch.search.aggregations.metrics.ParsedSum;
 import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.elasticsearch.search.sort.MinAndMax;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.web.bind.annotation.*;
@@ -65,12 +46,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 
 @RestController
@@ -103,8 +81,6 @@ public class DemoController extends BaseController {
     CommonServiceImpl commonServiceImpl;
 //    @Autowired
 //    PowerGenerationImpl powerGenerationImpl;
-    @Autowired
-    StationCacheDataInit stationCacheDataInit;
 
 //    @Autowired
 //    LargeScreenImpl largeScreenImpl;
@@ -133,7 +109,7 @@ public class DemoController extends BaseController {
     public String updateStationCacheInfo() {
         String updateResult = "更新场站信息缓存成功";
         try {
-            stationCacheDataInit.run();
+
         } catch (Exception e) {
              updateResult = "更新场站信息缓存成功";
             throw new RuntimeException(e);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/initdata/StationCacheDataInit.java

-package com.yeejoin.amos.boot.module.jxiop.biz.initdata;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.QueryDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-public class StationCacheDataInit implements CommandLineRunner {
-    @Autowired
-    private  StationBasicMapper stationBasicMapper;
-    @Autowired
-    private  RegionMapper regionMapper;
-    @Autowired
-    private  MapRegionMapper mapRegionMapper;
-    @Autowired
-    private  SjglZsjZsbtzMapper sjglZsjZsbtzMapper;
-    @Autowired
-    private  CommonServiceImpl commonServiceImpl;
-    @Autowired
-    private  RedisTemplate redisTemplate;
-    Logger logger = LoggerFactory.getLogger(StationCacheDataInit.class);
-
-    public void run(String... args) throws Exception {
-        redisTemplate.delete("station_info_cache");
-        List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
-        List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
-        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
-        stationBasicList.forEach(stationBasic -> {
-            StationCacheInfoDto stationCacheInfoDto = new StationCacheInfoDto();
-            stationCacheInfoDto.setStationId(stationBasic.getSequenceNbr().toString());
-            stationCacheInfoDto.setStationName(stationBasic.getStationName());
-            stationCacheInfoDto.setStationType(stationBasic.getStationType());
-            stationCacheInfoDto.setBelongProvince(regionList.stream().filter(region -> region.getRegionCode().toString().equals(stationBasic.getBelongArea().replace("[", "").split(",")[0])).map(region -> region.getRegionName()).collect(Collectors.toList()).get(0));
-            stationCacheInfoDto.setBelongArea(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 2)) || mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 3))).map(mapRegion -> mapRegion.getName()).collect(Collectors.toList()).get(0));
-            stationCacheInfoDto.setInstalledCapacity(String.format("%.2f", sjglZsjZsbtzMapper.getStationCapactityByStationWerks(stationBasic.getStationNumber())));
-            try {
-                List<QueryDto> queryDtoList = new ArrayList<>();
-                queryDtoList.add(new QueryDto("gatewayId", stationBasic.getFanGatewayId()));
-                queryDtoList.add(new QueryDto("equipmentIndexName.keyword", "有功功率"));
-                if (!stationBasic.getStationType().equals("FDZ")) {
-                    queryDtoList.add(new QueryDto("frontModule", "逆变器"));
-                }
-                stationCacheInfoDto.setEquipmentNumbers(commonServiceImpl.getCount(queryDtoList, "equipmentNumber.Keyword", ESEquipments.class).toString());
-            } catch (Exception exception) {
-              logger.info("--------------------查询ES错误---------------------------");
-            }
-            stationCacheInfoDto.setFanGatewayId(stationBasic.getFanGatewayId());
-            stationCacheInfoDto.setBoosterGatewayId(stationBasic.getBoosterGatewayId());
-            stationCacheInfoDtos.add(stationCacheInfoDto);
-        });
-        redisTemplate.opsForList().leftPushAll("station_info_cache", stationCacheInfoDtos);
-    }
-}

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

@@ -14,7 +14,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.QueryDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.initdata.StationCacheDataInit;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESEquipmentsRepository;
 import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
@@ -56,8 +55,6 @@ public class CommonServiceImpl {
     ESEquipmentsRepository equipmentsRepository;
     @Autowired
     private ElasticsearchRestTemplate elasticsearchTemplate;
-    @Autowired
-    private StationCacheDataInit stationCacheDataInit;
 
     @Autowired
     private RedisTemplate redisTemplate;
@@ -391,37 +388,23 @@ public class CommonServiceImpl {
      */
     public List<StationCacheInfoDto> getListStationCacheInfoDto() {
         List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
-        stationCacheInfoDtos = redisTemplate.opsForList().range("station_info_cache", 0, -1);
-        if (ObjectUtils.isEmpty(stationCacheInfoDtos)) {
-            List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
-            List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
-            List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
-            for (int i = 0; i < stationBasicList.size(); i++) {
-                StationBasic stationBasic = stationBasicList.get(i);
-                StationCacheInfoDto stationCacheInfoDto = new StationCacheInfoDto();
-                stationCacheInfoDto.setStationId(stationBasic.getSequenceNbr().toString());
-                stationCacheInfoDto.setStationName(stationBasic.getStationName());
-                stationCacheInfoDto.setStationType(stationBasic.getStationType());
-                stationCacheInfoDto.setBelongProvince(regionList.stream().filter(region -> region.getRegionCode().toString().equals(stationBasic.getBelongArea().replace("[", "").split(",")[0])).map(region -> region.getRegionName()).collect(Collectors.toList()).get(0));
-                stationCacheInfoDto.setBelongArea(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 2)) || mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 3))).map(mapRegion -> mapRegion.getName()).collect(Collectors.toList()).get(0));
-                stationCacheInfoDto.setInstalledCapacity(String.format("%.2f", sjglZsjZsbtzMapper.getStationCapactityByStationWerks(stationBasic.getStationNumber())));
-                try {
-                    List<QueryDto> queryDtoList = new ArrayList<>();
-                    queryDtoList.add(new QueryDto("gatewayId", stationBasic.getFanGatewayId()));
-                    queryDtoList.add(new QueryDto("equipmentIndexName.keyword", "有功功率"));
-                    if (!stationBasic.getStationType().equals("FDZ")) {
-                        queryDtoList.add(new QueryDto("frontModule", "逆变器"));
-                    }
-                    stationCacheInfoDto.setEquipmentNumbers(getCount(queryDtoList, "equipmentNumber.Keyword", ESEquipments.class).toString());
-                } catch (Exception exception) {
-                    log.info("--------------------查询ES错误---------------------------");
-                }
-                stationCacheInfoDto.setFanGatewayId(stationBasic.getFanGatewayId());
-                stationCacheInfoDto.setBoosterGatewayId(stationBasic.getBoosterGatewayId());
-                stationCacheInfoDtos.add(stationCacheInfoDto);
-            }
-            redisTemplate.opsForList().leftPushAll("station_info_cache", stationCacheInfoDtos);
+        List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
+        List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
+        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
+        for (int i = 0; i < stationBasicList.size(); i++) {
+            StationBasic stationBasic = stationBasicList.get(i);
+            StationCacheInfoDto stationCacheInfoDto = new StationCacheInfoDto();
+            stationCacheInfoDto.setStationId(stationBasic.getSequenceNbr().toString());
+            stationCacheInfoDto.setStationName(stationBasic.getStationName());
+            stationCacheInfoDto.setStationType(stationBasic.getStationType());
+            stationCacheInfoDto.setBelongProvince(regionList.stream().filter(region -> region.getRegionCode().toString().equals(stationBasic.getBelongArea().replace("[", "").split(",")[0])).map(region -> region.getRegionName()).collect(Collectors.toList()).get(0));
+            stationCacheInfoDto.setBelongArea(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 2)) || mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0, 3))).map(mapRegion -> mapRegion.getName()).collect(Collectors.toList()).get(0));
+            stationCacheInfoDto.setInstalledCapacity(String.format("%.2f", sjglZsjZsbtzMapper.getStationCapactityByStationWerks(stationBasic.getStationNumber())));
+            stationCacheInfoDto.setFanGatewayId(stationBasic.getFanGatewayId());
+            stationCacheInfoDto.setBoosterGatewayId(stationBasic.getBoosterGatewayId());
+            stationCacheInfoDtos.add(stationCacheInfoDto);
         }
+
         return stationCacheInfoDtos;
     }
 

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator;
 import com.yeejoin.amos.component.robot.BadRequest;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.expression.DoubleValue;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -211,6 +212,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 .skip((long) (current - 1) * size)
                 .limit(size)
                 .collect(Collectors.toList());
+        List<String> powerOther = Arrays.asList("月发电量", "年发电量", "总发电量");
+        if (!stationBasic.getStationType().equals("FDZ")) {
+            collect.forEach(esEquipments -> {
+                if (esEquipments.getEquipmentIndexName().equals("日发电量")) {
+                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
+                }
+                if (powerOther.contains(esEquipments.getEquipmentIndexName())) {
+                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActor));
+                }
+            });
+        }
         page.setTotal(result.size());
         page.setRecords(collect);
         return page;
@@ -516,12 +528,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
         String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
         List<IndicatorData> indicatorDataListActivePowers = new ArrayList<>();
-        indicatorDataListActivePowers= indicatorDataMapper.selectDataByequipmentIndexNameAndtimeAndEquipmentNumber("有功功率",name,startTime,endTime,gatewayId);
-        List<String> axisData= new ArrayList<>();
+        indicatorDataListActivePowers = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeAndEquipmentNumber("有功功率", name, startTime, endTime, gatewayId);
+        List<String> axisData = new ArrayList<>();
         List<String> activePowers = new ArrayList<>();
         for (int i = 0; i < indicatorDataListActivePowers.size(); i++) {
             activePowers.add(indicatorDataListActivePowers.get(i).getValue());
-            axisData.add(DateUtil.format(indicatorDataListActivePowers.get(i).getCreatedTime(),"HH:mm"));
+            axisData.add(DateUtil.format(indicatorDataListActivePowers.get(i).getCreatedTime(), "HH:mm"));
         }
         List<Map<String, Object>> seriesData = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();
@@ -1741,7 +1753,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
         String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
         String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
-        List<IndicatorData> originarPVs = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeAndEquipmentNumberPv(equipNum,startTime,endTime,gatewayId);
+        List<IndicatorData> originarPVs = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeAndEquipmentNumberPv(equipNum, startTime, endTime, gatewayId);
         originarPVs.size();
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, List<IndicatorData>> data = originarPVs.stream().collect(Collectors.groupingBy(IndicatorData::getEquipmentIndexName, TreeMap::new, Collectors.toList()));
@@ -1750,11 +1762,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         for (String s : data.keySet()) {
             Map<String, Object> map = new HashMap<>();
             List<String> value = data.get(s).stream().map(IndicatorData::getValue).collect(Collectors.toList());
-            axisData =data.get(s).stream().map(indicatorData -> DateUtil.format(indicatorData.getCreatedTime(),"HH:mm")).collect(Collectors.toList());
+            axisData = data.get(s).stream().map(indicatorData -> DateUtil.format(indicatorData.getCreatedTime(), "HH:mm")).collect(Collectors.toList());
             map.put("data", value);
             seriesData.add(map);
         }
-        resultMap.put("axisData",axisData);
+        resultMap.put("axisData", axisData);
         resultMap.put("seriesData", seriesData);
         return resultMap;
     }