From 9d35f3d400890f512e0f27ae50ac748f46419d56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Oct 2023 14:52:14 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java | 7 +++++--
screen-api/src/main/java/com/moral/api/service/DustldService.java | 2 +-
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 9 +++++----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 1ae8f5f..0639673 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -250,11 +250,11 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Map<String, Object> map = dustldService.dailyDustlds(null,params);
- test(map,response);
+ Map<String, Object> map = dustldService.dailyDustlds(params);
if (ObjectUtils.isEmpty(map)){
return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
}
+ test(map,response);
// return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
return ResultMessage.ok();
}
@@ -351,9 +351,10 @@
RowRenderData row = RowRenderData.build(i + 1 + "", map1.get("road").toString(), map1.get("value1").toString(), map1.get("value2").toString(), map1.get("value3").toString());
rsList3.add(row);
}
-
+ if (!ObjectUtils.isEmpty(mapArrayList)){
+ map.put("table3", new MiniTableRenderData(rsList3));
+ }
map.put("table1", new MiniTableRenderData(header1, rsList1));
- map.put("table3", new MiniTableRenderData(rsList3));
map.put("data",params.get("data").toString());
map.put("time",params.get("time").toString());
map.put("date1",params.get("date1").toString());
diff --git a/screen-api/src/main/java/com/moral/api/service/DustldService.java b/screen-api/src/main/java/com/moral/api/service/DustldService.java
index f8efade..c000340 100644
--- a/screen-api/src/main/java/com/moral/api/service/DustldService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DustldService.java
@@ -18,7 +18,7 @@
Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
- Map<String,Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params);
+ Map<String,Object> dailyDustlds(Map<String, Object> params);
Map<String,Object> selectDust(Integer id );
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index aeefda9..1863fba 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -273,7 +273,7 @@
@Override
@Transactional
- public Map<String, Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params) {
+ public Map<String, Object> dailyDustlds(Map<String, Object> params) {
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
@@ -287,6 +287,9 @@
HashMap<String, Object> rsMap = new HashMap<>();
List<Map<String, Object>> dusts = historySecondCruiserMapper.getDusts(params);
Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgId).stream().collect(Collectors.groupingBy(o -> o.getName()));
+ if (ObjectUtils.isEmpty(dusts) || ObjectUtils.isEmpty(collect)){
+ return null;
+ }
Set<String> strings = collect.keySet();
ArrayList<DustForm> list1 = new ArrayList<>();
//���������������������
@@ -388,7 +391,7 @@
}
}
}
- rsMap.put("data",builder);
+ rsMap.put("data",ObjectUtils.isEmpty(builder)?"������������������":builder);
rsMap.put("list3",list3);
rsMap.put("time",rsTime1+"-"+rsTime2);
rsMap.put("date1",dateString3.substring(5,10));
--
Gitblit v1.8.0