admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-10-15 18:06:23 +08:00
parent 84c3ff4542
commit d409655150
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java
View File

@ -36,7 +36,8 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpl<CrawlerCrane
@Override @Override
public List<Map<String, Object>> windSpeedTrend(Map<String, Object> map) { public List<Map<String, Object>> windSpeedTrend(Map<String, Object> map) {
if (MapUtils.getInteger(map, "selectType") == 1) { Integer selectType = MapUtils.getInteger(map, "selectType");
if (selectType == 1) {
map.put("reportTime_begin", DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()))); map.put("reportTime_begin", DateUtil.formatDateTime(DateUtil.beginOfDay(new Date())));
map.put("reportTime_end", DateUtil.formatDateTime(new Date())); map.put("reportTime_end", DateUtil.formatDateTime(new Date()));
} }
@ -44,9 +45,9 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpl<CrawlerCrane
List<CrawlerCraneCurrentData> list = this.list(queryWrapper); List<CrawlerCraneCurrentData> list = this.list(queryWrapper);
List<CrawlerCrane> crawlerCraneList = crawlerCraneService.list(Wrappers.<CrawlerCrane>lambdaQuery().eq(CrawlerCrane::getProjectSn, MapUtils.getString(map, "projectSn"))); List<CrawlerCrane> crawlerCraneList = crawlerCraneService.list(Wrappers.<CrawlerCrane>lambdaQuery().eq(CrawlerCrane::getProjectSn, MapUtils.getString(map, "projectSn")));
List<String> dayList; List<String> dayList;
if (MapUtils.getInteger(map, "selectType") == 1) { if (selectType == 1) {
dayList = DateUtils.getDateTimeStrList(100, "HH:mm"); dayList = DateUtils.getDateTimeStrList(100, "HH:mm");
} else if (MapUtils.getInteger(map, "selectType") == 2){ } else if (selectType == 2){
dayList = DateUtils.getNowFewDaysAgoList(7); dayList = DateUtils.getNowFewDaysAgoList(7);
} else { } else {
dayList = DateUtils.getNowFewDaysAgoList(29); dayList = DateUtils.getNowFewDaysAgoList(29);
@ -56,7 +57,9 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpl<CrawlerCrane
Map<String, Object> deviceMap = new HashMap<>(16); Map<String, Object> deviceMap = new HashMap<>(16);
List<Map<String, Object>> dataList = new ArrayList<>(); List<Map<String, Object>> dataList = new ArrayList<>();
for (String day : dayList) { for (String day : dayList) {
List<CrawlerCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(crawlerCrane.getDevSn()) && DateUtil.formatDateTime(l.getReportTime()).contains(day)).collect(Collectors.toList()); List<CrawlerCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(crawlerCrane.getDevSn())
&& ((selectType != 1 && DateUtil.formatDateTime(l.getReportTime()).contains(day))
||(selectType == 1 && DateUtil.format(l.getReportTime(),"HH:00").equals(day)))).collect(Collectors.toList());
Map<String, Object> result = new HashMap<>(16); Map<String, Object> result = new HashMap<>(16);
result.put("dayTitle", day); result.put("dayTitle", day);
result.put("windSpeed", collect.size() > 0 ? collect.get(0).getWindSpeed() : 0); result.put("windSpeed", collect.size() > 0 ? collect.get(0).getWindSpeed() : 0);

11
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java
View File

@ -39,7 +39,8 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpl<TruckCraneCurr
@Override @Override
public List<Map<String, Object>> windSpeedTrend(Map<String, Object> map) { public List<Map<String, Object>> windSpeedTrend(Map<String, Object> map) {
if (MapUtils.getInteger(map, "selectType") == 1) { Integer selectType = MapUtils.getInteger(map, "selectType");
if (selectType == 1) {
map.put("reportTime_begin", DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()))); map.put("reportTime_begin", DateUtil.formatDateTime(DateUtil.beginOfDay(new Date())));
map.put("reportTime_end", DateUtil.formatDateTime(new Date())); map.put("reportTime_end", DateUtil.formatDateTime(new Date()));
} }
@ -47,9 +48,9 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpl<TruckCraneCurr
List<TruckCraneCurrentData> list = this.list(queryWrapper); List<TruckCraneCurrentData> list = this.list(queryWrapper);
List<TruckCrane> truckCraneList = truckCraneService.list(Wrappers.<TruckCrane>lambdaQuery().eq(TruckCrane::getProjectSn, MapUtils.getString(map, "projectSn"))); List<TruckCrane> truckCraneList = truckCraneService.list(Wrappers.<TruckCrane>lambdaQuery().eq(TruckCrane::getProjectSn, MapUtils.getString(map, "projectSn")));
List<String> dayList; List<String> dayList;
if (MapUtils.getInteger(map, "selectType") == 1) { if (selectType == 1) {
dayList = DateUtils.getDateTimeStrList(100, "HH:mm"); dayList = DateUtils.getDateTimeStrList(100, "HH:mm");
} else if (MapUtils.getInteger(map, "selectType") == 2){ } else if (selectType == 2){
dayList = DateUtils.getNowFewDaysAgoList(7); dayList = DateUtils.getNowFewDaysAgoList(7);
} else { } else {
dayList = DateUtils.getNowFewDaysAgoList(29); dayList = DateUtils.getNowFewDaysAgoList(29);
@ -59,7 +60,9 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpl<TruckCraneCurr
Map<String, Object> deviceMap = new HashMap<>(16); Map<String, Object> deviceMap = new HashMap<>(16);
List<Map<String, Object>> dataList = new ArrayList<>(); List<Map<String, Object>> dataList = new ArrayList<>();
for (String day : dayList) { for (String day : dayList) {
List<TruckCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(truckCrane.getDevSn()) && DateUtil.formatDateTime(l.getReportTime()).contains(day)).collect(Collectors.toList()); List<TruckCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(truckCrane.getDevSn())
&& ((selectType != 1 && DateUtil.formatDateTime(l.getReportTime()).contains(day))
||(selectType == 1 && DateUtil.format(l.getReportTime(),"HH:00").equals(day)))).collect(Collectors.toList());
Map<String, Object> result = new HashMap<>(16); Map<String, Object> result = new HashMap<>(16);
result.put("dayTitle", day); result.put("dayTitle", day);
result.put("windSpeed", collect.size() > 0 ? collect.get(0).getWindSpeed() : 0); result.put("windSpeed", collect.size() > 0 ? collect.get(0).getWindSpeed() : 0);