修改逆变器列表

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/22
+ */
+public class JpInverterDtoNew  extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "sn编码")
+    private String snCode;
+
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+    @ApiModelProperty(value = "额定功率")
+    private Double ratedPower;
+
+    @ApiModelProperty(value = "采集器id")
+    private String collectorId;
+
+    @ApiModelProperty(value = "采集器sn编码")
+    private String collectorSnCode;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "实时功率")
+    private Double currentPower;
+
+    @ApiModelProperty(value = "日发电量")
+    private Double dayPowerGeneration;
+
+    @ApiModelProperty(value = "月发电量")
+    private Double monthPowerGeneration;
+
+    @ApiModelProperty(value = "年发电量")
+    private Double yearPowerGeneration;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "国标")
+    private String nationalStandard;
+
+    @ApiModelProperty(value = "版本号")
+    private String version;
+
+    @ApiModelProperty(value = "满发小时数")
+    private String generationHours;
+
+    @ApiModelProperty(value = "质保期")
+    private String warrantyPeriod;
+
+    @ApiModelProperty(value = "IGBT温度")
+    private String igbtTemperature;
+
+    @ApiModelProperty(value = "AFCI方案")
+    private String afciProgramme;
+
+    @ApiModelProperty(value = "AFCI版本")
+    private String afciVersion;
+
+
+    @ApiModelProperty(value = "第三方电站id")
+    private String thirdStationId;
+
+    @ApiModelProperty(value = "装机容量")
+    private Double capacity;
+
+    @ApiModelProperty(value = "累计发电量")
+    private Double totalPowerGeneration;
+
+    @ApiModelProperty(value = "所属电站")
+    private String stationName;
+
+    private List<String> stationIds;
+
+    @ApiModelProperty(value = "所属电站名称")
+    private String name;
+
+    @ApiModelProperty(value = "筛选用 最小值")
+    private Double minValue;
+
+    @ApiModelProperty(value = "筛选用 最大值")
+    private Double maxValue;
+}

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDtoNew;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -21,7 +22,7 @@ public interface JpInverterMapper extends BaseMapper<JpInverter> {
     List<Map<String,Object>> queryInverterCountStatus(@Param("dto") JpStationDto reviewDto);
 
     @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
-    List<JpInverterDto> selectPageData(@Param("dto") JpInverterDto reviewDto, int current, int size);
+    List<JpInverterDtoNew> selectPageData(@Param("dto") JpInverterDto reviewDto, int current, int size);
 
     @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
     int  selectPageDataTotal(@Param("dto") JpInverterDto reviewDto);

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

@@ -37,7 +37,7 @@
     </select>
 
 
-    <select id="selectPageData" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto">
+    <select id="selectPageData" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDtoNew">
         select
         hjc. *
         from

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

@@ -7,8 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-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.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpStationServiceImpl;
 import org.apache.commons.io.IOUtils;
@@ -39,8 +38,6 @@ import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpPersonStationMapper;
 
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -184,9 +181,9 @@ public class JpInverterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryForDataPage")
     @ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询")
-    public ResponseModel<Page<JpInverterDto>> queryForDataPage(@RequestParam(value = "current") int current,
-                                                               @RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
-        Page<JpInverterDto> page = new Page<JpInverterDto>();
+    public ResponseModel<Page<JpInverterDtoNew>> queryForDataPage(@RequestParam(value = "current") int current,
+                                                                  @RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
+        Page<JpInverterDtoNew> page = new Page<JpInverterDtoNew>();
         page.setCurrent(current);
         page.setSize(size);
         page.setTotal(jpInverterServiceImpl.selectPageDataTota(jpInverterDto));
@@ -379,6 +376,8 @@ public class JpInverterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器表")
     public ResponseModel<JpInverter> selectOneBySnCode(@PathVariable String snCode) {
        // JpInverterDto jpInverter=  jpInverterServiceImpl.queryBySeq(sequenceNbr);
+
+
         LambdaQueryWrapper<JpInverter> query = new LambdaQueryWrapper<>();
         query.eq(JpInverter::getSnCode,snCode);
         JpInverter jpInverter = jpInverterServiceImpl.getBaseMapper().selectOne(query);

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

@@ -12,6 +12,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDtoNew;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterDayGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterMonthGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterYearGenerate;
@@ -93,7 +94,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
     }
 
     @UserLimits
-    public List<JpInverterDto> selectPageData(JpInverterDto jpInverterDto, int current, int size) {
+    public List<JpInverterDtoNew> selectPageData(JpInverterDto jpInverterDto, int current, int size) {
         return this.getBaseMapper().selectPageData(jpInverterDto, current, size);
     }