修改全国，区域功率曲线

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/pom.xml

@@ -35,6 +35,11 @@
           <groupId>org.influxdb</groupId>
           <artifactId>influxdb-java</artifactId>
       </dependency>
+      <dependency>
+          <groupId>cn.hutool</groupId>
+          <artifactId>hutool-all</artifactId>
+          <version>5.7.22</version>
+      </dependency>
 <!--      <dependency>-->
 <!--          <groupId>com.yeejoin</groupId>-->
 <!--          <artifactId>amos-component-influxdb</artifactId>-->

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

@@ -112,4 +112,10 @@ public class CommonConstans {
     public static final String taiHeGenIndicatorDay = "泰和日发电量总和";
     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-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java

@@ -12,6 +12,7 @@ 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.api.service.IMapRegionService;
+import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*;
@@ -20,6 +21,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javafx.scene.control.Tab;
 import org.aspectj.apache.bcel.classfile.Module;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.influxdb.dto.QueryResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -175,6 +177,29 @@ public class MonitoringMapController extends BaseController {
     }
 
 
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "场站-功率曲线")
+    @GetMapping("/getDetailsWindSpeed")
+    public ResponseModel<Map<String, Object>> getDetailsWindSpeed(@RequestParam(required = false)String stationId) {
+
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        monitoringServiceImpl.getDetailsWindSpeedAlldata(stationBasic);
+        return ResponseHelper.buildResponse(null);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "场站-功率曲线")
+    @GetMapping("/getDetailsWindSpeedAlldataqg")
+    public ResponseModel<Map<String, Object>> getDetailsWindSpeedAlldataqg(@RequestParam(required = false)String stationId) {
+
+
+        Map<String, Object> map=  largeScreenImpl.getDetailsWindSpeedAlldataqg();
+        return ResponseHelper.buildResponse(map);
+    }
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(value = "监盘首页-  全国发电量趋势完成率")
     @GetMapping("/gettimedateqyyfdqs")
@@ -195,6 +220,24 @@ public class MonitoringMapController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "监盘首页-  区域功率曲线率")
+    @GetMapping("/getDetailsWindqy")
+    public ResponseModel<Map<String,Object>> getDetailsWindqy(String areaName) {
+
+        List<StationBasic>   stationBasicListAll = getListOfStationBasicByAreaName(areaName);
+
+        Map<String,Object> map=   largeScreenImpl.getDetailsWindqy( areaName,stationBasicListAll);
+
+        return  ResponseHelper.buildResponse(map);
+    }
+
+
+
+
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(value = "监盘首页-  全国发电量趋势完成率")
     @GetMapping("/gettimedateqyyfd")
     public ResponseModel<Map<String,Object>> sendQYFDLMqttyfd(String areaName) {

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IndicatorData.java

@@ -34,4 +34,5 @@ public class IndicatorData {
     private String  equipmentNumber;
 
     private String  displayName;
+    private String  xtime;
 }

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

@@ -117,6 +117,4 @@ public class PowerGeneration {
         }
     }
 
-
-
 }

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,10 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
 import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import lombok.Data;
+import org.checkerframework.checker.units.qual.min;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +22,10 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
-
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -39,6 +44,8 @@ public class MonitoringServiceImpl {
     RegionMapper regionMapper;
     @Autowired
     StationPlanMapper stationPlanMapper;
+    @Autowired
+    IndicatorDataMapper indicatorDataMapper;
     /**
      * 场站mapper
      */
@@ -481,6 +488,71 @@ public class MonitoringServiceImpl {
 //        return homeMapStationInfoDtoList;
 //    }
 
+
+
+    public  Map<String, Object> getDetailsWindSpeedAlldata(StationBasic stationBasic) {
+        Map<String, Object> map = new HashMap<>();
+        List<String> values = new ArrayList<>();
+        Map<Date, Double> groupMap = new HashMap<>();
+        List<String> time = new ArrayList<>();
+        Map<String, Object> activePowerInfo = new HashMap<>();
+        List<IndicatorData> activePowerList = new ArrayList<>();
+//        String startTime = DateUtil.today() + " 00:00:00";
+//        String endTime = DateUtil.today() + " 23:59:59";
+
+        Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+        Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+        String startTime = sdf.format(currentDayStartTime);
+        String endTime= sdf.format(currentDayEndTime);
+
+        Double installedCapacity = commonServiceImpl.getStationCapactityByStationWerks(stationBasic.getStationNumber());
+        if ("FDZ".equals(stationBasic.getStationType())) {
+            activePowerList = indicatorDataMapper.selectDataByequipmentIndexNameAndtime(CommonConstans.xiazaoActivePowerPoint, startTime, endTime, stationBasic.getBoosterGatewayId());
+        } else {
+            activePowerList = indicatorDataMapper.selectDataByequipmentIndexNameAndtime(CommonConstans.taiheActivePowerPoint, startTime, endTime, stationBasic.getBoosterGatewayId());
+        }
+        for (int i = 0; i < activePowerList.size(); i++) {
+            IndicatorData indicatorData = activePowerList.get(i);
+            time.add(DateUtil.format(indicatorData.getCreatedTime(), "HH:mm"));
+            if ("FDZ".equals(stationBasic.getStationType())) {
+                values.add(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF()));
+            } else {
+                values.add(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF() * CommonConstans.kwToMv));
+            }
+        }
+        String max = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).max().getAsDouble());
+        String min = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).min().getAsDouble());
+        String mean = String.format(CommonConstans.Twodecimalplaces, values.stream().mapToDouble(Double::parseDouble).average().getAsDouble());
+        activePowerInfo.put("mean", mean);
+        activePowerInfo.put("max", max);
+        activePowerInfo.put("min", min);
+        activePowerInfo.put("maxTime", time.get(values.lastIndexOf(max)));
+        activePowerInfo.put("minTime", time.get(values.lastIndexOf(min)));
+        activePowerInfo.put("load", String.format(CommonConstans.Twodecimalplaces, Double.valueOf(values.get(values.size() - 1)) / installedCapacity));
+
+
+        List<Map<String, Object>> seriesData = new ArrayList<>();
+        Map<String, Object> map3 = new HashMap<>();
+        Map<String, Object> map1 = new HashMap<>();
+        Map<String, Object> map2 = new HashMap<>();
+        map1.put("data", values);
+        seriesData.add(map1);
+        map.put("seriesData", seriesData);
+        map.put("axisData", time);
+        try {
+            emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_Power_table", JSON.toJSON(map).toString().getBytes("UTF-8"), 1, true);
+            emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_Power_info", JSON.toJSON(activePowerInfo).toString().getBytes("UTF-8"), 1, true);
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+      return map;
+    }
+
+
+
     public String getInstallCapity(List<StationBasic> stationBasicList) {
         AtomicReference<Double> total = new AtomicReference<>(0.0);
         stationBasicList.forEach(stationBasic -> {

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

@@ -18,10 +18,7 @@ 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;
+import java.util.*;
 
 /**
  * @description:
@@ -73,10 +70,21 @@ public class PowerGenerationImpl {
         //获取指标值
       // List<IndexDto> indexDto=null;
         List<IndicatorData> indexDto=null;
+//        Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+//        Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+//        String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+//        String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+
         Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
         Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
-        String startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
-        String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+        String startTime = sdf.format(currentDayStartTime);
+        String endTime= sdf.format(currentDayEndTime);
+
+
+
         Double flags=null;
         if("FDZ".equals(stationType)){
             //indexDto= this.getlast(gatewayId,value, datyvalue);

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

@@ -18,4 +18,11 @@ public interface IndicatorDataMapper extends BaseMapper<IndicatorData> {
     @Select("select LAST(address)address,LAST(gateway_id)gatewayId,LAST(data_type)dataType,LAST(equipment_index_name)equipmentIndexName,LAST(`value_f`)valueF,LAST(equipment_number)equipmentNumber,LAST(created_time)createdTime from iot_data.indicator_data where   equipment_index_name =#{equipmentIndexName}  and    gateway_id =#{gatewayId} and  ts >=#{startTime} and ts <=#{endTime}    group by address ")
     List<IndicatorData> selectlastgf(@Param("equipmentIndexName") String equipmentIndexName,@Param("gatewayId") String gatewayId,@Param("startTime") String startTime, @Param("endTime") String endTime);
 
+
+    @Select("select  created_time createdTime, `value_f` as valueF from iot_data.indicator_data where equipment_index_name =#{equipmentIndexName}  and  ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
+    List<IndicatorData> selectDataByequipmentIndexNameAndtime(@Param("equipmentIndexName") String equipmentIndexName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
+
+    @Select("select sum(valueFs) valueF,xtime  from (select  SUBSTR(`created_time`, 11,6) xtime, `value_f` as valueFs  from iot_data.indicator_data  where equipment_index_name =#{equipmentIndexName}  and  ts >= #{startTime} and ts <= #{endTime} and gateway_id in (#{gatewayId})) group  by  xtime  order by xtime   ")
+    List<IndicatorData> selectDataByequipmentIndexNameAndtimeqg(@Param("equipmentIndexName") String equipmentIndexName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
+
 }