提交代码

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/service/HandleESMessage2TDService.java

@@ -39,7 +39,7 @@ public class HandleESMessage2TDService {
     /**
      * 十分钟拉取ES数据存入TdEngine
      */
-    @Scheduled(cron = "0 */10 * * * ?")
+    //@Scheduled(cron = "0 */10 * * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void syncEsData2TDEngine() throws Exception {
         SimpleDateFormat format = new SimpleDateFormat(datePattern);

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application.properties

@@ -84,6 +84,6 @@ year.power.generation.cron=0 0/1 * * * ?
 large.cron=0 0/5 * * * ?
 forecast.url=http://10.20.1.29:8095/offline/time-series/decomposition
 
-budun.baseurl=http://172.31.0.22:8030/screen_api
+budun.baseurl=https://jcxt.ruioutech.com:8030/screen_api
 bigScreenPoint.url=http://iiet-jepcc.powerchina.cn:8088/core/datastorage/gateway/point/list?groupId=1827987484823289857&dataType=anal\
   og
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MockPvDeviceDataMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockPvDeviceDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.PvDeviceDataEntity;
+
+public interface MockPvDeviceDataMapper extends BaseMapper<MockPvDeviceDataEntity> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MockPvStationDataMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockPvStationDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.PvStationDataEntity;
+
+public interface MockPvStationDataMapper extends BaseMapper<MockPvStationDataEntity> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MockStationDailyDataMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockStationDailyDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.StationDailyDataEntity;
+
+public interface MockStationDailyDataMapper extends BaseMapper<MockStationDailyDataEntity> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MockWindDeviceDataMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockWindDeviceDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.WindDeviceDataEntity;
+
+public interface MockWindDeviceDataMapper extends BaseMapper<MockWindDeviceDataEntity> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MockWindStationDataMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockWindStationDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.WindStationDataEntity;
+
+public interface MockWindStationDataMapper extends BaseMapper<MockWindStationDataEntity> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/entity/MockPvDeviceDataEntity.java

+package com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "mock_jxdz_pv_device_data", autoResultMap = true)
+public class MockPvDeviceDataEntity extends BaseEntity {
+    @TableField("code")
+    private String code;
+    @TableField("name")
+    private String name;
+    /**
+     * 毫秒级别时间
+     */
+    @TableField("date_time")
+    private Long dateTime;
+    /**
+     *日发电量
+     */
+    @TableField("generation_daily")
+    private Double GenerationDaily;
+    /**
+     *月发电量
+     */
+    @TableField("generation_month")
+    private Double GenerationMonth;
+    /**
+     *年发电量
+     */
+    @TableField("generation_year")
+    private Double GenerationYear;
+    /**
+     *累计发电量
+     */
+    @TableField("generation_gross")
+    private Double GenerationGross;
+
+    @TableField("day")
+    private int day;
+
+    @TableField("hour")
+    private int hour;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/entity/MockPvStationDataEntity.java

+package com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "mock_jxdz_pv_station_data", autoResultMap = true)
+public class MockPvStationDataEntity extends BaseEntity {
+    @TableField("code")
+    private String code;
+    @TableField("name")
+    private String name;
+    /**
+     * 毫秒级别时间
+     */
+    @TableField("date_time")
+    private Long dateTime;
+    /**
+     *发电功率
+     */
+    @TableField("generation_power")
+    private Double GenerationPower;
+    /**
+     *总辐射
+     */
+    @TableField("total_radiation")
+    private Double TotalRadiation;
+    /**
+     *直接辐射
+     */
+    @TableField("direct_radiation")
+    private Double DirectRadiation;
+    /**
+     *散射辐射
+     */
+    @TableField("scatter_radiation")
+    private Double ScatterRadiation;
+    /**
+     *日发电量
+     */
+    @TableField("generation_daily")
+    private Double GenerationDaily;
+    /**
+     *月发电量
+     */
+    @TableField("generation_month")
+    private Double GenerationMonth;
+    /**
+     *年发电量
+     */
+    @TableField("generation_year")
+    private Double GenerationYear;
+    /**
+     *累计发电量
+     */
+    @TableField("generation_gross")
+    private Double GenerationGross;
+    /**
+     *利用小时数
+     */
+    @TableField("utilize_hours")
+    private Double UtilizeHours;
+    /**
+     *损失电量
+     */
+    @TableField("loss_electricity")
+    private Double LossElectricity;
+    /**
+     *总辐照度
+     */
+    @TableField("total_irradiance")
+    private Double TotalIrradiance;
+    /**
+     *直接辐照度
+     */
+    @TableField("direct_irradiance")
+    private Double DirectIrradiance;
+    /**
+     *散射辐照度
+     */
+    @TableField("scatter_irradiance")
+    private Double ScatterIrradiance;
+    /**
+     * 日上网电量
+     */
+    @TableField("on_grid_energy_daily")
+    private Double OnGridEnergyDaily;
+    /**
+     * 月上网电量
+     */
+    @TableField("on_grid_energy_month")
+    private Double OnGridEnergyMonth;
+    /**
+     * 年上网电量
+     */
+    @TableField("on_grid_energy_year")
+    private Double OnGridEnergyYear;
+    /**
+     * 累计上网电量
+     */
+    @TableField("on_grid_energy_gross")
+    private Double OnGridEnergyGross;
+
+    @TableField("day")
+    private int day;
+
+    @TableField("hour")
+    private int hour;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/entity/MockStationDailyDataEntity.java

+package com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "mock_jxdz_station_daily_data", autoResultMap = true)
+public class MockStationDailyDataEntity extends BaseEntity {
+    @TableField("code")
+    private String code;
+    @TableField("name")
+    private String name;
+    /**
+     * 毫秒级别时间
+     */
+    @TableField("date_time")
+    private Long dateTime;
+    /**
+     * 工作票总数
+     */
+    @TableField("work_ticket_total_nums")
+    private Double WorkTicketTotalNums;
+    /**
+     * 办理中工作票数
+     */
+    @TableField("work_ticket_processing_nums")
+    private Double WorkTicketProcessingNums;
+    /**
+     * 已作废工作票数
+     */
+    @TableField("work_ticket_invalidated_nums")
+    private Double WorkTicketInvalidatedNums;
+    /**
+     * 执行中工作票总数
+     */
+    @TableField("work_ticket_executing_nums")
+    private Double WorkTicketExecutingNums;
+    /**
+     * 已终结的工作票数
+     */
+    @TableField("work_ticket_terminated_nums")
+    private Double WorkTicketTerminatedNums;
+    /**
+     *定期工作任务
+     */
+    @TableField("regular_tasks_nums")
+    private Double RegularTasksNums;
+    /**
+     * 巡检任务数量
+     */
+    @TableField("inspection_tasks_nums")
+    private Double InspectionTasksNums;
+    /**
+     * 工单总数
+     */
+    @TableField("work_order_total_nums")
+    private Double WorkOrderTotalNums;
+    /**
+     * 工单作废数
+     */
+    @TableField("work_order_invalidated_nums")
+    private Double WorkOrderInvalidatedNums;
+    /**
+     * 工单待开工数
+     */
+    @TableField("work_order_to_be_opened_nums")
+    private Double WorkOrderToBeOpenedNums;
+    /**
+     * 工单终结数
+     */
+    @TableField("work_order_terminated_nums")
+    private Double WorkOrderTerminatedNums;
+    /**
+     * 工单开工数
+     */
+    @TableField("work_order_start_nums")
+    private Double WorkOrderStartNums;
+    /**
+     * 二氧化碳减排量
+     */
+    @TableField("co2_emission_reduction")
+    private Double Co2EmissionReduction;
+    /**
+     * 节约标准煤
+     */
+    @TableField("standard_coal_saving")
+    private Double StandardCoalSaving;
+    /**
+     * 二氧化硫减排量
+     */
+    @TableField("so2_emission_reduction")
+    private Double So2EmissionReduction;
+    /**
+     * 碳粉尘减排量
+     */
+    @TableField("carbon_dust_emission_reduction")
+    private Double CarbonDustEmissionReduction;
+    /**
+     * 发电效率
+     */
+    @TableField("generation_efficiency")
+    private Double GenerationEfficiency;
+
+    @TableField("day")
+    private int day;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/entity/MockWindDeviceDataEntity.java

+package com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "mock_jxdz_wind_device_data", autoResultMap = true)
+public class MockWindDeviceDataEntity extends BaseEntity {
+    @TableField("code")
+    private String code;
+    @TableField("name")
+    private String name;
+    /**
+     * 毫秒级别时间
+     */
+    @TableField("date_time")
+    private Long dateTime;
+    /**
+     *日发电量
+     */
+    @TableField("generation_daily")
+    private Double GenerationDaily;
+    /**
+     *月发电量
+     */
+    @TableField("generation_month")
+    private Double GenerationMonth;
+    /**
+     *年发电量
+     */
+    @TableField("generation_year")
+    private Double GenerationYear;
+    /**
+     *累计发电量
+     */
+    @TableField("generation_gross")
+    private Double GenerationGross;
+
+    @TableField("day")
+    private int day;
+
+    @TableField("hour")
+    private int hour;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/entity/MockWindStationDataEntity.java

+package com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "mock_jxdz_wind_station_data", autoResultMap = true)
+public class MockWindStationDataEntity extends BaseEntity {
+    @TableField("code")
+    private String code;
+    @TableField("name")
+    private String name;
+    /**
+     * 毫秒级别时间
+     */
+    @TableField("date_time")
+    private Long dateTime;
+    /**
+     *发电功率
+     */
+    @TableField("generation_power")
+    private Double GenerationPower;
+    /**
+     * 风速
+     */
+    @TableField("wind_speed")
+    private Double WindSpeed;
+    /**
+     *风向
+     */
+    @TableField("wind_direction")
+    private Double WindDirection;
+    /**
+     *日发电量
+     */
+    @TableField("generation_daily")
+    private Double GenerationDaily;
+    /**
+     * 月发电量
+     */
+    @TableField("generation_month")
+    private Double GenerationMonth;
+    /**
+     * 年发电量
+     */
+    @TableField("generation_year")
+    private Double GenerationYear;
+    /**
+     *累计发电量
+     */
+    @TableField("generation_gross")
+    private Double GenerationGross;
+    /**
+     *利用小时数
+     */
+    @TableField("utilize_hours")
+    private Double UtilizeHours;
+    /**
+     *损失电量
+     */
+    @TableField("loss_electricity")
+    private Double LossElectricity;
+    /**
+     * 日上网电量
+     */
+    @TableField("on_grid_energy_daily")
+    private Double OnGridEnergyDaily;
+    /**
+     * 月上网电量
+     */
+    @TableField("on_grid_energy_month")
+    private Double OnGridEnergyMonth;
+    /**
+     * 年上网电量
+     */
+    @TableField("on_grid_energy_year")
+    private Double OnGridEnergyYear;
+    /**
+     * 累计上网电量
+     */
+    @TableField("on_grid_energy_gross")
+    private Double OnGridEnergyGross;
+
+    @TableField("day")
+    private int day;
+
+    @TableField("hour")
+    private int hour;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/DZMTSJServiceImpl.java

@@ -6,8 +6,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MockStationDailyDataMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.Enum.JXDZAccessTypeEnum;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.Enum.JXDZCodeEnum;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockStationDailyDataEntity;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.StationDailyDataEntity;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.impl.StationDailyDataServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.utils.JXDZUtils;
@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 
@@ -34,6 +37,8 @@ public class DZMTSJServiceImpl implements IJXDZService {
     StationDailyDataServiceImpl stationDailyDataService;
     @Autowired
     JXDZMapper jxdzMapper;
+    @Autowired
+    MockStationDailyDataMapper  mockStationDailyDataMapper;
 
     @Override
     public void backupData(List list, Long dateTime) {
@@ -92,21 +97,33 @@ public class DZMTSJServiceImpl implements IJXDZService {
         stationDailyDataVO.setWorkOrderToBeOpenedNums(jxdzMapper.countWorkOrderToBeOpenedByCode(code).doubleValue());
         stationDailyDataVO.setWorkOrderTerminatedNums(jxdzMapper.countWorkOrderTerminatedByCode(code).doubleValue());
         stationDailyDataVO.setWorkOrderStartNums(jxdzMapper.countWorkOrderStartByCode(code).doubleValue());
-        //调用core 接口
-        JSONObject jsonObject = new JSONObject();
-        if (JXDZCodeEnum.XZ.getCode().equals(code)) {
-            String url = "/core/datastorage/gateway/point/list?groupId=1764453166557986818&dataType=analog";
-            jsonObject = jxdzUtils.sendCoreGetRequest(url);
-        } else if (JXDZCodeEnum.GF.getCode().equals(code)) {
-            String url = "/core/datastorage/gateway/point/list?groupId=1770308721235230721&dataType=analog";
-            jsonObject = jxdzUtils.sendCoreGetRequest(url);
-        }
-        if (jsonObject.getInteger("status") == HttpStatus.OK.value()) {
-            //补充电站测点信息
-            supplementStationData(jsonObject.getJSONArray("result"), stationDailyDataVO);
-            supplementBDData(stationDailyDataVO, code);
-            //补充其他信息
-        }
+
+        LocalDateTime today = LocalDateTime.now();
+        int day =today.getDayOfMonth();
+        MockStationDailyDataEntity mockStationDailyDataEntity= mockStationDailyDataMapper.selectOne(new LambdaQueryWrapper<MockStationDailyDataEntity>()
+                .eq(MockStationDailyDataEntity::getName,name).eq(MockStationDailyDataEntity::getDay,day));
+        stationDailyDataVO.setCo2EmissionReduction(mockStationDailyDataEntity.getCo2EmissionReduction());
+        stationDailyDataVO.setStandardCoalSaving(mockStationDailyDataEntity.getStandardCoalSaving());
+        stationDailyDataVO.setSo2EmissionReduction(mockStationDailyDataEntity.getSo2EmissionReduction());
+        stationDailyDataVO.setCarbonDustEmissionReduction(mockStationDailyDataEntity.getCarbonDustEmissionReduction());
+        stationDailyDataVO.setGenerationEfficiency(mockStationDailyDataEntity.getGenerationEfficiency());
+
+
+        //        //调用core 接口
+//        JSONObject jsonObject = new JSONObject();
+//        if (JXDZCodeEnum.XZ.getCode().equals(code)) {
+//            String url = "/core/datastorage/gateway/point/list?groupId=1764453166557986818&dataType=analog";
+//            jsonObject = jxdzUtils.sendCoreGetRequest(url);
+//        } else if (JXDZCodeEnum.GF.getCode().equals(code)) {
+//            String url = "/core/datastorage/gateway/point/list?groupId=1770308721235230721&dataType=analog";
+//            jsonObject = jxdzUtils.sendCoreGetRequest(url);
+//        }
+//        if (jsonObject.getInteger("status") == HttpStatus.OK.value()) {
+//            //补充电站测点信息
+//            supplementStationData(jsonObject.getJSONArray("result"), stationDailyDataVO);
+//            supplementBDData(stationDailyDataVO, code);
+//            //补充其他信息
+//        }
         return stationDailyDataVO;
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/JXDZExecute.java

@@ -3,11 +3,23 @@ package com.yeejoin.amos.boot.module.jxiop.biz.jxdz.factory;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MockPvDeviceDataMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MockPvStationDataMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MockWindDeviceDataMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MockWindStationDataMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.Enum.JXDZAccessTypeEnum;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.Enum.JXDZCodeEnum;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.Enum.JXDZDataTypeEnum;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockPvDeviceDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockPvStationDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockWindDeviceDataEntity;
+import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.entity.MockWindStationDataEntity;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.utils.JXDZUtils;
 import com.yeejoin.amos.boot.module.jxiop.biz.jxdz.vo.*;
 import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
@@ -15,8 +27,11 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import javax.annotation.PostConstruct;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -30,13 +45,24 @@ public class JXDZExecute {
     JXDZFactory jxdzFactory;
     @Value("${jxdzScheduledEnable:false}")
     private Boolean jxdzScheduledEnable;
+    @Autowired
+    MockServiceImpl mockService;
+
+    @Autowired
+    MockWindStationDataMapper mockWindStationDataMapper;
+    @Autowired
+    MockPvStationDataMapper mockPvStationDataMapper;
+    @Autowired
+    MockPvDeviceDataMapper mockPvDeviceDataMapper;
+    @Autowired
+    MockWindDeviceDataMapper mockWindDeviceDataMapper;
 
 
     @Scheduled(cron = "0 0 */1 * * ?")
     public void hourInterface() {
-        if (!jxdzScheduledEnable) {
-            return;
-        }
+//        if (!jxdzScheduledEnable) {
+//            return;
+//        }
         log.info("开始执行小时任务");
         //发送请求传入的参数
         NeedDataVO needDataVO = new NeedDataVO();
@@ -47,10 +73,68 @@ public class JXDZExecute {
         IJXDZService gfdzjcService = jxdzFactory.getJXDZService(JXDZDataTypeEnum.GFDZJC);
         IJXDZService fdzsbjcService = jxdzFactory.getJXDZService(JXDZDataTypeEnum.FDZSBJC);
         IJXDZService gfdzsbjcService = jxdzFactory.getJXDZService(JXDZDataTypeEnum.GFDZSBJC);
-        List<WindStationDataVO> windStationDataVOList = fdzjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
-        List<PvStationDataVO> pvStationDataVOList = gfdzjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
-        List<WindDeviceDataVO> windDeviceDataVOList = fdzsbjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
-        List<PvDeviceDataVO> pvDeviceDataVOList = gfdzsbjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
+
+        LocalDateTime today = LocalDateTime.now();
+        int day =today.getDayOfMonth();
+        int hour=today.getHour();
+
+        List<MockWindStationDataEntity> list1 =mockWindStationDataMapper.selectList(
+                new LambdaQueryWrapper<MockWindStationDataEntity>()
+                        .eq(MockWindStationDataEntity::getDay,day)
+                        .eq(MockWindStationDataEntity::getHour,hour)
+        );
+        List<WindStationDataVO> windStationDataVOList = new ArrayList<>();
+        for (MockWindStationDataEntity entity : list1)
+        {
+            WindStationDataVO vo = new WindStationDataVO();
+            BeanUtils.copyProperties(entity,vo);
+            windStationDataVOList.add(vo);
+        }
+        List<MockPvStationDataEntity> list2 =mockPvStationDataMapper.selectList(
+                new LambdaQueryWrapper<MockPvStationDataEntity>()
+                        .eq(MockPvStationDataEntity::getDay,day)
+                        .eq(MockPvStationDataEntity::getHour,hour)
+        );
+        List<PvStationDataVO> pvStationDataVOList = new ArrayList<>();
+        for (MockPvStationDataEntity entity : list2)
+        {
+            PvStationDataVO vo = new PvStationDataVO();
+            BeanUtils.copyProperties(entity,vo);
+            pvStationDataVOList.add(vo);
+        }
+        List<MockWindDeviceDataEntity> list3 =mockWindDeviceDataMapper.selectList(
+                new LambdaQueryWrapper<MockWindDeviceDataEntity>()
+                        .eq(MockWindDeviceDataEntity::getDay,day)
+                        .eq(MockWindDeviceDataEntity::getHour,hour)
+        );
+        List<WindDeviceDataVO> windDeviceDataVOList = new ArrayList<>();
+        for (MockWindDeviceDataEntity entity : list3)
+        {
+            WindDeviceDataVO vo = new WindDeviceDataVO();
+            BeanUtils.copyProperties(entity,vo);
+            windDeviceDataVOList.add(vo);
+        }
+        List<MockPvDeviceDataEntity> list4 =mockPvDeviceDataMapper.selectList(
+                new LambdaQueryWrapper<MockPvDeviceDataEntity>()
+                        .eq(MockPvDeviceDataEntity::getDay,day)
+                        .eq(MockPvDeviceDataEntity::getHour,hour)
+        );
+        List<PvDeviceDataVO> pvDeviceDataVOList = new ArrayList<>();
+        for (MockPvDeviceDataEntity entity : list4)
+        {
+            PvDeviceDataVO vo = new PvDeviceDataVO();
+            BeanUtils.copyProperties(entity,vo);
+            pvDeviceDataVOList.add(vo);
+        }
+
+        //List<WindStationDataVO> windStationDataVOList =mockService.getFD();
+        //List<PvStationDataVO> pvStationDataVOList = mockService.getGF();
+        //List<WindDeviceDataVO> windDeviceDataVOList =mockService.getFDSB();
+        //List<PvDeviceDataVO> pvDeviceDataVOList = mockService.getGFSB();
+        //List<WindStationDataVO> windStationDataVOList = fdzjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
+       // List<PvStationDataVO> pvStationDataVOList = gfdzjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
+       // List<WindDeviceDataVO> windDeviceDataVOList = fdzsbjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
+       // List<PvDeviceDataVO> pvDeviceDataVOList = gfdzsbjcService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
         //备份数据
         fdzjcService.backupData(windStationDataVOList, needDataVO.getDateTime());
         gfdzjcService.backupData(pvStationDataVOList, needDataVO.getDateTime());
@@ -77,12 +161,13 @@ public class JXDZExecute {
         //构建数据
         IJXDZService dzmtsjService = jxdzFactory.getJXDZService(JXDZDataTypeEnum.DZMTSJ);
         List<StationDailyDataVO> stationDailyDataVOList = dzmtsjService.buildData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO.getDateTime());
+
         //备份数据
         dzmtsjService.backupData(stationDailyDataVOList, needDataVO.getDateTime());
         //发送请求
         dzmtsjService.sendData(JXDZAccessTypeEnum.CAIJI.getCode(), needDataVO, stationDailyDataVOList);
         //处理补录
-        listNeed();
+        //listNeed();
         log.info("天任务执行成功");
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-kingbase.properties

@@ -154,7 +154,7 @@ spring.elasticsearch.rest.read-timeout=30000
 logic=false
 
 coreIp=192.168.0.48
-jxdzIp=223.71.240.230:9003
+jxdzIp=210.12.143.88:9003
 jxdzTokenUserName=jiangxi_epc
 jxdzTokenPassword=123456
 jxdzPublicKey=04508e9c4df8463c784df2dde2536e792851a8f3fd0e5ff29b7bf1a5d9e3f566aa49a7a5fe7683e3dc4dc30dd7bc8773838a9e4fbcf7dfac53461c8777a6aed691