生成实体类

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -80,5 +81,24 @@ public class JpStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "第三方厂商标识")
     private String thirdCode;
-
+    /**
+     * 实时功率
+     */
+    private Double	realTimePower;
+    /**
+     * 累计发电量
+     */
+    private Double	accumulatedPower;
+    /**
+     * 状态
+     */
+    private String state;
+    /**
+     * 电站类型
+     */
+    private String type	;
+    /**
+     *  组织编码
+     */
+    private String organizationalCode	;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpCollectorHistoryDto.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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TdHygfJpCollectorHistoryDto", description="户用光伏监盘采集器历史表")
+public class TdHygfJpCollectorHistoryDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "sn编码")
+    private String snCode;
+
+    @ApiModelProperty(value = "时间")
+    private Date time;
+
+    @ApiModelProperty(value = "信号强度")
+    private Double signalStrength;
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = "第三方厂商标识")
+    private String thirdCode;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterHistoryDto.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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TdHygfJpInverterHistoryDto", description="户用光伏监盘逆变器历史表")
+public class TdHygfJpInverterHistoryDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "sn编码")
+    private String snCode;
+
+    @ApiModelProperty(value = "日期")
+    private Date date;
+
+    @ApiModelProperty(value = "发电量")
+    private Double powerGeneration;
+
+    @ApiModelProperty(value = "日收益")
+    private Double dailyReturn;
+
+    @ApiModelProperty(value = "满发小时数")
+    private Double generationHours;
+
+    @ApiModelProperty(value = "逆变器id")
+    private Long inverterId;
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = "第三方厂商标识")
+    private String thirdCode;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterWarnDto.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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TdHygfJpInverterWarnDto", description="户用光伏监盘逆变器报警表")
+public class TdHygfJpInverterWarnDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "sn编码")
+    private String snCode;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "等级")
+    private String level;
+
+    @ApiModelProperty(value = "时长")
+    private Long timeLong;
+
+    @ApiModelProperty(value = "起始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "恢复时间")
+    private Date recoverTime;
+
+    @ApiModelProperty(value = "处理方法")
+    private String treatment;
+
+    @ApiModelProperty(value = "逆变器id")
+    private Long inverterId;
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = "第三方厂商标识")
+    private String thirdCode;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInvertorElecHistoryDto.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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TdHygfJpInvertorElecHistoryDto", description="户用光伏监盘逆变器电能历史表")
+public class TdHygfJpInvertorElecHistoryDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "sn编码")
+    private String snCode;
+
+    @ApiModelProperty(value = "U交流电压")
+    @TableField("U_AC_voltage")
+    private Double uAcVoltage;
+
+    @ApiModelProperty(value = "V交流电压")
+    @TableField("V_AC_voltage")
+    private Double vAcVoltage;
+
+    @ApiModelProperty(value = "W交流电压")
+    @TableField("W_AC_voltage")
+    private Double wAcVoltage;
+
+    @ApiModelProperty(value = "U交流电流")
+    @TableField("U_AC_current")
+    private Double uAcCurrent;
+
+    @ApiModelProperty(value = "V交流电流")
+    @TableField("V_AC_current")
+    private Double vAcCurrent;
+
+    @ApiModelProperty(value = "W交流电流")
+    @TableField("W_AC_current")
+    private Double wAcCurrent;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "时间")
+    private Date time;
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = "第三方厂商标识")
+    private String thirdCode;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpStationPowerHistoryDto.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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TdHygfJpStationPowerHistoryDto", description="户用光伏监盘电站功率表")
+public class TdHygfJpStationPowerHistoryDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "功率")
+    private Double power;
+
+    @ApiModelProperty(value = "时间")
+    private Date time;
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = "第三方厂商标识")
+    private String thirdCode;
+
+}

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

@@ -142,4 +142,32 @@ public class JpStation extends BaseEntity {
 	@TableField("third_code")
     private String thirdCode;
 
+    /**
+     * 实时功率
+     */
+    @TableField("real_time_power")
+    private Double	realTimePower;
+    /**
+     * 累计发电量
+     */
+    @TableField("accumulated_power")
+    private Double	accumulatedPower;
+    /**
+     * 状态
+     */
+    @TableField("state")
+    private String state;
+    /**
+     * 电站类型
+     */
+    @TableField("type")
+    private String type	;
+    /**
+     *  组织编码
+     */
+    @TableField("organizational_code")
+    private String organizationalCode	;
+
+
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.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;
+import java.util.Date;
+
+/**
+ * 户用光伏监盘采集器历史表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("td_hygf_jp_collector_history")
+public class TdHygfJpCollectorHistory extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * sn编码
+     */
+	@TableField("sn_code")
+    private String snCode;
+
+    /**
+     * 时间
+     */
+	@TableField("time")
+    private Date time;
+
+    /**
+     * 信号强度
+     */
+	@TableField("signal_strength")
+    private Double signalStrength;
+
+    /**
+     * 第三方电站id
+     */
+	@TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     * 第三方厂商标识
+     */
+	@TableField("third_code")
+    private String thirdCode;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.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;
+import java.util.Date;
+
+/**
+ * 户用光伏监盘逆变器历史表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("td_hygf_jp_inverter_history")
+public class TdHygfJpInverterHistory extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * sn编码
+     */
+	@TableField("sn_code")
+    private String snCode;
+
+    /**
+     * 日期
+     */
+	@TableField("date")
+    private Date date;
+
+    /**
+     * 发电量
+     */
+	@TableField("power_generation")
+    private Double powerGeneration;
+
+    /**
+     * 日收益
+     */
+	@TableField("daily_return")
+    private Double dailyReturn;
+
+    /**
+     * 满发小时数
+     */
+	@TableField("generation_hours")
+    private Double generationHours;
+
+    /**
+     * 逆变器id
+     */
+	@TableField("inverter_id")
+    private Long inverterId;
+
+    /**
+     * 第三方电站id
+     */
+	@TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     * 第三方厂商标识
+     */
+	@TableField("third_code")
+    private String thirdCode;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.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;
+import java.util.Date;
+
+/**
+ * 户用光伏监盘逆变器报警表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("td_hygf_jp_inverter_warn")
+public class TdHygfJpInverterWarn extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * sn编码
+     */
+	@TableField("sn_code")
+    private String snCode;
+
+    /**
+     * 内容
+     */
+	@TableField("content")
+    private String content;
+
+    /**
+     * 等级
+     */
+	@TableField("level")
+    private String level;
+
+    /**
+     * 时长
+     */
+	@TableField("time_long")
+    private Long timeLong;
+
+    /**
+     * 起始时间
+     */
+	@TableField("start_time")
+    private Date startTime;
+
+    /**
+     * 恢复时间
+     */
+	@TableField("recover_time")
+    private Date recoverTime;
+
+    /**
+     * 处理方法
+     */
+	@TableField("treatment")
+    private String treatment;
+
+    /**
+     * 逆变器id
+     */
+	@TableField("inverter_id")
+    private Long inverterId;
+
+    /**
+     * 第三方电站id
+     */
+	@TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     * 第三方厂商标识
+     */
+	@TableField("third_code")
+    private String thirdCode;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.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;
+import java.util.Date;
+
+/**
+ * 户用光伏监盘逆变器电能历史表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("td_hygf_jp_invertor_elec_history")
+public class TdHygfJpInvertorElecHistory extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * sn编码
+     */
+	@TableField("sn_code")
+    private String snCode;
+
+    /**
+     * U交流电压
+     */
+	@TableField("U_AC_voltage")
+    private Double uAcVoltage;
+
+    /**
+     * V交流电压
+     */
+	@TableField("V_AC_voltage")
+    private Double vAcVoltage;
+
+    /**
+     * W交流电压
+     */
+	@TableField("W_AC_voltage")
+    private Double wAcVoltage;
+
+    /**
+     * U交流电流
+     */
+	@TableField("U_AC_current")
+    private Double uAcCurrent;
+
+    /**
+     * V交流电流
+     */
+	@TableField("V_AC_current")
+    private Double vAcCurrent;
+
+    /**
+     * W交流电流
+     */
+	@TableField("W_AC_current")
+    private Double wAcCurrent;
+
+    /**
+     * 品牌
+     */
+	@TableField("brand")
+    private String brand;
+
+    /**
+     * 时间
+     */
+	@TableField("time")
+    private Date time;
+
+    /**
+     * 第三方电站id
+     */
+	@TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     * 第三方厂商标识
+     */
+	@TableField("third_code")
+    private String thirdCode;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.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;
+import java.util.Date;
+
+/**
+ * 户用光伏监盘电站功率表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("td_hygf_jp_station_power_history")
+public class TdHygfJpStationPowerHistory extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 功率
+     */
+	@TableField("power")
+    private Double power;
+
+    /**
+     * 时间
+     */
+	@TableField("time")
+    private Date time;
+
+    /**
+     * 第三方电站id
+     */
+	@TableField("third_station_id")
+    private String thirdStationId;
+
+    /**
+     * 第三方厂商标识
+     */
+	@TableField("third_code")
+    private String thirdCode;
+
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 第三方场站 Mapper 接口
  *
@@ -10,5 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-09-19
  */
 public interface JpStationMapper extends BaseMapper<JpStation> {
-
+    List<JpStationDto> queryForDealerReviewPage(JpStationDto reviewDto);
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 户用光伏监盘采集器历史表接口类
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface ITdHygfJpCollectorHistoryService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 户用光伏监盘逆变器历史表接口类
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface ITdHygfJpInverterHistoryService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 户用光伏监盘逆变器报警表接口类
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface ITdHygfJpInverterWarnService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 户用光伏监盘逆变器电能历史表接口类
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface ITdHygfJpInvertorElecHistoryService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 户用光伏监盘电站功率表接口类
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface ITdHygfJpStationPowerHistoryService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 户用光伏监盘采集器历史表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface TdHygfJpCollectorHistoryMapper extends BaseMapper<TdHygfJpCollectorHistory> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 户用光伏监盘逆变器历史表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface TdHygfJpInverterHistoryMapper extends BaseMapper<TdHygfJpInverterHistory> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 户用光伏监盘逆变器报警表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterWarn> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInvertorElecHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 户用光伏监盘逆变器电能历史表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface TdHygfJpInvertorElecHistoryMapper extends BaseMapper<TdHygfJpInvertorElecHistory> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpStationPowerHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 户用光伏监盘电站功率表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+public interface TdHygfJpStationPowerHistoryMapper extends BaseMapper<TdHygfJpStationPowerHistory> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpCollectorHistoryMapper.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.TdHygfJpCollectorHistoryMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterHistoryMapper.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.TdHygfJpInverterHistoryMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.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.TdHygfJpInverterWarnMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInvertorElecHistoryMapper.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.TdHygfJpInvertorElecHistoryMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpStationPowerHistoryMapper.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.TdHygfJpStationPowerHistoryMapper">
+
+</mapper>

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -91,17 +92,18 @@ public class JpStationController extends BaseController {
      * @param current 每页大小
      * @return
      */
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "第三方场站分页查询",  notes = "第三方场站分页查询")
-	public ResponseModel<Page<JpStationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JpStationDto> page = new Page<JpStationDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jpStationServiceImpl.queryForJpStationPage(page));
+    @GetMapping(value = "/queryPage")
+    @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
+    public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size, JpStationDto reviewDto) {
+        Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPage(current,size,reviewDto);
+        return ResponseHelper.buildResponse(page);
     }
 
+
+
 	/**
 	 * 列表全部数据查询
      *

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

@@ -2,14 +2,20 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PeasantHouseholdEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.SurveyInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
+import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl;
+import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.StringUtils;
@@ -267,4 +273,9 @@ public class PeasantHouseholdController extends BaseController {
 	}
 
 
+
+
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpCollectorHistoryController.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.TdHygfJpCollectorHistoryServiceImpl;
+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.TdHygfJpCollectorHistoryDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 户用光伏监盘采集器历史表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@RestController
+@Api(tags = "户用光伏监盘采集器历史表Api")
+@RequestMapping(value = "/td-hygf-jp-collector-history")
+public class TdHygfJpCollectorHistoryController extends BaseController {
+
+    @Autowired
+    TdHygfJpCollectorHistoryServiceImpl tdHygfJpCollectorHistoryServiceImpl;
+
+    /**
+     * 新增户用光伏监盘采集器历史表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘采集器历史表", notes = "新增户用光伏监盘采集器历史表")
+	public ResponseModel<TdHygfJpCollectorHistoryDto> save(@RequestBody TdHygfJpCollectorHistoryDto model) {
+	    model = tdHygfJpCollectorHistoryServiceImpl.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<TdHygfJpCollectorHistoryDto> updateBySequenceNbrTdHygfJpCollectorHistory(@RequestBody TdHygfJpCollectorHistoryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.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(tdHygfJpCollectorHistoryServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘采集器历史表",  notes = "根据sequenceNbr查询单个户用光伏监盘采集器历史表")
+	public ResponseModel<TdHygfJpCollectorHistoryDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘采集器历史表分页查询",  notes = "户用光伏监盘采集器历史表分页查询")
+	public ResponseModel<Page<TdHygfJpCollectorHistoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<TdHygfJpCollectorHistoryDto> page = new Page<TdHygfJpCollectorHistoryDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.queryForTdHygfJpCollectorHistoryPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘采集器历史表列表全部数据查询",   notes = "户用光伏监盘采集器历史表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TdHygfJpCollectorHistoryDto>> selectForList() {
+	    return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.queryForTdHygfJpCollectorHistoryList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterHistoryController.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.TdHygfJpInverterHistoryServiceImpl;
+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.TdHygfJpInverterHistoryDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 户用光伏监盘逆变器历史表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@RestController
+@Api(tags = "户用光伏监盘逆变器历史表Api")
+@RequestMapping(value = "/td-hygf-jp-inverter-history")
+public class TdHygfJpInverterHistoryController extends BaseController {
+
+    @Autowired
+    TdHygfJpInverterHistoryServiceImpl tdHygfJpInverterHistoryServiceImpl;
+
+    /**
+     * 新增户用光伏监盘逆变器历史表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器历史表", notes = "新增户用光伏监盘逆变器历史表")
+	public ResponseModel<TdHygfJpInverterHistoryDto> save(@RequestBody TdHygfJpInverterHistoryDto model) {
+	    model = tdHygfJpInverterHistoryServiceImpl.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<TdHygfJpInverterHistoryDto> updateBySequenceNbrTdHygfJpInverterHistory(@RequestBody TdHygfJpInverterHistoryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(tdHygfJpInverterHistoryServiceImpl.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(tdHygfJpInverterHistoryServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘逆变器历史表",  notes = "根据sequenceNbr查询单个户用光伏监盘逆变器历史表")
+	public ResponseModel<TdHygfJpInverterHistoryDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(tdHygfJpInverterHistoryServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘逆变器历史表分页查询",  notes = "户用光伏监盘逆变器历史表分页查询")
+	public ResponseModel<Page<TdHygfJpInverterHistoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<TdHygfJpInverterHistoryDto> page = new Page<TdHygfJpInverterHistoryDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(tdHygfJpInverterHistoryServiceImpl.queryForTdHygfJpInverterHistoryPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘逆变器历史表列表全部数据查询",   notes = "户用光伏监盘逆变器历史表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TdHygfJpInverterHistoryDto>> selectForList() {
+	    return ResponseHelper.buildResponse(tdHygfJpInverterHistoryServiceImpl.queryForTdHygfJpInverterHistoryList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.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.TdHygfJpInverterWarnServiceImpl;
+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.TdHygfJpInverterWarnDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 户用光伏监盘逆变器报警表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@RestController
+@Api(tags = "户用光伏监盘逆变器报警表Api")
+@RequestMapping(value = "/td-hygf-jp-inverter-warn")
+public class TdHygfJpInverterWarnController extends BaseController {
+
+    @Autowired
+    TdHygfJpInverterWarnServiceImpl tdHygfJpInverterWarnServiceImpl;
+
+    /**
+     * 新增户用光伏监盘逆变器报警表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器报警表", notes = "新增户用光伏监盘逆变器报警表")
+	public ResponseModel<TdHygfJpInverterWarnDto> save(@RequestBody TdHygfJpInverterWarnDto model) {
+	    model = tdHygfJpInverterWarnServiceImpl.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<TdHygfJpInverterWarnDto> updateBySequenceNbrTdHygfJpInverterWarn(@RequestBody TdHygfJpInverterWarnDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.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(tdHygfJpInverterWarnServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表",  notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
+	public ResponseModel<TdHygfJpInverterWarnDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘逆变器报警表分页查询",  notes = "户用光伏监盘逆变器报警表分页查询")
+	public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘逆变器报警表列表全部数据查询",   notes = "户用光伏监盘逆变器报警表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TdHygfJpInverterWarnDto>> selectForList() {
+	    return ResponseHelper.buildResponse(tdHygfJpInverterWarnServiceImpl.queryForTdHygfJpInverterWarnList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInvertorElecHistoryController.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.TdHygfJpInvertorElecHistoryServiceImpl;
+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.TdHygfJpInvertorElecHistoryDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 户用光伏监盘逆变器电能历史表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@RestController
+@Api(tags = "户用光伏监盘逆变器电能历史表Api")
+@RequestMapping(value = "/td-hygf-jp-invertor-elec-history")
+public class TdHygfJpInvertorElecHistoryController extends BaseController {
+
+    @Autowired
+    TdHygfJpInvertorElecHistoryServiceImpl tdHygfJpInvertorElecHistoryServiceImpl;
+
+    /**
+     * 新增户用光伏监盘逆变器电能历史表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器电能历史表", notes = "新增户用光伏监盘逆变器电能历史表")
+	public ResponseModel<TdHygfJpInvertorElecHistoryDto> save(@RequestBody TdHygfJpInvertorElecHistoryDto model) {
+	    model = tdHygfJpInvertorElecHistoryServiceImpl.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<TdHygfJpInvertorElecHistoryDto> updateBySequenceNbrTdHygfJpInvertorElecHistory(@RequestBody TdHygfJpInvertorElecHistoryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.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(tdHygfJpInvertorElecHistoryServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘逆变器电能历史表",  notes = "根据sequenceNbr查询单个户用光伏监盘逆变器电能历史表")
+	public ResponseModel<TdHygfJpInvertorElecHistoryDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘逆变器电能历史表分页查询",  notes = "户用光伏监盘逆变器电能历史表分页查询")
+	public ResponseModel<Page<TdHygfJpInvertorElecHistoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<TdHygfJpInvertorElecHistoryDto> page = new Page<TdHygfJpInvertorElecHistoryDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.queryForTdHygfJpInvertorElecHistoryPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘逆变器电能历史表列表全部数据查询",   notes = "户用光伏监盘逆变器电能历史表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TdHygfJpInvertorElecHistoryDto>> selectForList() {
+	    return ResponseHelper.buildResponse(tdHygfJpInvertorElecHistoryServiceImpl.queryForTdHygfJpInvertorElecHistoryList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpStationPowerHistoryController.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.TdHygfJpStationPowerHistoryServiceImpl;
+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.TdHygfJpStationPowerHistoryDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 户用光伏监盘电站功率表
+ *
+ * @author system_generator
+ * @date 2023-09-19
+ */
+@RestController
+@Api(tags = "户用光伏监盘电站功率表Api")
+@RequestMapping(value = "/td-hygf-jp-station-power-history")
+public class TdHygfJpStationPowerHistoryController extends BaseController {
+
+    @Autowired
+    TdHygfJpStationPowerHistoryServiceImpl tdHygfJpStationPowerHistoryServiceImpl;
+
+    /**
+     * 新增户用光伏监盘电站功率表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘电站功率表", notes = "新增户用光伏监盘电站功率表")
+	public ResponseModel<TdHygfJpStationPowerHistoryDto> save(@RequestBody TdHygfJpStationPowerHistoryDto model) {
+	    model = tdHygfJpStationPowerHistoryServiceImpl.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<TdHygfJpStationPowerHistoryDto> updateBySequenceNbrTdHygfJpStationPowerHistory(@RequestBody TdHygfJpStationPowerHistoryDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(tdHygfJpStationPowerHistoryServiceImpl.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(tdHygfJpStationPowerHistoryServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘电站功率表",  notes = "根据sequenceNbr查询单个户用光伏监盘电站功率表")
+	public ResponseModel<TdHygfJpStationPowerHistoryDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(tdHygfJpStationPowerHistoryServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘电站功率表分页查询",  notes = "户用光伏监盘电站功率表分页查询")
+	public ResponseModel<Page<TdHygfJpStationPowerHistoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<TdHygfJpStationPowerHistoryDto> page = new Page<TdHygfJpStationPowerHistoryDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(tdHygfJpStationPowerHistoryServiceImpl.queryForTdHygfJpStationPowerHistoryPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘电站功率表列表全部数据查询",   notes = "户用光伏监盘电站功率表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TdHygfJpStationPowerHistoryDto>> selectForList() {
+	    return ResponseHelper.buildResponse(tdHygfJpStationPowerHistoryServiceImpl.queryForTdHygfJpStationPowerHistoryList());
+	}
+}

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,6 +21,7 @@ import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -564,7 +566,7 @@ public class UnitInfoController extends BaseController {
         Collection<GroupModel> children =  feignClientResult.getResult();
         Collection<GroupModel> chil =new ArrayList<>();
         for (GroupModel child : children) {
-            if("户用光伏-经销商".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())){
+            if("户用光伏-经销商-管理员".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())){
             //排除其余角色
             }else{
                 chil.add(child);
@@ -578,22 +580,58 @@ public class UnitInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getRegionalCompanies")
     @ApiOperation(httpMethod = "GET", value = "根据角色获取区域公司", notes = "根据角色获取区域公司")
-    public ResponseModel<Collection<GroupModel>> getRegionalCompanies() {
+    public ResponseModel<Collection<CompanyModel>> getRegionalCompanies() {
 
-        String  userid= getUserInfo().getUserId();
+        AgencyUserModel agencyUserModel= getUserInfo();
+        String org=agencyUserModel.getOrgNames();
+        Collection<CompanyModel> companyModel=new ArrayList<>();
+        if(org.contains("-经销商")){
+            String  userid= agencyUserModel.getUserId();
+            LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
+            qud.eq(PublicAgencyUser::getAmosUserId,userid);
 
+            PublicAgencyUser publicAgencyUse=  publicAgencyUserMapper.selectOne(qud);
+            LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
+            qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
+            PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
+            if(org.contains("户用光伏-经销商-管理员")){
+                //如果是经销商管理员
+                LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
+                qu.eq(RegionalCompanies::getUnitId,personnelBusines.getAmosDealerId());
+                List<RegionalCompanies> data= regionalCompaniesMapper.selectList(qu);
+                if(data!=null&&!data.isEmpty()){
+                    for (RegionalCompanies datum : data) {
+                        CompanyModel co=new CompanyModel();
+                        co.setSequenceNbr(datum.getRegionalCompaniesSeq());
+                        co.setCompanyName(datum.getRegionalCompaniesName());
+                        co.setOrgCode(datum.getRegionalCompaniesCode());
+                        companyModel.add(co);
+                    }
+                }
+            }else{
+                //如果是经销商普通员工
+                CompanyModel co=new CompanyModel();
+                co.setSequenceNbr(personnelBusines.getRegionalCompaniesSeq());
+                co.setCompanyName(personnelBusines.getRegionalCompaniesName());
+                co.setOrgCode(personnelBusines.getRegionalCompaniesCode());
+                companyModel.add(co);
+            }
+        }else{
         //如果是管理端
+            FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
+
+             companyModel = (List<CompanyModel>)feignClientResult.getResult();
 
+        }
 
+       return  ResponseHelper.buildResponse(companyModel);
+    }
 
-        //如果是经销商管理员
 
+      //根据登陆人角色获取电站列表
 
 
-        //如果是经销商普通员工
 
-       return  null;
-    }
 
 
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+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 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,11 +21,23 @@ import java.util.List;
  */
 @Service
 public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpStationMapper> implements IJpStationService {
+
+    @Autowired
+    JpStationMapper jpStationMapper;
+
     /**
      * 分页查询
      */
-    public Page<JpStationDto> queryForJpStationPage(Page<JpStationDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<JpStationDto> queryForJpStationPage(int pageNum, int pageSize, JpStationDto reviewDto)   {
+        PageHelper.startPage(pageNum, pageSize);
+        List<JpStationDto> list = jpStationMapper.queryForDealerReviewPage(reviewDto);
+        PageInfo<JpStationDto> page = new PageInfo(list);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
+        pagenew.setCurrent(pageNum);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(pageSize);
+        pagenew.setRecords(page.getList());
+        return pagenew;
     }
 
     /**

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

@@ -12,9 +12,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
-import com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
-import com.yeejoin.amos.boot.module.hygf.api.util.HttpUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -25,34 +23,24 @@ import com.yeejoin.amos.feign.privilege.model.LoginInfoModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
-import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import java.io.InputStream;
-import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -60,7 +48,6 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpCollectorHistoryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpCollectorHistoryService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryDto;
+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-19
+ */
+@Service
+public class TdHygfJpCollectorHistoryServiceImpl extends BaseService<TdHygfJpCollectorHistoryDto,TdHygfJpCollectorHistory,TdHygfJpCollectorHistoryMapper> implements ITdHygfJpCollectorHistoryService {
+    /**
+     * 分页查询
+     */
+    public Page<TdHygfJpCollectorHistoryDto> queryForTdHygfJpCollectorHistoryPage(Page<TdHygfJpCollectorHistoryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TdHygfJpCollectorHistoryDto> queryForTdHygfJpCollectorHistoryList()   {
+        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/TdHygfJpInverterHistoryServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterHistory;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterHistoryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterHistoryService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterHistoryDto;
+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-19
+ */
+@Service
+public class TdHygfJpInverterHistoryServiceImpl extends BaseService<TdHygfJpInverterHistoryDto,TdHygfJpInverterHistory,TdHygfJpInverterHistoryMapper> implements ITdHygfJpInverterHistoryService {
+    /**
+     * 分页查询
+     */
+    public Page<TdHygfJpInverterHistoryDto> queryForTdHygfJpInverterHistoryPage(Page<TdHygfJpInverterHistoryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TdHygfJpInverterHistoryDto> queryForTdHygfJpInverterHistoryList()   {
+        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/TdHygfJpInverterWarnServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterWarnService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
+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-19
+ */
+@Service
+public class TdHygfJpInverterWarnServiceImpl extends BaseService<TdHygfJpInverterWarnDto,TdHygfJpInverterWarn,TdHygfJpInverterWarnMapper> implements ITdHygfJpInverterWarnService {
+    /**
+     * 分页查询
+     */
+    public Page<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnPage(Page<TdHygfJpInverterWarnDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TdHygfJpInverterWarnDto> queryForTdHygfJpInverterWarnList()   {
+        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/TdHygfJpInvertorElecHistoryServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInvertorElecHistory;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInvertorElecHistoryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInvertorElecHistoryService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInvertorElecHistoryDto;
+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-19
+ */
+@Service
+public class TdHygfJpInvertorElecHistoryServiceImpl extends BaseService<TdHygfJpInvertorElecHistoryDto,TdHygfJpInvertorElecHistory,TdHygfJpInvertorElecHistoryMapper> implements ITdHygfJpInvertorElecHistoryService {
+    /**
+     * 分页查询
+     */
+    public Page<TdHygfJpInvertorElecHistoryDto> queryForTdHygfJpInvertorElecHistoryPage(Page<TdHygfJpInvertorElecHistoryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TdHygfJpInvertorElecHistoryDto> queryForTdHygfJpInvertorElecHistoryList()   {
+        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/TdHygfJpStationPowerHistoryServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpStationPowerHistory;
+import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpStationPowerHistoryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpStationPowerHistoryService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpStationPowerHistoryDto;
+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-19
+ */
+@Service
+public class TdHygfJpStationPowerHistoryServiceImpl extends BaseService<TdHygfJpStationPowerHistoryDto,TdHygfJpStationPowerHistory,TdHygfJpStationPowerHistoryMapper> implements ITdHygfJpStationPowerHistoryService {
+    /**
+     * 分页查询
+     */
+    public Page<TdHygfJpStationPowerHistoryDto> queryForTdHygfJpStationPowerHistoryPage(Page<TdHygfJpStationPowerHistoryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TdHygfJpStationPowerHistoryDto> queryForTdHygfJpStationPowerHistoryList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file