Skip to content

A
amos-boot-biz
Commit c2eced98 authored by wujiang's avatar wujiang
Browse files
Options

添加格式转换

parent 860196b7
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 44 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpCollectorHistoryDto.java
View file @ c2eced98
......@@ -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
View file @ c2eced98
......@@ -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/util/TimeUtil.java
View file @ c2eced98
......@@ -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/TdHygfJpCollectorHistoryServiceImpl.java
View file @ c2eced98
......@@ -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
View file @ c2eced98
......@@ -53,6 +53,18 @@ 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());
}
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 +101,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
View file @ c2eced98
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment