From 9bf891d878ae6edabc770609350daa60d8c41d8b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 17:03:38 +0800
Subject: [PATCH] fix：管理员登陆
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..d9e8bbe 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,19 +351,16 @@
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("data",params.get("data"));
map.put("time",params.get("time").toString());
map.put("date1",params.get("date1").toString());
map.put("date2",params.get("date2").toString());
-
-
compile.render(map);
-
// compile.writeToFile("G:\\home\\mon1\\" + "���������������������"+params.get("time").toString()+".docx");
-
// FileOutputStream out = new FileOutputStream("���������������������" + params.get("time").toString() + ".docx");
compile.write(response.getOutputStream());
compile.close();
--
Gitblit v1.8.0