From 77fb7786036fd4c7dd16b9b15c6569cdf2d8ba19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:20:56 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 12 +++++-------
1 files changed, 5 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 0639673..e06aadb 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
@@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -243,6 +244,7 @@
* @return
*/
@PostMapping("dailyDustlds")
+ @Transactional
public ResultMessage dailyDustlds(@RequestBody Map<String,Object> params, HttpServletResponse response) throws IOException {
// Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -355,17 +357,13 @@
map.put("table3", new MiniTableRenderData(rsList3));
}
map.put("table1", new MiniTableRenderData(header1, rsList1));
- map.put("data",params.get("data").toString());
+ String data = params.get("data").toString();
+ map.put("data",data);
map.put("time",params.get("time").toString());
map.put("date1",params.get("date1").toString());
map.put("date2",params.get("date2").toString());
-
-
+// map.put("data",params.get("data").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();
} catch (IOException e) {
--
Gitblit v1.8.0