分析需求 API开发，bug修改

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

@@ -9,8 +9,10 @@ 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.ESEquipments;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
+import com.yeejoin.amos.boot.module.jxiop.biz.scheduled.PowerGeneration;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationBasicServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TestServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
@@ -53,6 +55,9 @@ public class DemoController extends BaseController {
     EmqKeeper emqKeeper;
 
     @Autowired
+    PowerGeneration powerGeneration;
+
+    @Autowired
     private MonitorFanIndicatorMapper monitorFanIndicatorregionMapper;
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -199,4 +204,15 @@ public class DemoController extends BaseController {
         return ResponseHelper.buildResponse(hashMap);
     }
 
+
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "test99")
+    @GetMapping("/test99")
+    public void test19() {
+        powerGeneration.addESDailyPowerGeneration();
+        powerGeneration.addESYearPowerGeneration();
+        powerGeneration.addESMoonPowerGeneration();
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/repository/ESDailyPowerGenerationRepository.java

+package com.yeejoin.amos.boot.module.jxiop.biz.repository;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESDailyPowerGeneration;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/9
+ */
+@Repository
+public interface  ESDailyPowerGenerationRepository extends PagingAndSortingRepository<ESDailyPowerGeneration, String> {
+}
+

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/repository/ESEquipmentsRepository.java

+package com.yeejoin.amos.boot.module.jxiop.biz.repository;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/8
+ */
+@Repository
+public interface ESEquipmentsRepository extends PagingAndSortingRepository<ESEquipments, String> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/repository/ESMoonPowerGenerationRepository.java

+package com.yeejoin.amos.boot.module.jxiop.biz.repository;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/9
+ */
+@Repository
+public interface  ESMoonPowerGenerationRepository extends PagingAndSortingRepository<ESMoonPowerGeneration, String> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/repository/ESWindSpeedRepository.java

+package com.yeejoin.amos.boot.module.jxiop.biz.repository;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESWindSpeed;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/8
+ */
+@Repository
+public interface ESWindSpeedRepository extends PagingAndSortingRepository<ESWindSpeed, Long> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/repository/ESYearPowerGenerationRepository.java

+package com.yeejoin.amos.boot.module.jxiop.biz.repository;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESYearPowerGeneration;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/9
+ */
+
+@Repository
+public interface  ESYearPowerGenerationRepository extends PagingAndSortingRepository<ESYearPowerGeneration, String> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/scheduled/PowerGeneration.java

+package com.yeejoin.amos.boot.module.jxiop.biz.scheduled;//package com.yeejoin.amos.boot.module.jxiop.biz.scheduled;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESDailyPowerGeneration;
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PowerGenerationImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/9
+ */
+
+@Component
+@EnableScheduling
+public class PowerGeneration {
+
+    @Autowired
+    PowerGenerationImpl powerGenerationImpl;
+    @Autowired
+    CommonServiceImpl commonServiceImpl;
+
+    private final  String dayvalue="日发电量";
+    private final  String moonValue="月发电量";
+    private final  String yearValue="年发电量";
+
+    private final  String dayDateFormat="yyyy-MM-dd";
+    private final  String moonDateFormat="yyyy-MM";
+    private final  String yearDateFormat="yyyy";
+
+    private final  String dayType="day";
+    private final  String moonType="moon";
+    private final  String yearType="year";
+
+    //定时更新日发电量
+    @Scheduled(cron = "${daily.power.generation.cron}")
+    public void addESDailyPowerGeneration(){
+        List<StationCacheInfoDto>  list =commonServiceImpl.getListStationCacheInfoDto();
+        //获取时间天字符串
+        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
+        Date now=new Date();
+        String daty= myFmt2.format(now);
+        for (StationCacheInfoDto stationCacheInfoDto : list) {
+
+            if("FDZ".equals(stationCacheInfoDto.getStationType())){
+
+                //风机
+                powerGenerationImpl.addPowerGeneration( stationCacheInfoDto, stationCacheInfoDto.getFanGatewayId(),  dayvalue,  dayDateFormat,  dayType,"FDZ",daty);
+
+            }else{
+
+              //光伏
+                powerGenerationImpl.addPowerGeneration( stationCacheInfoDto, stationCacheInfoDto.getFanGatewayId(),  dayvalue,  dayDateFormat,  dayType,"GFDZ",daty);
+
+            }
+
+        }
+
+
+    }
+    //定时更新月发电量
+   @Scheduled(cron = "${moon.power.generation.cron}")
+    public void addESMoonPowerGeneration(){
+        List<StationCacheInfoDto>  list =commonServiceImpl.getListStationCacheInfoDto();
+        //获取时间天字符串
+        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
+        Date now=new Date();
+        String daty= myFmt2.format(now);
+        for (StationCacheInfoDto stationCacheInfoDto : list) {
+            //风机
+            if("FDZ".equals(stationCacheInfoDto.getStationType())){
+
+                //风机
+                powerGenerationImpl.addPowerGeneration( stationCacheInfoDto, stationCacheInfoDto.getFanGatewayId(),  moonValue,  moonDateFormat,  moonType,"FDZ",daty);
+
+            }else{
+
+                //光伏
+                powerGenerationImpl.addPowerGeneration( stationCacheInfoDto, stationCacheInfoDto.getFanGatewayId(),  moonValue,  moonDateFormat,  moonType,"GFDZ",daty);
+
+            }
+
+        }
+    }
+    //定时更新年发电量
+    @Scheduled(cron = "${year.power.generation.cron}")
+    public void addESYearPowerGeneration(){
+        List<StationCacheInfoDto>  list =commonServiceImpl.getListStationCacheInfoDto();
+        //获取时间天字符串
+        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
+        Date now=new Date();
+        String daty= myFmt2.format(now);
+        for (StationCacheInfoDto stationCacheInfoDto : list) {
+            //风机
+            if("FDZ".equals(stationCacheInfoDto.getStationType())){
+
+                //风机
+                powerGenerationImpl.addPowerGeneration( stationCacheInfoDto, stationCacheInfoDto.getFanGatewayId(),  yearValue,  yearDateFormat,  yearType,"FDZ",daty);
+
+            }else{
+
+                //光伏
+                powerGenerationImpl.addPowerGeneration( stationCacheInfoDto, stationCacheInfoDto.getFanGatewayId(),  yearValue,  yearDateFormat,  yearType,"GFDZ",daty);
+
+            }
+
+        }
+    }
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/scheduled/WindSpeedScheduled.java

+package com.yeejoin.amos.boot.module.jxiop.biz.scheduled;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.TemporaryDataMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESWindSpeedRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+@EnableScheduling
+public class WindSpeedScheduled {
+
+
+
+    @Autowired
+    TemporaryDataMapper temporaryDataMapper;
+    @Autowired
+    ESWindSpeedRepository esWindSpeedRepository;
+
+    @Scheduled(cron="${windSpeed.cron}")
+    private void initData(){
+        esWindSpeedRepository.saveAll(temporaryDataMapper.getAllData());
+    }
+
+
+}

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
@@ -220,7 +221,7 @@ public class CommonServiceImpl {
                 .withPageable(PageRequest.of(0, 1))
                 .build();
         query.setTrackTotalHits(true);
-        SearchHits search = elasticsearchTemplate.search(query, ESEquipments.class);
+        SearchHits search = elasticsearchTemplate.search(query, clas);
         if (search.hasAggregations()) {
             Aggregations aggregations = search.getAggregations();
             if (Objects.nonNull(aggregations)) {

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationPlan;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationPlanMapper;
+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.dto.SeriesData;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.DateUtil;
@@ -377,7 +379,7 @@ public class LargeScreenImpl {
          value1.add(monthy);
          map.put("moon.keyword",value1);
 
-         List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"valueDouble" ,"day.keyword",ESEquipments.class);
+         List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day.keyword", ESDailyPowerGeneration.class);
 
          Map<String,Double>  mapdta=new HashMap<>();
          DecimalFormat format2 = new DecimalFormat("#.0000");

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;//package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESDailyPowerGeneration;
+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.StationCacheInfoDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESDailyPowerGenerationRepository;
+import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESMoonPowerGenerationRepository;
+import com.yeejoin.amos.boot.module.jxiop.biz.repository.ESYearPowerGenerationRepository;
+import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/9
+ */
+@Service
+public class PowerGenerationImpl {
+
+    @Autowired
+    InfluxDButils influxDButils;
+    @Autowired
+    private ElasticsearchRestTemplate elasticsearchTemplate;
+    @Autowired
+    ESYearPowerGenerationRepository yearPowerGenerationRepository;
+    @Autowired
+    ESMoonPowerGenerationRepository moonPowerGenerationRepository;
+    @Autowired
+    ESDailyPowerGenerationRepository dailyPowerGenerationRepository;
+
+
+    //获取指定指标，当天最后一条数据
+    public List<IndexDto> getlast(String gatewayId, String value,String daty){
+        IndexDto indexDto=null;
+
+        String querySql = " SELECT * FROM iot_data_%s  WHERE equipmentIndexName='%s'  and time >='%sT00:55:00Z' AND time < '%sT23:59:59Z'  group by equipmentsIdx order by time desc  LIMIT   1";
+
+        querySql = String.format(querySql, gatewayId, value,daty,daty);
+        List<IndexDto> queryList  = influxDButils.getListData(querySql,IndexDto.class);
+        return queryList;
+    }
+    public List<IndexDto> getlastgf(String gatewayId, String value,String daty){
+        IndexDto indexDto=null;
+        String querySql = " SELECT * FROM iot_data_%s  WHERE equipmentIndexName='%s' and   equipmentSpecificName    =~/.*逆变器.*/   and time >='%sT00:55:00Z' AND time < '%sT23:59:59Z'  group by equipmentsIdx order by time desc  LIMIT   1";
+
+        querySql = String.format(querySql, gatewayId, value,daty,daty);
+        List<IndexDto> queryList  = influxDButils.getListData(querySql,IndexDto.class);
+        return queryList;
+    }
+    //更新es 数据
+
+    //@Async("jxiopAsyncExecutor")
+    public void addPowerGeneration(StationCacheInfoDto stationCacheInfoDto,String gatewayId, String value, String dateFormat, String type, String stationType,String datyvalue){
+        //获取指标值
+        List<IndexDto> indexDto=null;
+
+        if("FDZ".equals(stationType)){
+            indexDto= this.getlast(gatewayId,value, datyvalue);
+        }else{
+            indexDto= this.getlastgf(gatewayId,value,datyvalue);
+        }
+
+        SimpleDateFormat myFmt2=new SimpleDateFormat(dateFormat);
+        Date now=new Date();
+        String daty= myFmt2.format(now);
+        this.PowerGeneration(stationCacheInfoDto,indexDto,daty,type);
+    }
+
+
+    //更新es
+    public void PowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndexDto> indexDto,String daty,String type){
+        Calendar calendar = Calendar.getInstance();
+        int day = calendar.get(Calendar.DATE);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        int year = calendar.get(Calendar.YEAR);
+
+        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyyMM");
+        Date now=new Date();
+        String monthy= myFmt2.format(now);
+
+        SimpleDateFormat myFmty=new SimpleDateFormat("yyyy");
+        Date nowy=new Date();
+        String yeary= myFmty.format(nowy);
+
+
+        switch (type) {
+            case "day":
+                List<ESDailyPowerGeneration> listd=   this.getESDailyPowerGeneration(stationCacheInfoDto,indexDto,daty,String.valueOf(day),monthy);
+                dailyPowerGenerationRepository.saveAll(listd);
+                break;
+            case "moon":
+                List<ESMoonPowerGeneration> listm=   this.getESMoonPowerGeneration(stationCacheInfoDto,indexDto,daty,String.valueOf(month),yeary);
+                moonPowerGenerationRepository.saveAll(listm);
+                break;
+            case "year":
+                List<ESYearPowerGeneration> listy=   this.getESYearPowerGeneration(stationCacheInfoDto,indexDto,daty,String.valueOf(year));
+                yearPowerGenerationRepository.saveAll(listy);
+                break;
+            default:
+                break;
+        }
+
+    }
+
+// 组装数据
+
+    public List<ESDailyPowerGeneration> getESDailyPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndexDto> indexDto,String daty,String day,String month){
+
+        List<ESDailyPowerGeneration> list=new ArrayList<>();
+        if(indexDto!=null&&!indexDto.isEmpty()){
+            for (IndexDto dto : indexDto) {
+                ESDailyPowerGeneration dailyPowerGeneration=new ESDailyPowerGeneration(
+                        daty+"_"+dto.getAddress(),
+                        stationCacheInfoDto.getStationId(),
+                        stationCacheInfoDto.getStationName(),
+                        stationCacheInfoDto.getStationType(),
+                        stationCacheInfoDto.getBelongProvince(),
+                        stationCacheInfoDto.getBelongArea(),
+                        day,
+                        dto.getGatewayId(),
+                        new Date(),
+                        dto.getValue()!=null?Double.valueOf(dto.getValue()):null,
+                        dto.getEquipmentIndexName(),
+                        dto.getEquipmentNumber(),
+                        dto.getAddress(),
+                        month
+                );
+                list.add(dailyPowerGeneration);
+            }
+        }
+        return list;
+    }
+    public List<ESMoonPowerGeneration> getESMoonPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndexDto> indexDto,String daty,String day,String year){
+        List<ESMoonPowerGeneration> list=new ArrayList<>();
+        if(indexDto!=null&&!indexDto.isEmpty()){
+            for (IndexDto dto : indexDto) {
+                ESMoonPowerGeneration moonPowerGeneration=new ESMoonPowerGeneration(
+                        daty+"_"+dto.getAddress(),
+                        stationCacheInfoDto.getStationId(),
+                        stationCacheInfoDto.getStationName(),
+                        stationCacheInfoDto.getStationType(),
+                        stationCacheInfoDto.getBelongProvince(),
+                        stationCacheInfoDto.getBelongArea(),
+                        day,
+                        dto.getGatewayId(),
+                        new Date(),
+                        dto.getValue()!=null?Double.valueOf(dto.getValue()):null,
+                        dto.getEquipmentIndexName(),
+                        dto.getEquipmentNumber(),
+                        dto.getAddress(),
+                        year
+                );
+                list.add(moonPowerGeneration);
+            }
+        }
+        return list;
+    }
+    public List<ESYearPowerGeneration> getESYearPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndexDto> indexDto,String daty,String day){
+        List<ESYearPowerGeneration> list=new ArrayList<>();
+        if(indexDto!=null&&!indexDto.isEmpty()){
+            for (IndexDto dto : indexDto) {
+                ESYearPowerGeneration yearPowerGeneration=new ESYearPowerGeneration(
+                        daty+"_"+dto.getAddress(),
+                        stationCacheInfoDto.getStationId(),
+                        stationCacheInfoDto.getStationName(),
+                        stationCacheInfoDto.getStationType(),
+                        stationCacheInfoDto.getBelongProvince(),
+                        stationCacheInfoDto.getBelongArea(),
+                        day,
+                        dto.getGatewayId(),
+                        new Date(),
+                        dto.getValue()!=null?Double.valueOf(dto.getValue()):null,
+                        dto.getEquipmentIndexName(),
+                        dto.getEquipmentNumber(),
+                        dto.getAddress()
+                );
+                list.add(yearPowerGeneration);
+            }
+        }
+        return list;
+    }
+
+
+
+
+
+
+
+}