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/controller/CruiserController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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());
--
Gitblit v1.8.0