Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Data
+public class AllGenerateDto {
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+    private String thirdStationId;
+
+    /**
+     *  年
+     */
+    private String yearTime;
+
+    /**
+     * 平均功率
+     */
+    private String year;
+    /**
+     * 平均功率
+     */
+    private Double generate;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Data
+public class DayGenerateDto {
+
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+
+    private String thirdStationId;
+
+    /**
+     *  小时
+     */
+
+    private String hourTime;
+
+    /**
+     * 月份
+     */
+
+    private String monthDay;
+    /**
+     * 发电量
+     */
+
+    private Double generate;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Data
+public class MonthGenerateDto {
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+    private String thirdStationId;
+
+    /**
+     *  天
+     */
+    private String dayTime;
+
+    /**
+     * 月份
+     */
+    private String yearMonth;
+    /**
+     * 发电量
+     */
+    private Double generate;
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Data
+public class YearGenerateDto {
+
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+
+    private String thirdStationId;
+
+    /**
+     *  年
+     */
+
+    private String monthTime;
+
+    /**
+     * 平均功率
+     */
+
+    private String year;
+
+    /**
+     * 平均功率
+     */
+
+    private Double generate;
+}

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

+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_day_generate")
+public class DayGenerate {
+    @Id
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+    @TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     *  小时
+     */
+    @TableField("hour_time")
+    private String hourTime;
+
+    /**
+     * 月份
+     */
+    @TableField("month_day")
+    private String monthDay;
+    /**
+     * 发电量
+     */
+    @TableField("generate")
+    private Double generate;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.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_month_generate")
+public class MonthGenerate {
+    @Id
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+    @TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     *  天
+     */
+    @TableField("day_time")
+    private String dayTime;
+
+    /**
+     * 月份
+     */
+    @TableField("year_month")
+    private String yearMonth;
+    /**
+     * 发电量
+     */
+    @TableField("generate")
+    private Double generate;
+
+    public MonthGenerate(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 MonthGenerate() {
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.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_year_generate")
+public class YearGenerate {
+    @Id
+    private Long createdTime;
+    /**
+     * 第三方电站id
+     */
+    @TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     *  年
+     */
+    @TableField("month_time")
+    private String monthTime;
+
+    /**
+     * 平均功率
+     */
+    @TableField("year")
+    private String year;
+
+    /**
+     * 平均功率
+     */
+    @TableField("generate")
+    private Double generate;
+
+    public YearGenerate(Long createdTime, String thirdStationId, String monthTime, String year, Double generate) {
+        this.createdTime = createdTime;
+        this.thirdStationId = thirdStationId;
+        this.monthTime = monthTime;
+        this.year = year;
+        this.generate = generate;
+    }
+
+    public YearGenerate() {
+    }
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface IAllGenerateService {
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface IDayGenerateService {
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface IMonthGenerateService {
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface IYearGenerateService {
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AllGenerate;
+
+public interface AllGenerateMapper extends BaseMapper<AllGenerate> {
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
+
+public interface MonthGenerateMapper extends BaseMapper<MonthGenerate> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+public interface YearGenerateMapper extends BaseMapper<YearGenerate>  {
+}

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

@@ -13,7 +13,10 @@
 
         on hygf_jp_station.third_station_id=hygf_jp_collector.third_station_id
         <where>
-            <if test="dto.name!=null">
+            <if test="dto.snCode!=null and dto.snCode!='' ">
+                and hygf_jp_station.sn_code like concat(concat("%",#{dto.snCode}),"%")
+            </if>
+            <if test="dto.name!=null and dto.name!='' ">
                 and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
             </if>
             <if test="dto.area!=null">

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

@@ -13,7 +13,10 @@
 
         on hygf_jp_station.third_station_id=hygf_jp_inverter.third_station_id
         <where>
-            <if test="dto.name!=null">
+            <if test="dto.snCode!=null and dto.snCode!='' ">
+                and hygf_jp_station.sn_code like concat(concat("%",#{dto.snCode}),"%")
+            </if>
+            <if test="dto.name!=null and dto.name!='' ">
                 and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
             </if>
             <if test="dto.area!=null">

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

@@ -136,9 +136,21 @@ public class JpCollectorController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询")
 	public ResponseModel<Page<JpCollectorDto>> queryForPage(@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
-		LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
-		qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
-		List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+
+        List<JpPersonStation> pPersonStation=null;
+        if(jpCollectorDto.getName()!=null&&!"".equals(jpCollectorDto.getName())){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,jpCollectorDto.getName());
+            pPersonStation=pPersonStationMapper.selectList(qug1);
+        }else{
+            //获取当前人管理场站
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            pPersonStation = pPersonStationMapper.selectList(qug);
+        }
+
+
+
 		if (!pPersonStation.isEmpty()) {
 			Page<JpCollectorDto> page = new Page<JpCollectorDto>();
 			page.setCurrent(current);

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

@@ -117,7 +117,7 @@ public class JpInverterController extends BaseController {
 			@RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
 
         List<JpPersonStation> pPersonStation =null;
-        if(jpInverterDto.getName()!=null){
+        if(jpInverterDto.getName()!=null&&!"".equals(jpInverterDto.getName())){
             LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
             qug1.like(JpPersonStation::getStationName,jpInverterDto.getName());
             pPersonStation=pPersonStationMapper.selectList(qug1);

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

@@ -129,11 +129,22 @@ public class JpStationController extends BaseController {
     public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, JpStationDto reviewDto) {
 
-//        if(reviewDto.getThirdStationId()==null){
+        List<JpPersonStation> pPersonStation=null;
+        if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
+            pPersonStation=pPersonStationMapper.selectList(qug1);
+        }else{
+            //获取当前人管理场站
             //获取当前人管理场站
             LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+             pPersonStation=pPersonStationMapper.selectList(qug);
+        }
+
+
+//        if(reviewDto.getThirdStationId()==null){
+
             if(pPersonStation!=null&&!pPersonStation.isEmpty()){
                 reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
             }else{
@@ -150,7 +161,7 @@ public class JpStationController extends BaseController {
 
         Set<String> se=new HashSet<>();
         List<JpPersonStation> pPersonStation=null;
-        if(reviewDto.getName()!=null){
+        if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
             LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
             qug1.like(JpPersonStation::getStationName,reviewDto.getName());
              pPersonStation=pPersonStationMapper.selectList(qug1);
@@ -186,7 +197,7 @@ public class JpStationController extends BaseController {
     public ResponseModel<Map<String,Object>> getpStation(JpStationDto reviewDto) {
 
         List<JpPersonStation> pPersonStation=null;
-        if(reviewDto.getName()!=null){
+        if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
             LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
             qug1.like(JpPersonStation::getStationName,reviewDto.getName());
             pPersonStation=pPersonStationMapper.selectList(qug1);

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

@@ -134,7 +134,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
         List<JpPersonStation> pPersonStation =null;
-        if(tdHygfJpInverterWarnDto.getName()!=null){
+        if(tdHygfJpInverterWarnDto.getName()!=null&&!"".equals(tdHygfJpInverterWarnDto.getName())){
             LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
             qug1.like(JpPersonStation::getStationName,tdHygfJpInverterWarnDto.getName());
             pPersonStation=pPersonStationMapper.selectList(qug1);

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.JpStationServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MonthPowerServiceImpl;
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpCollectorHistoryServiceImpl;
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpInvertorElecHistoryServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -27,6 +24,8 @@ public class WindSpeedScheduled {
 
 	@Autowired
 	TdHygfJpInvertorElecHistoryServiceImpl tdHygfJpInvertorElecHistoryServiceImpl;
+    @Autowired
+    DayGenerateServiceImpl dayGenerateServiceImpl;
 
 	@Scheduled(cron = "${cheduled.crons}")
 	private void initData() {
@@ -34,4 +33,15 @@ public class WindSpeedScheduled {
 		tdHygfJpCollectorHistoryServiceImpl.syncData();
 		tdHygfJpInvertorElecHistoryServiceImpl.syncData();
 	}
+
+
+
+	//发电量
+
+    @Scheduled(cron = "${generate.crons}")
+    private void initGenerateData() {
+	    //发电量
+        dayGenerateServiceImpl.getGenerate();
+    }
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.AllGenerateDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AllGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.service.IAllGenerateService;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllGenerateMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Service
+public class AllGenerateServiceImpl extends BaseService<AllGenerateDto, AllGenerate, AllGenerateMapper> implements IAllGenerateService {
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AllGenerateDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DayGenerateDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IAllGenerateService;
+import com.yeejoin.amos.boot.module.hygf.api.service.IDayGenerateService;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllGenerateMapper;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Service
+public class DayGenerateServiceImpl extends BaseService<DayGenerateDto, DayGenerate, DayGenerateMapper> implements IDayGenerateService {
+    @Autowired
+    JpStationMapper jpStationMapper;
+
+    @Autowired
+    MonthGenerateMapper monthGenerateMapper;
+    @Autowired
+    YearGenerateMapper  yearGenerateMapper;
+    @Autowired
+    AllGenerateMapper   allGenerateMapper;
+    @Autowired
+    AllGenerateServiceImpl allGenerateServiceImpl;
+    @Autowired
+    MonthGenerateServiceImpl monthGenerateServiceImpl;
+    @Autowired
+    YearGenerateServiceImpl yearGenerateServiceImpl;
+
+    public void getGenerate() {
+        LambdaQueryWrapper<JpStation> wrapper = new LambdaQueryWrapper<JpStation>();
+        Date dayTime=new Date();
+        SimpleDateFormat simpleDateFormatDay = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat simpleDateFormatMonth = new SimpleDateFormat("yyyy-MM");
+        SimpleDateFormat simpleDateFormatYear = new SimpleDateFormat("yyyy");
+        String formattedDateday =simpleDateFormatDay.format(dayTime);
+        String formattedDateMonth =simpleDateFormatMonth.format(dayTime);
+        String formattedDateYear =simpleDateFormatYear.format(dayTime);
+        long utcMillis = dayTime.getTime() ;
+        // 获取所有场站信息
+        List<JpStation> list=jpStationMapper.selectList(wrapper);
+        //查询当日日发电量
+        LambdaQueryWrapper<MonthGenerate> wrappermonth = new LambdaQueryWrapper<MonthGenerate>();
+        wrappermonth.eq(MonthGenerate::getDayTime,formattedDateday);
+        wrappermonth.eq(MonthGenerate::getYearMonth,formattedDateMonth);
+        List<MonthGenerate> listmonth= monthGenerateMapper.selectList(wrappermonth);
+        //查询当月月发电量
+        LambdaQueryWrapper<YearGenerate> wrapperyear = new LambdaQueryWrapper<YearGenerate>();
+        wrapperyear.eq(YearGenerate::getMonthTime,formattedDateMonth);
+        wrapperyear.eq(YearGenerate::getYear,formattedDateYear);
+        List<YearGenerate> listyear= yearGenerateMapper.selectList(wrapperyear);
+        //查询当年年发电量
+        LambdaQueryWrapper<AllGenerate> wrapperall = new LambdaQueryWrapper<AllGenerate>();
+        wrapperall.eq(AllGenerate::getYear,formattedDateYear);
+        List<AllGenerate> listall= allGenerateMapper.selectList(wrapperall);
+        List<MonthGenerate> mo=new ArrayList<>();
+        List<YearGenerate> ye=new ArrayList<>();
+        List<AllGenerate> al=new ArrayList<>();
+        //更新数据
+        if (list!=null&&!list.isEmpty()){
+               int nu=1;
+            for (JpStation jpStation : list) {
+                MonthGenerate monthGenerate=null;
+                YearGenerate yearGenerate=null;
+                AllGenerate  allGenerate=null;
+               //更新日发电量
+               if(listmonth!=null&&!listmonth.isEmpty()){
+                   monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
+                   for (MonthGenerate generate : listmonth) {
+                       if(generate.getYearMonth().equals(formattedDateMonth)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())&&generate.getDayTime().equals(formattedDateday)){
+                           monthGenerate =new MonthGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
+                           break;
+                       }
+                   }
+               } else{
+                   monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
+               }
+              //更新年发电量
+                if(listyear!=null&&!listyear.isEmpty()){
+                    yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
+
+                    for (YearGenerate yearGenera : listyear) {
+                        if(yearGenera.getYear().equals(formattedDateYear)&&yearGenera.getThirdStationId().equals(jpStation.getThirdStationId())&&yearGenera.getMonthTime().equals(formattedDateMonth)){
+                            yearGenerate =new YearGenerate(yearGenera.getCreatedTime(), jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
+                            break;
+                        }
+                    }
+                } else{
+                    yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
+                }
+              //更新年发电量
+                if(listall!=null&&!listall.isEmpty()){
+                    allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
+                    for (AllGenerate generate : listall) {
+                        if(generate.getYear().equals(formattedDateYear)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())){
+                            allGenerate =new AllGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
+                             break;
+                        }
+                    }
+                } else{
+                    allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
+                }
+                mo.add(monthGenerate);
+                ye.add(yearGenerate);
+                al.add(allGenerate);
+                nu=nu+1;
+            }
+            //更新保存
+             allGenerateServiceImpl.saveBatch(al);
+             monthGenerateServiceImpl.saveBatch(mo);
+             yearGenerateServiceImpl.saveBatch(ye);
+        }
+    }
+
+
+
+}

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

@@ -43,7 +43,7 @@ public class JpCollectorServiceImpl extends BaseService<JpCollectorDto, JpCollec
 			wrapper.in(JpCollector::getThirdStationId, jpCollectorDto.getStationIds());
 		}
 
-        if (!jpCollectorDto.getSnCode().isEmpty()) {
+        if (jpCollectorDto.getSnCode()!=null) {
             wrapper.like(JpCollector::getSnCode, jpCollectorDto.getSnCode());
         }
 

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

@@ -35,7 +35,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
 			wrapper.eq(JpInverter::getState, jpInverterDto.getState());
 		}
 		if(StringUtils.isNotEmpty(jpInverterDto.getSnCode())) {
-			wrapper.likeRight(JpInverter::getSnCode, jpInverterDto.getSnCode());
+			wrapper.like(JpInverter::getSnCode, jpInverterDto.getSnCode());
 		}
 		if (!jpInverterDto.getStationIds().isEmpty()) {
 			wrapper.in(JpInverter::getThirdStationId, jpInverterDto.getStationIds());

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.MonthGenerateDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.service.IMonthGenerateService;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Service
+public class MonthGenerateServiceImpl extends BaseService<MonthGenerateDto, MonthGenerate, MonthGenerateMapper> implements IMonthGenerateService {
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.YearGenerateDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.service.IYearGenerateService;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/8
+ */
+@Service
+public class YearGenerateServiceImpl extends BaseService<YearGenerateDto, YearGenerate, YearGenerateMapper> implements IYearGenerateService {
+
+
+
+}

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

@@ -100,6 +100,7 @@ public class CommonConstans {
     public static final String QueryStringIsAlarm = "isAlarm";
     public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
     public static final String  Twodecimalplaces= "%.2f";
+    public static final String  Onedecimalplaces= "%.1f";
     public static final String Fourdecimalplaces = "%.4f";
     public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";
 

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

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.RiskDynamicDetailsVo;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.Enum.WarningNameEnum;
+import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.*;
@@ -293,6 +294,7 @@ public class HealthStatusIndicatorServiceImpl {
                     pvWarningRecord.setContent(idxBizPvWarningRecord.getCONTENT());
                     pvWarningRecord.setRecDate(format);
                     pvWarningRecord.setTs(timestamp);
+                    pvWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizPvHealthIndices.get(0).getHealthIndex()));
                     tdPvWarningRecordList.add(pvWarningRecord);
                     // idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
                 }
@@ -459,6 +461,7 @@ public class HealthStatusIndicatorServiceImpl {
                     pvWarningRecord.setContent(idxBizPvWarningRecord.getCONTENT());
                     pvWarningRecord.setRecDate(format);
                     pvWarningRecord.setTs(timestamp);
+                    pvWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizPvHealthIndices.get(0).getHealthIndex()));
                     tdPvWarningRecordList.add(pvWarningRecord);
                 }
             }
@@ -621,6 +624,7 @@ public class HealthStatusIndicatorServiceImpl {
                     pvWarningRecord.setContent(idxBizPvWarningRecord.getCONTENT());
                     pvWarningRecord.setRecDate(format);
                     pvWarningRecord.setTs(timestamp);
+                    pvWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizPvHealthIndices.get(0).getHealthIndex()));
                     tdPvWarningRecordList.add(pvWarningRecord);
                 }
             }
@@ -786,7 +790,7 @@ public class HealthStatusIndicatorServiceImpl {
                     fanWarningRecord.setContent(idxBizFanWarningRecord.getCONTENT());
                     fanWarningRecord.setRecDate(format);
                     fanWarningRecord.setTs(timestamp);
-                    fanWarningRecord.setHealthIndex(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
+                    fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
                     tdFanWarningRecordList.add(fanWarningRecord);
 
 
@@ -954,7 +958,7 @@ public class HealthStatusIndicatorServiceImpl {
                     fanWarningRecord.setContent(idxBizFanWarningRecord.getCONTENT());
                     fanWarningRecord.setRecDate(format);
                     fanWarningRecord.setTs(timestamp);
-                    fanWarningRecord.setHealthIndex(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
+                    fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
                     tdFanWarningRecordList.add(fanWarningRecord);
                 }
             }
@@ -1120,6 +1124,7 @@ public class HealthStatusIndicatorServiceImpl {
                     fanWarningRecord.setContent(idxBizFanWarningRecord.getCONTENT());
                     fanWarningRecord.setRecDate(format);
                     fanWarningRecord.setTs(timestamp);
+                    fanWarningRecord.setHealthIndex(String.format(CommonConstans.Onedecimalplaces,idxBizFanHealthIndices.get(0).getHealthIndex()));
                     tdFanWarningRecordList.add(fanWarningRecord);
                 }
             }

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

@@ -81,9 +81,9 @@ spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=Yeejoin@2020
 spring.elasticsearch.rest.read-timeout=30000
 
-daily.power.generation.cron=*/30 * *  * * ?
-moon.power.generation.cron=*/30 * * * * ?
-year.power.generation.cron=*/30 * * * * ?
+daily.power.generation.cron=0 0/1 * * * ?
+moon.power.generation.cron=0 0/1 * * * ?
+year.power.generation.cron=0 0/1 * * * ?
 
-large.cron=0 0/15 * * * ?
+large.cron=0 0/5 * * * ?