新增曲线

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DayPowerDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-09-21
+ */
+@Data
+@ApiModel(value="DayPowerDto", description="")
+public class DayPowerDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = " 小时")
+    private String hour;
+
+    @ApiModelProperty(value = "平均功率")
+    private Double power;
+
+    @ApiModelProperty(value = "年月日")
+    private String yearMonthDay;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java

@@ -139,6 +139,7 @@ public class JpStationDto  extends BaseDto {
     List<JpInverter> jpInverter;
 
     List<JpCollector> JpCollector;
-
+    //时间
+    String dateType;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthPowerDto.java

@@ -36,18 +36,18 @@ public class MonthPowerDto  {
     private Double power;
 
 
-    public void setDay(String day) {
-        LocalDateTime now = LocalDateTime.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM-dd");
-        String formattedDate = now.format(formatter);
 
-        this.day = formattedDate;
-    }
 
-    public void setYearMonth(String yearMonth) {
-        LocalDateTime now = LocalDateTime.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM");
-        String formattedDate = now.format(formatter);
-        this.yearMonth = formattedDate;
+    public MonthPowerDto() {
+
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM-dd");
+            String formattedDate = now.format(formatter);
+            this.day = formattedDate;
+
+            DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("YYYY-MM");
+            String formattedDate1 = now.format(formatter1);
+            this.yearMonth = formattedDate1;
+
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerCurveDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/21
+ */
+@Data
+public class PowerCurveDto {
+
+    private Object date;
+    private Double  num;
+
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 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;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
@@ -20,11 +25,12 @@ import java.util.Date;
 public class AllPower  {
 
     private static final long serialVersionUID = 1L;
-
+    @TableId(value = "created_time")
+    private Long createdTime;
     /**
      * 第三方电站id
      */
-	@TableField("third_station_id")
+	@TableField("tation_id")
     private String thirdStationId;
 
     /**
@@ -39,4 +45,18 @@ public class AllPower  {
 	@TableField("power")
     private Double power;
 
+
+    public AllPower() throws InterruptedException{
+
+        Thread.sleep(0L,1);
+
+        this.createdTime=System.currentTimeMillis();
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("YYYY");
+        String formattedDate1 = now.format(formatter1);
+        this.year = formattedDate1;
+
+    }
+
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-09-21
+ */
+@Data
+@Accessors(chain = true)
+@TableName("td_hygf_day_power")
+public class DayPower  {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "created_time")
+    private Long createdTime;
+
+    /**
+     * 第三方电站id
+     */
+	@TableField("tation_id")
+    private String thirdStationId;
+
+    /**
+     *  小时
+     */
+	@TableField("hour")
+    private String hour;
+
+    /**
+     * 平均功率
+     */
+	@TableField("power")
+    private Double power;
+
+    /**
+     * 年月日
+     */
+	@TableField("year_month_day")
+    private String yearMonthDay;
+
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 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;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
@@ -21,10 +27,17 @@ public class MonthPower {
 
     private static final long serialVersionUID = 1L;
 
+
+
+
+
+    @TableId(value = "created_time")
+    private Long createdTime;
+
     /**
      * 第三方电站id
      */
-	@TableField("third_station_id")
+	@TableField("tation_id")
     private String thirdStationId;
 
     /**
@@ -45,4 +58,24 @@ public class MonthPower {
 	@TableField("power")
     private Double power;
 
+
+
+    public MonthPower()throws InterruptedException {
+
+        Thread.sleep(0L,1);
+        this.createdTime=System.currentTimeMillis();
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM-dd");
+        String formattedDate = now.format(formatter);
+        this.day = formattedDate;
+
+        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("YYYY-MM");
+        String formattedDate1 = now.format(formatter1);
+        this.yearMonth = formattedDate1;
+
+    }
+
+
+
+
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 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;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
@@ -20,11 +25,12 @@ import java.util.Date;
 public class YearPower  {
 
     private static final long serialVersionUID = 1L;
-
+    @TableId(value = "created_time")
+    private Long createdTime;
     /**
      * 第三方电站id
      */
-	@TableField("third_station_id")
+	@TableField("tation_id")
     private String thirdStationId;
 
     /**
@@ -45,4 +51,19 @@ public class YearPower  {
 	@TableField("power")
     private Double power;
 
+
+    public YearPower() throws InterruptedException{
+
+        Thread.sleep(0L,1);
+        this.createdTime=System.currentTimeMillis();
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM");
+        String formattedDate = now.format(formatter);
+        this.month = formattedDate;
+
+        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("YYYY");
+        String formattedDate1 = now.format(formatter1);
+        this.year = formattedDate1;
+
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -19,5 +19,6 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     List<JpStationDto> queryForDealerReviewPage(@Param("dto") JpStationDto reviewDto);
     JpStationDto queryCount(@Param("dto") JpStationDto reviewDto);
     List<Map<String,Object>>  countState(@Param("dto") JpStationDto reviewDto);
+    List<Map<String,Double>> getPowerqx(String dateType);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDayPowerService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-09-21
+ */
+public interface IDayPowerService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IJpStationService.java

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
 
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * 第三方场站接口类
  *
@@ -9,4 +14,5 @@ package com.yeejoin.amos.boot.module.hygf.api.service;
  */
 public interface IJpStationService {
 
+    Map<String, List<Object>> getPowerqx(String date, String type, List<Long> statioId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/DayPowerMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayPower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-09-21
+ */
+public interface DayPowerMapper extends BaseMapper<DayPower> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthPowerMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.MonthPowerDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AllPower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.YearPower;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,5 +18,20 @@ import java.util.List;
  */
 public interface MonthPowerMapper extends BaseMapper<MonthPower> {
 
-    List<MonthPower> getMonthPower();
+    List<MonthPower> getMonthPowerint();
+
+    List<YearPower> getSumMonthPower(@Param("date") String month);
+
+    List<AllPower>  getSumYearPower(@Param("date") String ear);
+
+    List<PowerCurveDto>  getDayPower(@Param("startTime") Long startTime, @Param("endTime") Long endTime,@Param("dto")List<Long> statioId);
+
+    List<PowerCurveDto> getMonthPower(@Param("date") String month,@Param("dto")List<Long> statioId);
+
+    List<PowerCurveDto> getYearPower(@Param("date") String month,@Param("dto")List<Long> statioId);
+
+    List<PowerCurveDto> getAllPower(@Param("date") String month,@Param("dto")List<Long> statioId);
+
+    List<PowerCurveDto>  getDayPowercount(@Param("date") String month,@Param("dto")List<Long> statioId);
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpStationPowerHistoryMapper.java

@@ -13,5 +13,5 @@ import java.util.Map;
  * @date 2023-09-19
  */
 public interface TdHygfJpStationPowerHistoryMapper extends BaseMapper<TdHygfJpStationPowerHistory> {
-    Map<String,Double> getacgNum(@Param("date") String date);
+   // Map<String,Double> getacgNum(@Param("date") String date);
 }

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

@@ -5,7 +5,7 @@
 
 
         select
-        hygf_jp_collector.`status`,
+        hygf_jp_collector.`state`,
 
         count(hygf_jp_collector.sequence_nbr) num
 
@@ -13,8 +13,8 @@
 
         on hygf_jp_station.third_station_id=hygf_jp_collector.third_station_id
         <where>
-            <if test="dto.nauserNameme!=null">
-                and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
+            <if test="dto.name!=null">
+                and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
             </if>
             <if test="dto.area!=null">
                 and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
@@ -28,7 +28,12 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+
+            and hygf_jp_collector.`state`!=null and hygf_jp_collector.`state` in ("在线","告警","离线")
         </where>
-        GROUP BY hygf_jp_collector.`status`
+
+
+
+        GROUP BY hygf_jp_collector.`state`
     </select>
 </mapper>

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

@@ -5,7 +5,7 @@
 
 
         select
-        hygf_jp_inverter.`status`,
+        hygf_jp_inverter.`state`,
 
         count(hygf_jp_inverter.sequence_nbr) num
 
@@ -13,8 +13,8 @@
 
         on hygf_jp_station.third_station_id=hygf_jp_inverter.third_station_id
         <where>
-            <if test="dto.nauserNameme!=null">
-                and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
+            <if test="dto.name!=null">
+                and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
             </if>
             <if test="dto.area!=null">
                 and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
@@ -28,7 +28,8 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            and hygf_jp_inverter.`state`!=null and hygf_jp_inverter.`state` in ("在线","告警","离线")
         </where>
-        GROUP BY hygf_jp_inverter.`status`
+        GROUP BY hygf_jp_inverter.`state`
     </select>
 </mapper>

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

@@ -53,8 +53,8 @@
         count(*) countBuiltNum
         from hygf_jp_station
         <where>
-            <if test="dto.userName!=null">
-                and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
+            <if test="dto.name!=null">
+                and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
             </if>
             <if test="dto.area!=null">
                 and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
@@ -86,13 +86,19 @@
             <if test="dto.userName!=null">
                 and hygf_jp_station.user_name like concat(concat("%",#{dto.userName}),"%")
             </if>
+            <if test="dto.address!=null">
+                and hygf_jp_station.address like concat(concat("%",#{dto.address}),"%")
+            </if>
+            <if test="dto.area!=null">
+                and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
+            </if>
             <if test="dto.statioId!=null">
                 and hygf_jp_station.third_station_id in
                 <foreach collection="dto.statioId" item="item" index="index" open="(" separator="," close=")">
                     #{item.stationId}
                 </foreach>
             </if>
-
+            and hygf_jp_station.`state`!=null and hygf_jp_station.`state` in ("在线","报警","离线")
         </where>
 
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/DayPowerMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayPowerMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthPowerMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper">
 
 
-    <select id="getMonthPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.MonthPowerDto">
+    <select id="getMonthPowerint"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower">
         SELECT
         avg(power)  power,
         third_station_id thirdStationId
@@ -11,4 +11,80 @@
     </select>
 
 
+    <select id="getSumMonthPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.YearPower">
+        SELECT
+        sum(power)  power,
+        tation_id thirdStationId
+        FROM house_pv_data.td_hygf_month_power where   year_month=#{date}  GROUP BY tation_id
+    </select>
+
+    <select id="getSumYearPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.AllPower">
+        SELECT
+        sum(power)  power,
+        tation_id thirdStationId
+        FROM house_pv_data.td_hygf_year_power where   year=#{date}  GROUP BY tation_id
+    </select>
+
+
+
+    <select id="getDayPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
+        SELECT
+        sum(power)num,
+        `time` date
+        FROM house_pv_data.td_hygf_jp_station_power_history where third_station_id in
+        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+         and `time` <![CDATA[>=]]> #{startTime} and   `time` <![CDATA[<]]> #{endTime}
+        GROUP BY `time`
+     </select>
+
+
+    <select id="getMonthPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
+        SELECT
+        sum(power)num,
+        `day` date
+        FROM house_pv_data.td_hygf_month_power where tation_id in
+        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and year_month = #{date}
+        GROUP BY `day`
+    </select>
+    <select id="getYearPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
+        SELECT
+        sum(power)num,
+        `month` date
+        FROM house_pv_data.td_hygf_year_power where tation_id in
+        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and `year` = #{date}
+        GROUP BY `month`
+    </select>
+    <select id="getAllPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
+        SELECT
+        sum(power)num,
+        `year` date
+        FROM house_pv_data.td_hygf_all_power where tation_id in
+        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY `year`
+    </select>
+
+    <select id="getDayPowercount"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
+        SELECT
+        sum(power)num,
+        `hour` date
+        FROM house_pv_data.td_hygf_day_power where tation_id in
+        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and year_month_day = #{date}
+        GROUP BY `hour`
+    </select>
+
+
+
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml

@@ -12,7 +12,9 @@
                    #{item.stationId}
                </foreach>
 			</if>
+			and `state` in ('未处理','已处理','已恢复')
 		</where>
+
 		GROUP BY  `state`
 	</select>
 

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

@@ -49,7 +49,7 @@
       <dependency>
           <groupId>com.qiyuesuo.sdk</groupId>
           <artifactId>sdk-java</artifactId>
-          <version>3.6.3</version>
+          <version>3.0.0</version>
       </dependency>
   </dependencies>
   

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DayPowerServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DayPowerDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-09-21
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/day-power")
+public class DayPowerController extends BaseController {
+
+    @Autowired
+    DayPowerServiceImpl dayPowerServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<DayPowerDto> save(@RequestBody DayPowerDto model) {
+	    model = dayPowerServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<DayPowerDto> updateBySequenceNbrDayPower(@RequestBody DayPowerDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(dayPowerServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(dayPowerServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<DayPowerDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(dayPowerServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<DayPowerDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<DayPowerDto> page = new Page<DayPowerDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(dayPowerServiceImpl.queryForDayPowerPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DayPowerDto>> selectForList() {
+	    return ResponseHelper.buildResponse(dayPowerServiceImpl.queryForDayPowerList());
+	}
+}

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

@@ -99,9 +99,10 @@ public class JpStationController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
+	@GetMapping(value = "/getBysequenceNbr")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个第三方场站",  notes = "根据sequenceNbr查询单个第三方场站")
-	public ResponseModel<JpStationDto> selectOne(@PathVariable Long sequenceNbr) {
+	public ResponseModel<JpStationDto> selectOne( String id) {
+	    Long sequenceNbr=Long.valueOf(id);
         JpStationDto jpStationDto=  jpStationServiceImpl.queryBySeq(sequenceNbr);
         LambdaQueryWrapper<JpInverter> qug=new LambdaQueryWrapper<>();
         qug.eq(JpInverter::getThirdStationId,jpStationDto.getThirdStationId());
@@ -145,16 +146,30 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/countState")
     @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
-    public ResponseModel< List<Map<String,Object>>> countState(JpStationDto reviewDto) {
+    public ResponseModel< Map<String,Object> > countState(JpStationDto reviewDto) {
 
             //获取当前人管理场站
             LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
             List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
             reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
-
-        return ResponseHelper.buildResponse(jpStationMapper.countState(reviewDto));
-
+        List<Map<String,Object>> list= jpStationMapper.countState(reviewDto);
+        Map<String,Object>  collector =new HashMap<>();
+        collector.put("zx",0);
+        collector.put("bj",0);
+        collector.put("lx",0);
+            if(list!=null&&list.isEmpty()){
+                for (Map<String, Object> map : list) {
+                    if("在线".equals(map.get("state").toString())){
+                        collector.put("zx",map.get("num"));
+                    }else if("离线".equals(map.get("state").toString())){
+                        collector.put("lx",map.get("num"));
+                    }else if("报警".equals(map.get("state").toString())){
+                        collector.put("bj",map.get("num"));
+                    }
+                }
+            }
+        return ResponseHelper.buildResponse(collector);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -174,9 +189,39 @@ public class JpStationController extends BaseController {
         }
         List<Map<String,Object>>  listCollector=  jpCollectorMapper.queryCollectorCountStatus(reviewDto);
         List<Map<String,Object>>  listInverter=  jpInverterMapper.queryInverterCountStatus(reviewDto);
+        Map<String,Object>  collector =new HashMap<>();
+        collector.put("zx",0);
+        collector.put("gj",0);
+        collector.put("lx",0);
+        Map<String,Object>  inverter =new HashMap<>();
+        inverter.put("zx",0);
+        inverter.put("gj",0);
+        inverter.put("lx",0);
+        if(!listCollector.isEmpty()){
+            for (Map<String, Object> map : listCollector) {
+                if("在线".equals(map.get("state").toString())){
+                    collector.put("zx",map.get("num"));
+                }else if("离线".equals(map.get("state").toString())){
+                    collector.put("lx",map.get("num"));
+                }else if("告警".equals(map.get("state").toString())){
+                    collector.put("gj",map.get("num"));
+                }
+            }
+        }
+        if(!listInverter.isEmpty()){
+            for (Map<String, Object> map : listInverter) {
+                if("在线".equals(map.get("state").toString())){
+                    inverter.put("zx",map.get("num"));
+                }else if("离线".equals(map.get("state").toString())){
+                    inverter.put("lx",map.get("num"));
+                }else if("告警".equals(map.get("state").toString())){
+                    inverter.put("gj",map.get("num"));
+                }
+            }
+        }
         Map<String,Object> map=new HashMap<>();
-        map.put("collector",listCollector);
-        map.put("inverter",listInverter);
+        map.put("collector",collector);
+        map.put("inverter",inverter);
         return ResponseHelper.buildResponse(map);
 
     }
@@ -197,12 +242,12 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryUserListyz")
     @ApiOperation(httpMethod = "GET",value = "登陆人管理场站业主列表",  notes = "登陆人管理场站业主列表")
-    public ResponseModel<Set<String>> queryUserList( ) {
+    public ResponseModel<List<String>> queryUserList( ) {
         //获取当前人管理场站
         LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
         qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
         List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-        Set data=new HashSet();
+        List data=new ArrayList();
        if(pPersonStation!=null&& !pPersonStation.isEmpty()){
            for (JpPersonStation jpPersonStation : pPersonStation) {
                data.add(jpPersonStation.getOwner());
@@ -232,7 +277,30 @@ public class JpStationController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "工率曲线",   notes = "电站监控电量收益")
+    @GetMapping(value = "/getPowerqx")
+    public ResponseModel< Map<String, List<Object>>> getPowerqx(JpStationDto reviewDto,String date, String type) {
+        //获取当前人管理场站
+        List<Long> data=new ArrayList();
+        if(reviewDto.getThirdStationId()==null){
+            //获取当前人管理场站
+            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
+            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
 
+                for (JpPersonStation jpPersonStation : pPersonStation) {
+                    data.add(Long.valueOf(jpPersonStation.getStationId()));
+                }
+            }else{
+                return  ResponseHelper.buildResponse(null);
+            }
+        }else{
+            data.add(Long.valueOf(reviewDto.getThirdStationId()));
+        }
+        return ResponseHelper.buildResponse(jpStationServiceImpl.getPowerqx( date,  type,data));
+    }
 
 
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -111,9 +113,8 @@ public class MonthPowerController extends BaseController {
 	@GetMapping(value = "/list")
 	public ResponseModel<List<MonthPowerDto>> selectForList() {
 
-
 	    monthPowerServiceImpl.getMonthPower();
 
-	    return ResponseHelper.buildResponse(monthPowerServiceImpl.queryForMonthPowerList());
+	    return ResponseHelper.buildResponse(null);
 	}
 }

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -155,7 +156,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
     @GetMapping(value = "/selectcount")
-    public ResponseModel<   List<Map<String,Object>>> selectcount(JpStationDto reviewDto) {
+    public ResponseModel<  Map<String,Object>  > selectcount(JpStationDto reviewDto) {
         LambdaQueryWrapper<JpStation> qugda=new LambdaQueryWrapper<>();
         //获取当前人管理场站
         if(reviewDto.getThirdStationId()==null){
@@ -184,7 +185,20 @@ public class TdHygfJpInverterWarnController extends BaseController {
         qugda.like(reviewDto.getArea()!=null,JpStation::getArea,reviewDto.getArea());
         List<JpStation> pPersonStation=jpStationMapper.selectList(qugda);
         List<Map<String,Object>>   datalist=    tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation!=null&&!pPersonStation.isEmpty()?pPersonStation:null);
-        return ResponseHelper.buildResponse(datalist);
+        Map<String,Object>  collector =new HashMap<>();
+        collector.put("wcl",0);
+        collector.put("ycl",0);
+
+        if(datalist!=null&&!datalist.isEmpty()){
+            for (Map<String, Object> map  : datalist) {
+                if("未处理".equals(map.get("state").toString())){
+                    collector.put("wcl",map.get("num"));
+                }else if("已处理".equals(map.get("state").toString())||"已恢复".equals(map.get("state").toString())){
+                    collector.put("ycl",map.get("num"));
+                }
+            }
+        }
+        return ResponseHelper.buildResponse(collector);
     }
 
 

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

+package com.yeejoin.amos.boot.module.hygf.biz.scheduled;
+
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MonthPowerServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/21
+ */
+@EnableScheduling
+public class WindSpeedScheduled {
+
+    @Autowired
+    MonthPowerServiceImpl monthPowerServiceImpl;
+
+    @Scheduled(cron="${cheduled.crons}")
+    private void initData(){
+        monthPowerServiceImpl.getMonthPower();
+    }
+
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayPower;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayPowerMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IDayPowerService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DayPowerDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-09-21
+ */
+@Service
+public class DayPowerServiceImpl extends BaseService<DayPowerDto,DayPower,DayPowerMapper> implements IDayPowerService {
+    /**
+     * 分页查询
+     */
+    public Page<DayPowerDto> queryForDayPowerPage(Page<DayPowerDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<DayPowerDto> queryForDayPowerList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -3,16 +3,21 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IJpStationService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 第三方场站服务实现类
@@ -25,7 +30,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
     @Autowired
     JpStationMapper jpStationMapper;
-
+    @Autowired
+    MonthPowerMapper monthPowerMapper;
     /**
      * 分页查询
      */
@@ -42,4 +48,144 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     }
 
 
+    @Override
+    public  Map<String, List<Object>> getPowerqx(String date, String type,List<Long> statioId) {
+        List<PowerCurveDto>  data=null;
+        List<Object> listx =new  ArrayList<>();
+        List<Object> listy =new ArrayList<>();
+        Map<String, List<Object>> map =new HashMap<>();
+        try {
+
+            if(type.equals("day")){
+                map= gethourList();
+                data =monthPowerMapper.getDayPowercount(date, statioId);
+            }else if(type.equals("month")){
+                map= getDayListOfMonth();
+                data=monthPowerMapper.getMonthPower(date, statioId);
+
+            }else if(type.equals("year")){
+                map= getyearListOfMonth();
+                data= monthPowerMapper.getYearPower(date,statioId);
+            }else{
+                map= getyearList();
+                data= monthPowerMapper.getAllPower(date, statioId);
+            }
+
+            listx =map.get("x");
+            listy =map.get("y");
+            if(data!=null&&!data.isEmpty()){
+                for (PowerCurveDto datum : data) {
+                    for (int i = 0; i < listx.size(); i++) {
+                       if(datum.getDate().equals(listx.get(i).toString())){
+                           listy.remove(i);
+                           listy.add(i,datum.getNum());
+                           break;
+                       }
+                    }
+                }
+            }
+            map.put("x",listx);
+            map.put("y",listy);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw  new RuntimeException("系统异常！");
+        }
+
+        return map;
+    }
+
+
+
+
+
+
+
+
+
+
+
+    public static  Map<String,  List<Object>> getDayListOfMonth() {
+        Map<String,  List<Object>> map =new HashMap<>();
+        List<Object> listx =new  ArrayList<>();
+        List<Object> listy =new ArrayList<>();
+        Calendar aCalendar = Calendar.getInstance(Locale.CHINA);
+        int year = aCalendar.get(Calendar.YEAR);//年份
+        int month = aCalendar.get(Calendar.MONTH) + 1;//月份
+        int day = aCalendar.getActualMaximum(Calendar.DATE);
+        for (int i = 1; i <= day; i++) {
+            String aDate = month+"-"+i;
+            listx.add(aDate);
+            listy.add(0);
+        }
+        map.put("x",listx);
+        map.put("y",listy);
+        return map;
+    }
+    public static  Map<String,  List<Object>> getyearListOfMonth() {
+        Map<String,  List<Object>> map =new HashMap<>();
+        List<Object> listx =new  ArrayList<>();
+        List<Object> listy =new ArrayList<>();
+        Calendar aCalendar = Calendar.getInstance(Locale.CHINA);
+        int year = aCalendar.get(Calendar.YEAR);//年份
+        for (int i = 1; i <= 12; i++) {
+            String aDate = String.valueOf(year)+"-"+i;
+            listx.add(aDate);
+            listy.add(0);
+        }
+        map.put("x",listx);
+        map.put("y",listy);
+        return map;
+    }
+
+    public static  Map<String,  List<Object>> getyearList() {
+        Map<String,  List<Object>> map =new HashMap<>();
+        List<Object> listx =new  ArrayList<>();
+        List<Object> listy =new ArrayList<>();
+        Calendar aCalendar = Calendar.getInstance(Locale.CHINA);
+        int year = aCalendar.get(Calendar.YEAR);//年份
+        for (int i = 1; i <= 10; i++) {
+            int aDate = year-(10-i);
+            listx.add(String.valueOf(aDate));
+            listy.add(0);
+        }
+        map.put("x",listx);
+        map.put("y",listy);
+        return map;
+    }
+
+    public static  Map<String,  List<Object>> gethourList() {
+        Map<String,  List<Object>> map =new HashMap<>();
+        List<Object> listx =new  ArrayList<>();
+        List<Object> listy =new ArrayList<>();
+        try {
+            Date day=new Date();
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+            SimpleDateFormat format=new SimpleDateFormat("HH:mm");
+            String s = df.format(day);
+            Date date = df.parse(s);
+            ArrayList<String> dates = new ArrayList<String>();
+            for (int i = 0; i < 24; i++) {
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(date);
+                cal.add(Calendar.HOUR, 1);
+                date = cal.getTime();
+                String s1 = format.format(date);
+                listx.add(s1);
+                listy.add(0);
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            throw  new RuntimeException("系统异常！");
+        }
+        map.put("x",listx);
+        map.put("y",listy);
+        return map;
+    }
+
+
+
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllPowerMapper;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IMonthPowerService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.MonthPowerDto;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearPowerMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -22,6 +29,12 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
 
     @Autowired
     MonthPowerMapper monthPowerMapper;
+    @Autowired
+    YearPowerServiceImpl yearPowerServiceImpl;
+    @Autowired
+    AllPowerServiceImpl allPowerServiceImpl;
+    @Autowired
+    YearPowerMapper YearPowerMapper;
 
     /**
      * 分页查询
@@ -40,9 +53,57 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
 
     @Override
     @Async
+    @Transactional
     public void getMonthPower() {
-        List<MonthPower> list= monthPowerMapper.getMonthPower();
+        List<MonthPower> list= monthPowerMapper.getMonthPowerint();
         this.saveBatch(list);
 
+
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM");
+        String formattedDate = now.format(formatter);
+        List<YearPower> listd=   monthPowerMapper.getSumMonthPower(formattedDate);
+
+
+        LambdaQueryWrapper<YearPower> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YearPower::getMonth, formattedDate);
+        List<YearPower> listdY=  yearPowerServiceImpl.list(wrapper);
+         if(listdY!=null&&!listdY.isEmpty()){
+             for (YearPower yearPower : listdY) {
+                 for (YearPower power : listd) {
+                     if(yearPower.getThirdStationId().equals(power.getThirdStationId())){
+                         yearPower.setPower(power.getPower());
+                     }
+                 }
+             }
+             yearPowerServiceImpl.saveBatch(listdY);
+         }else{
+             yearPowerServiceImpl.saveBatch(listd);
+         }
+
+        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("YYYY");
+        String formattedDate1 = now.format(formatter1);
+        List<AllPower> listdy=   monthPowerMapper.getSumYearPower(formattedDate1);
+
+        LambdaQueryWrapper<AllPower> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(AllPower::getYear, formattedDate1);
+        List<AllPower> listdall=  allPowerServiceImpl.list(wrapper1);
+        if(listdall!=null&&!listdall.isEmpty()){
+            for (AllPower yearPower : listdall) {
+                for (AllPower power : listdy) {
+                    if(yearPower.getThirdStationId().equals(power.getThirdStationId())){
+                        yearPower.setPower(power.getPower());
+                    }
+                }
+            }
+            allPowerServiceImpl.saveBatch(listdall);
+        }else{
+            allPowerServiceImpl.saveBatch(listdy);
+        }
+
     }
+
+
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.YearPower;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearPowerMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IYearPowerService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.YearPowerDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +22,10 @@ import java.util.List;
  */
 @Service
 public class YearPowerServiceImpl extends BaseService<YearPowerDto,YearPower,YearPowerMapper> implements IYearPowerService {
+
+    @Autowired
+    MonthPowerMapper monthPowerMapper;
+
     /**
      * 分页查询
      */
@@ -30,4 +39,8 @@ public class YearPowerServiceImpl extends BaseService<YearPowerDto,YearPower,Yea
     public List<YearPowerDto> queryForYearPowerList()   {
         return this.queryForList("" , false);
     }
+
+
+
+
 }
\ No newline at end of file

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

@@ -200,4 +200,8 @@ dealer.group=1681241774938419202
 
 #户用光伏工程角色
 
-dealer.engineering=1679674919488614401
+dealer.engineering=1679674919488614401
\ No newline at end of file
+
+
+#定时任务获取曲线信息
+cheduled.crons=
\ No newline at end of file