修改日月明年发电量

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AllGenerate.java

-package com.yeejoin.amos.boot.module.hygf.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.data.annotation.Id;
-
-/**
- * @description:
- * @author: tw
- * @createDate: 2023/11/8
- */
-@Data
-@Accessors(chain = true)
-@TableName("td_hygf_all_generate")
-public class AllGenerate {
-    @Id
-    private Long createdTime;
-    /**
-     * 第三方电站id
-     */
-    @TableField("third_station_id")
-    private String thirdStationId;
-
-    /**
-     *  年
-     */
-    @TableField("year_time")
-    private String yearTime;
-
-    /**
-     * 平均功率
-     */
-    @TableField("year")
-    private String year;
-    /**
-     * 平均功率
-     */
-    @TableField("generate")
-    private Double generate;
-
-    public AllGenerate(Long createdTime, String thirdStationId, String yearTime, String year, Double generate) {
-        this.createdTime = createdTime;
-        this.thirdStationId = thirdStationId;
-        this.yearTime = yearTime;
-        this.year = year;
-        this.generate = generate;
-    }
-
-    public AllGenerate() {
-    }
-}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayGenerate.java

@@ -24,19 +24,30 @@ public class DayGenerate {
     private String thirdStationId;
 
     /**
-     *  小时
+     *  天
      */
-    @TableField("hour_time")
-    private String hourTime;
+    @TableField("day_time")
+    private String dayTime;
 
     /**
      * 月份
      */
-    @TableField("month_day")
-    private String monthDay;
+    @TableField("year_month")
+    private String yearMonth;
     /**
      * 发电量
      */
     @TableField("generate")
     private Double generate;
+
+    public DayGenerate(Long createdTime, String thirdStationId, String dayTime, String yearMonth, Double generate) {
+        this.createdTime = createdTime;
+        this.thirdStationId = thirdStationId;
+        this.dayTime = dayTime;
+        this.yearMonth = yearMonth;
+        this.generate = generate;
+    }
+
+    public DayGenerate() {
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.java

@@ -24,27 +24,28 @@ public class MonthGenerate {
     private String thirdStationId;
 
     /**
-     *  天
+     *  年
      */
-    @TableField("day_time")
-    private String dayTime;
+    @TableField("month_time")
+    private String monthTime;
 
     /**
-     * 月份
+     * 平均功率
      */
-    @TableField("year_month")
-    private String yearMonth;
+    @TableField("year")
+    private String year;
+
     /**
-     * 发电量
+     * 平均功率
      */
     @TableField("generate")
     private Double generate;
 
-    public MonthGenerate(Long createdTime, String thirdStationId, String dayTime, String yearMonth, Double generate) {
+    public MonthGenerate(Long createdTime, String thirdStationId, String monthTime, String year, Double generate) {
         this.createdTime = createdTime;
         this.thirdStationId = thirdStationId;
-        this.dayTime = dayTime;
-        this.yearMonth = yearMonth;
+        this.monthTime = monthTime;
+        this.year = year;
         this.generate = generate;
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.java

@@ -26,25 +26,24 @@ public class YearGenerate {
     /**
      *  年
      */
-    @TableField("month_time")
-    private String monthTime;
+    @TableField("year_time")
+    private String yearTime;
 
     /**
-     * 平均功率
+     *
      */
     @TableField("year")
     private String year;
-
     /**
-     * 平均功率
+     *
      */
     @TableField("generate")
     private Double generate;
 
-    public YearGenerate(Long createdTime, String thirdStationId, String monthTime, String year, Double generate) {
+    public YearGenerate(Long createdTime, String thirdStationId, String yearTime, String year, Double generate) {
         this.createdTime = createdTime;
         this.thirdStationId = thirdStationId;
-        this.monthTime = monthTime;
+        this.yearTime = yearTime;
         this.year = year;
         this.generate = generate;
     }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -155,8 +155,7 @@
 
     <select id="getJpStation"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.JpStation">
         select
-        `sequence_nbr` sequenceNbr,
-        third_station_id thirdStationId
+        *
         from hygf_jp_station
 
         <where>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -353,7 +353,7 @@ public class JpStationController extends BaseController {
     public Object getPowerqx() {
 
 
-        return jpStationMapper.getJpStation();
+        return jpStationMapper.getJpStation(null);
     }
 
 }

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

@@ -24,8 +24,8 @@ public class WindSpeedScheduled {
 
 	@Autowired
 	TdHygfJpInvertorElecHistoryServiceImpl tdHygfJpInvertorElecHistoryServiceImpl;
-    @Autowired
-    DayGenerateServiceImpl dayGenerateServiceImpl;
+//    @Autowired
+//    DayGenerateServiceImpl dayGenerateServiceImpl;
 
 	@Scheduled(cron = "${cheduled.crons}")
 	private void initData() {
@@ -38,10 +38,10 @@ public class WindSpeedScheduled {
 
 	//发电量
 
-    @Scheduled(cron = "${generate.crons}")
-    private void initGenerateData() {
-	    //发电量
-        dayGenerateServiceImpl.getGenerate();
-    }
+//    @Scheduled(cron = "${generate.crons}")
+//    private void initGenerateData() {
+//	    //发电量
+//        dayGenerateServiceImpl.getGenerate();
+//    }
 
 }