解决冲突

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/dto/TdHygfJpCollectorHistoryDto.java

@@ -14,25 +14,26 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@ApiModel(value="TdHygfJpCollectorHistoryDto", description="户用光伏监盘采集器历史表")
-public class TdHygfJpCollectorHistoryDto   {
+@ApiModel(value = "TdHygfJpCollectorHistoryDto", description = "户用光伏监盘采集器历史表")
+public class TdHygfJpCollectorHistoryDto {
 
-   private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "sn编码")
+	private String snCode;
 
-    @ApiModelProperty(value = "sn编码")
-    private String snCode;
+	@ApiModelProperty(value = "时间")
+	private Long time;
 
-    @ApiModelProperty(value = "时间")
-    private Long time;
+	@ApiModelProperty(value = "信号强度")
+	private Double signalStrength;
 
-    @ApiModelProperty(value = "信号强度")
-    private Double signalStrength;
+	@ApiModelProperty(value = "第三方电站id")
+	private String thirdStationId;
 
-    @ApiModelProperty(value = "第三方电站id")
-    private String thirdStationId;
+	@ApiModelProperty(value = "第三方厂商标识")
+	private String thirdCode;
 
-    @ApiModelProperty(value = "第三方厂商标识")
-    private String thirdCode;
+	private String timeFormat;
 
 }

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

@@ -15,42 +15,43 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@ApiModel(value="TdHygfJpInvertorElecHistoryDto", description="户用光伏监盘逆变器电能历史表")
-public class TdHygfJpInvertorElecHistoryDto  {
+@ApiModel(value = "TdHygfJpInvertorElecHistoryDto", description = "户用光伏监盘逆变器电能历史表")
+public class TdHygfJpInvertorElecHistoryDto {
 
-   private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "sn编码")
+	private String snCode;
 
-    @ApiModelProperty(value = "sn编码")
-    private String snCode;
+	@ApiModelProperty(value = "U交流电压")
+	private Double uAcVoltage;
 
-    @ApiModelProperty(value = "U交流电压")
-    private Double uAcVoltage;
+	@ApiModelProperty(value = "V交流电压")
+	private Double vAcVoltage;
 
-    @ApiModelProperty(value = "V交流电压")
-    private Double vAcVoltage;
+	@ApiModelProperty(value = "W交流电压")
+	private Double wAcVoltage;
 
-    @ApiModelProperty(value = "W交流电压")
-    private Double wAcVoltage;
+	@ApiModelProperty(value = "U交流电流")
+	private Double uAcCurrent;
 
-    @ApiModelProperty(value = "U交流电流")
-    private Double uAcCurrent;
+	@ApiModelProperty(value = "V交流电流")
+	private Double vAcCurrent;
 
-    @ApiModelProperty(value = "V交流电流")
-    private Double vAcCurrent;
+	@ApiModelProperty(value = "W交流电流")
+	private Double wAcCurrent;
 
-    @ApiModelProperty(value = "W交流电流")
-    private Double wAcCurrent;
+	@ApiModelProperty(value = "时间")
+	private Long time;
 
-    @ApiModelProperty(value = "时间")
-    private Long time;
+	@ApiModelProperty(value = "第三方电站id")
+	private String thirdStationId;
 
-    @ApiModelProperty(value = "第三方电站id")
-    private String thirdStationId;
+	@ApiModelProperty(value = "第三方厂商标识")
+	private String thirdCode;
 
-    @ApiModelProperty(value = "第三方厂商标识")
-    private String thirdCode;
-    
-    private Long createdTime;
+	private Long createdTime;
+
+	private String timeFormat;
 
 }

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-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/TimeUtil.java

@@ -29,6 +29,11 @@ public class TimeUtil {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		return dateFormat.format(new Date(time));
 	}
+	
+	public static String minuteFormat(Long time) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
+		return dateFormat.format(new Date(time));
+	}
 
 	public static String longFormat(Long time) {
 		if (time < 1000) {

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());

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

@@ -54,8 +54,14 @@ public class TdHygfJpCollectorHistoryServiceImpl
 		JpCollector collector = jpCollectorServiceImpl.getById(id);
 
 		if (collector != null) {
-			return this.baseMapper.dayList(collector.getSnCode(), collector.getThirdStationId(),
-					TimeUtil.getStartTimeOfDay(day), TimeUtil.getEndTimeOfDay(day));
+			List<TdHygfJpCollectorHistoryDto> list = this.baseMapper.dayList(collector.getSnCode(),
+					collector.getThirdStationId(), TimeUtil.getStartTimeOfDay(day), TimeUtil.getEndTimeOfDay(day));
+			if (!list.isEmpty()) {
+				list.forEach(i -> {
+					i.setTimeFormat(TimeUtil.minuteFormat(i.getTime()));
+				});
+			}
+			return list;
 		}
 		return new ArrayList<>();
 	}

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

@@ -53,6 +53,20 @@ public class TdHygfJpInverterWarnServiceImpl
 			tdHygfJpInverterWarnDto.setStates(Arrays.asList(s));
 		}
 		List<TdHygfJpInverterWarnDto> list = this.baseMapper.list(tdHygfJpInverterWarnDto);
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+						.eq(JpStation::getThirdStationId, i.getThirdStationId()));
+				if (jpStation != null) {
+					i.setAddress(jpStation.getAddress());
+					i.setStationName(jpStation.getName());
+					i.setArea(jpStation.getArea());
+				}
+				if (i.getStartTime() != null) {
+					i.setStartTimeFormat(TimeUtil.dateFormat(i.getStartTime()));
+				}
+			});
+		}
 		PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
 		com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();
 		pagenew.setCurrent(pageNum);
@@ -89,7 +103,9 @@ public class TdHygfJpInverterWarnServiceImpl
 				tdHygfJpInverterWarnDto.setTimeLongFormat(TimeUtil
 						.longFormat(tdHygfJpInverterWarnDto.getRecoverTime() - tdHygfJpInverterWarnDto.getStartTime()));
 			}
-			tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
+			if (tdHygfJpInverterWarnDto.getStartTime() != null) {
+				tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
+			}
 		}
 
 		return tdHygfJpInverterWarnDto;

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

@@ -51,8 +51,14 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
 	public List<TdHygfJpInvertorElecHistoryDto> dayList(long id, Date day) {
 		JpInverter invertor = jpInvertorServiceImpl.getById(id);
 		if (invertor != null) {
-			return this.baseMapper.dayList(invertor.getSnCode(), invertor.getThirdStationId(),
-					TimeUtil.getStartTimeOfDay(day), TimeUtil.getEndTimeOfDay(day));
+			List<TdHygfJpInvertorElecHistoryDto> list = this.baseMapper.dayList(invertor.getSnCode(),
+					invertor.getThirdStationId(), TimeUtil.getStartTimeOfDay(day), TimeUtil.getEndTimeOfDay(day));
+			if (!list.isEmpty()) {
+				list.forEach(i -> {
+					i.setTimeFormat(TimeUtil.minuteFormat(i.getTime()));
+				});
+			}
+			return list;
 		}
 		return new ArrayList<>();
 	}
@@ -128,7 +134,8 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
 							&& map.get("third_station_id") != null && map.get("sn_code") != null
 							&& map.get("month") != null && map.get("year") != null
 							&& dto.getThirdStationId().equals(map.get("third_station_id").toString())
-							&& dto.getSnCode().equals(map.get("sn_code").toString()) && dto.getYear().equals(map.get("year").toString())
+							&& dto.getSnCode().equals(map.get("sn_code").toString())
+							&& dto.getYear().equals(map.get("year").toString())
 							&& dto.getMonth().equals(map.get("month").toString())) {
 						time = dto.getCreatedTime();
 						break;