Skip to content

A
amos-boot-biz
Commit 82b2fa84 authored by tangwei's avatar tangwei
Browse files
Options

修改户用光伏监控页面bug

parent 1bb12800
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @ 82b2fa84
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
</foreach> </foreach>
</if> </if>
</where> </where>
order by start_time DESC
</select> </select>
<select id="getByTime" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto"> <select id="getByTime" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto">
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MonthPowerServiceImpl.java
View file @ 82b2fa84
...@@ -65,7 +65,7 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower, ...@@ -65,7 +65,7 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
for (MonthPower monthPower : list) { for (MonthPower monthPower : list) {
for (MonthPower power : listdday) { for (MonthPower power : listdday) {
if(monthPower.getThirdStationId().equals(power.getThirdStationId())){ if(monthPower.getThirdStationId().equals(power.getThirdStationId())){
power.setCreatedTime(monthPower.getCreatedTime()); monthPower.setCreatedTime(power.getCreatedTime());
}else{ }else{
} }
......
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 @ 82b2fa84
...@@ -55,7 +55,7 @@ public class TdHygfJpCollectorHistoryServiceImpl ...@@ -55,7 +55,7 @@ public class TdHygfJpCollectorHistoryServiceImpl
if (collector != null) { if (collector != null) {
List<TdHygfJpCollectorHistoryDto> list = this.baseMapper.dayList(collector.getSnCode(), List<TdHygfJpCollectorHistoryDto> list = this.baseMapper.dayList(collector.getSnCode(),
collector.getThirdStationId(), TimeUtil.getStartTimeOfDay(day)- 8 * 60 * 60 * 1000, TimeUtil.getEndTimeOfDay(day)- 8 * 60 * 60 * 1000); collector.getThirdStationId(), TimeUtil.getStartTimeOfDay(day), TimeUtil.getEndTimeOfDay(day));
if (!list.isEmpty()) { if (!list.isEmpty()) {
list.forEach(i -> { list.forEach(i -> {
i.setTimeFormat(TimeUtil.minuteFormat(i.getTime())); i.setTimeFormat(TimeUtil.minuteFormat(i.getTime()));
...@@ -118,8 +118,8 @@ public class TdHygfJpCollectorHistoryServiceImpl ...@@ -118,8 +118,8 @@ public class TdHygfJpCollectorHistoryServiceImpl
int month = cal.get(Calendar.MONTH) + 1; int month = cal.get(Calendar.MONTH) + 1;
int year = cal.get(Calendar.YEAR); int year = cal.get(Calendar.YEAR);
// 月表 // 月表
List<Map<String, Object>> monthList = this.baseMapper.dayToMonth(TimeUtil.getStartTimeOfDay(dayTime)- 8 * 60 * 60 * 1000, List<Map<String, Object>> monthList = this.baseMapper.dayToMonth(TimeUtil.getStartTimeOfDay(dayTime),
TimeUtil.getEndTimeOfDay(dayTime)- 8 * 60 * 60 * 1000); TimeUtil.getEndTimeOfDay(dayTime));
for (int i = 0; i < monthList.size(); i++) { for (int i = 0; i < monthList.size(); i++) {
monthList.get(i).put("created_time", dayTime.getTime() + i); monthList.get(i).put("created_time", dayTime.getTime() + i);
monthList.get(i).put("day", day); monthList.get(i).put("day", day);
......
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 @ 82b2fa84
...@@ -49,7 +49,7 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends ...@@ -49,7 +49,7 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
JpInverter invertor = jpInvertorServiceImpl.getById(id); JpInverter invertor = jpInvertorServiceImpl.getById(id);
if (invertor != null) { if (invertor != null) {
List<TdHygfJpInvertorElecHistoryDto> list = this.baseMapper.dayList(invertor.getSnCode(), List<TdHygfJpInvertorElecHistoryDto> list = this.baseMapper.dayList(invertor.getSnCode(),
invertor.getThirdStationId(), TimeUtil.getStartTimeOfDay(day)- 8 * 60 * 60 * 1000, TimeUtil.getEndTimeOfDay(day)- 8 * 60 * 60 * 1000); invertor.getThirdStationId(), TimeUtil.getStartTimeOfDay(day), TimeUtil.getEndTimeOfDay(day));
if (!list.isEmpty()) { if (!list.isEmpty()) {
list.forEach(i -> { list.forEach(i -> {
i.setTimeFormat(TimeUtil.minuteFormat(i.getTime())); i.setTimeFormat(TimeUtil.minuteFormat(i.getTime()));
...@@ -110,8 +110,8 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends ...@@ -110,8 +110,8 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
int month = cal.get(Calendar.MONTH) + 1; int month = cal.get(Calendar.MONTH) + 1;
int year = cal.get(Calendar.YEAR); int year = cal.get(Calendar.YEAR);
// 月表 // 月表
List<Map<String, Object>> monthList = this.baseMapper.dayToMonth(TimeUtil.getStartTimeOfDay(dayTime)- 8 * 60 * 60 * 1000, List<Map<String, Object>> monthList = this.baseMapper.dayToMonth(TimeUtil.getStartTimeOfDay(dayTime),
TimeUtil.getEndTimeOfDay(dayTime)- 8 * 60 * 60 * 1000); TimeUtil.getEndTimeOfDay(dayTime));
for (int i = 0; i < monthList.size(); i++) { for (int i = 0; i < monthList.size(); i++) {
monthList.get(i).put("created_time", dayTime.getTime() + i); monthList.get(i).put("created_time", dayTime.getTime() + i);
monthList.get(i).put("day", day); monthList.get(i).put("day", day);
...@@ -127,7 +127,7 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends ...@@ -127,7 +127,7 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
for (Map<String, Object> map : monthList) { for (Map<String, Object> map : monthList) {
for (JpInvertorElecHistoryMonthDto jpInvertorElecHistoryMonthDto : listold) { for (JpInvertorElecHistoryMonthDto jpInvertorElecHistoryMonthDto : listold) {
if (map.get("third_station_id").toString().equals(jpInvertorElecHistoryMonthDto.getThirdStationId())&&map.get("sn_code").toString().trim().equals(jpInvertorElecHistoryMonthDto.getSnCode().trim())&&map.get("day").toString().equals(jpInvertorElecHistoryMonthDto.getDay())) { if (map.get("third_station_id").toString().equals(jpInvertorElecHistoryMonthDto.getThirdStationId().trim())&&map.get("sn_code").toString().trim().equals(jpInvertorElecHistoryMonthDto.getSnCode().trim())&&map.get("day").toString().equals(jpInvertorElecHistoryMonthDto.getDay())) {
map.put("created_time", jpInvertorElecHistoryMonthDto.getCreatedTime()); map.put("created_time", jpInvertorElecHistoryMonthDto.getCreatedTime());
} }
} }
......
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