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/JpCollectorDto.java

@@ -63,4 +63,9 @@ public class JpCollectorDto  extends BaseDto {
     @ApiModelProperty(value = "第三方厂商标识")
     private String thirdCode;
 
+    @ApiModelProperty(value = "所属电站")
+    private String stationName;
+
+    @ApiModelProperty(value = "电站地址")
+    private String addr;
 }

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

@@ -91,4 +91,7 @@ public class JpInverterDto  extends BaseDto {
     @ApiModelProperty(value = "累计发电量")
     private Double totalPowerGeneration;
 
+    @ApiModelProperty(value = "所属电站")
+    private String stationName;
+
 }

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

@@ -106,4 +106,16 @@ public class JpCollector extends BaseEntity {
 	@TableField("third_code")
     private String thirdCode;
 
+    /**
+     * 所属电站
+     */
+    @TableField("station_name")
+    private String stationName;
+
+    /**
+     * 电站地址
+     */
+    @TableField("addr")
+    private String addr;
+
 }

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

@@ -160,4 +160,16 @@ public class JpInverter extends BaseEntity {
 	@TableField("total_power_generation")
     private Double totalPowerGeneration;
 
+    /**
+     * 所属电站
+     */
+    @TableField("station_name")
+    private String stationName;
+
+    /**
+     * 电站地址
+     */
+    @TableField("addr")
+    private String addr;
+
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -32,6 +33,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
 		if (jpInverterDto.getState() != null) {
 			wrapper.eq(JpInverter::getState, jpInverterDto.getState());
 		}
+		if(StringUtils.isNotEmpty(jpInverterDto.getSnCode())) {
+			wrapper.likeRight(JpInverter::getSnCode, jpInverterDto.getSnCode());
+		}
+		wrapper.orderByDesc(JpInverter::getUpdateTime);
 		entiryPage = (Page<JpInverter>) this.page(entiryPage, wrapper);
 		if (!ValidationUtil.isEmpty(entiryPage.getRecords())) {
 			page.setTotal(entiryPage.getTotal());