解决冲突

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

@@ -21,125 +21,124 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JpStationDto", description="第三方场站")
-public class JpStationDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
+@ApiModel(value = "JpStationDto", description = "第三方场站")
+public class JpStationDto extends BaseDto {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "sn编码")
+	private String snCode;
+
+	@ApiModelProperty(value = "装机容量")
+	private Double capacity;
+
+	@ApiModelProperty(value = "电站名称")
+	private String name;
 
+	@ApiModelProperty(value = "电站编码")
+	private String code;
+
+	@ApiModelProperty(value = "组织编码")
+	private String systemCode;
 
-    @ApiModelProperty(value = "sn编码")
-    private String snCode;
+	@ApiModelProperty(value = "接入平台时间")
+	private Date accessTime;
 
-    @ApiModelProperty(value = "装机容量")
-    private Double capacity;
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
 
-    @ApiModelProperty(value = "电站名称")
-    private String name;
+	@ApiModelProperty(value = "地址")
+	private String address;
 
-    @ApiModelProperty(value = "电站编码")
-    private String code;
+	@ApiModelProperty(value = "经度")
+	private String longitude;
 
-    @ApiModelProperty(value = "组织编码")
-    private String systemCode;
+	@ApiModelProperty(value = "维度")
+	private String latitude;
 
-    @ApiModelProperty(value = "接入平台时间")
-    private Date accessTime;
+	@ApiModelProperty(value = "上网电价")
+	private Double price;
 
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+	@ApiModelProperty(value = "业主姓名")
+	private String userName;
 
-    @ApiModelProperty(value = "地址")
-    private String address;
+	@ApiModelProperty(value = "业主电话")
+	private String userPhone;
 
-    @ApiModelProperty(value = "经度")
-    private String longitude;
+	@ApiModelProperty(value = "电站联系人")
+	private String stationContact;
 
-    @ApiModelProperty(value = "维度")
-    private String latitude;
+	@ApiModelProperty(value = "组件数量")
+	private Integer moduleCount;
 
-    @ApiModelProperty(value = "上网电价")
-    private Double price;
+	@ApiModelProperty(value = "并网类型")
+	private String onGridType;
 
-    @ApiModelProperty(value = "业主姓名")
-    private String userName;
+	@ApiModelProperty(value = "并网时间")
+	private Date onGridTime;
 
-    @ApiModelProperty(value = "业主电话")
-    private String userPhone;
+	@ApiModelProperty(value = "第三方电站id")
+	private String thirdStationId;
 
-    @ApiModelProperty(value = "电站联系人")
-    private String stationContact;
+	@ApiModelProperty(value = "电站id")
+	private Long stationId;
 
-    @ApiModelProperty(value = "组件数量")
-    private Integer moduleCount;
+	@ApiModelProperty(value = "第三方厂商标识")
+	private String thirdCode;
+	/**
+	 * 实时功率
+	 */
+	private Double realTimePower;
+	/**
+	 * 累计发电量
+	 */
+	private Double accumulatedPower;
+	/**
+	 * 状态
+	 */
+	private String state;
+	/**
+	 * 电站类型
+	 */
+	private String type;
+	/**
+	 * 组织编码
+	 */
+	private String organizationalCode;
 
-    @ApiModelProperty(value = "并网类型")
-    private String onGridType;
+	// 日发电量
+	private Double dayGenerate;
+	// 月发电量
+	private Double monthGenerate;
+	// 年发电量
+	private Double yearGenerate;
+	// 日收益
+	private Double dayIncome;
+	// 月收益
+	private Double monthIncome;
+	// 年收益
+	private Double yearIncome;
+	// 地区
+	private String area;
 
-    @ApiModelProperty(value = "并网时间")
-    private Date onGridTime;
+	List<JpPersonStation> statioId;
 
-    @ApiModelProperty(value = "第三方电站id")
-    private String thirdStationId;
+	// 累计收益
+	private Double cumulativeIncome;
 
-    @ApiModelProperty(value = "电站id")
-    private Long stationId;
-
-    @ApiModelProperty(value = "第三方厂商标识")
-    private String thirdCode;
-    /**
-     * 实时功率
-     */
-    private Double	realTimePower;
-    /**
-     * 累计发电量
-     */
-    private Double	accumulatedPower;
-    /**
-     * 状态
-     */
-    private String state;
-    /**
-     * 电站类型
-     */
-    private String type	;
-    /**
-     *  组织编码
-     */
-    private String organizationalCode	;
-
-    //日发电量
-    private Double dayGenerate;
-    //月发电量
-    private Double monthGenerate;
-    //年发电量
-    private Double yearGenerate;
-    //日收益
-    private Double  dayIncome;
-    //月收益
-    private Double monthIncome;
-    // 年收益
-    private Double yearIncome;
-    //地区
-    private String area;
-
-    List<JpPersonStation> statioId;
-
-    //累计收益
-    private Double cumulativeIncome;
-
-
-    private Double dayPowerUse;	//	日用电量
-    private Double month_power_use;	//	月用电量
-    private Double yearPowerUse;	//	年用电量
-
-    private int countBuiltNum;//已建设场站数量
-    private int countNBuiltNum;//未建设场站数量
-
-
-    List<JpInverter> jpInverter;
-
-    List<JpCollector> JpCollector;
-    //时间
-    String dateType;
+	private Double dayPowerUse; // 日用电量
+	private Double month_power_use; // 月用电量
+	private Double yearPowerUse; // 年用电量
+
+	private int countBuiltNum;// 已建设场站数量
+	private int countNBuiltNum;// 未建设场站数量
+
+	List<JpInverter> jpInverter;
+
+	List<JpCollector> JpCollector;
+	// 时间
+	String dateType;
+
+	private String email;
 
 }

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

@@ -53,6 +53,16 @@ public class TdHygfJpInverterWarnDto {
 	@ApiModelProperty(value = "时间")
 	private Long time;
 	
+	private String stationContact;
+	
+	private String userName;
+	
+	private String userPhone;
+	
+	private String email;
+	
+	private String address;
+	
 	private Long createdTime;
 	
 	private List<String> stationIds;

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

@@ -201,8 +201,8 @@ public class JpStation extends BaseEntity {
     private Double yearPowerUse;	//	年用电量
 
 
-
-
+    @TableField("email")
+    private Double email; //邮箱
 
 
 

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

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -18,6 +19,7 @@ import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
 import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterWarnService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
@@ -32,6 +34,10 @@ import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarn
 public class TdHygfJpInverterWarnServiceImpl
 		extends BaseService<TdHygfJpInverterWarnDto, TdHygfJpInverterWarn, TdHygfJpInverterWarnMapper>
 		implements ITdHygfJpInverterWarnService {
+
+	@Autowired
+	JpStationServiceImpl jpStationServiceImpl;
+
 	/**
 	 * 分页查询
 	 */
@@ -65,6 +71,16 @@ public class TdHygfJpInverterWarnServiceImpl
 		Map map = new HashMap<>();
 		map.put("created_time", createdTime);
 		TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto = this.baseMapper.getByTime(createdTime);
+		JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+				.eq(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getThirdStationId()));
+		if (jpStation != null) {
+			tdHygfJpInverterWarnDto.setStationContact(jpStation.getStationContact());
+			tdHygfJpInverterWarnDto.setUserName(jpStation.getUserName());
+			tdHygfJpInverterWarnDto.setUserPhone(jpStation.getUserPhone());
+			tdHygfJpInverterWarnDto.setEmail(null);
+			tdHygfJpInverterWarnDto.setAddress(jpStation.getAddress());
+		}
+
 		return tdHygfJpInverterWarnDto;
 	}
 }
\ No newline at end of file