From b98b5196f073725fca743f8ad5be57d1f0b8cbd7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 08:55:36 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 d9e8bbe..6b5b362 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);
@@ -254,9 +256,9 @@
if (ObjectUtils.isEmpty(map)){
return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
}
- test(map,response);
+// test(map,response);
// return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
- return ResultMessage.ok();
+ return ResultMessage.ok(map);
}
@@ -355,13 +357,14 @@
map.put("table3", new MiniTableRenderData(rsList3));
}
map.put("table1", new MiniTableRenderData(header1, rsList1));
- map.put("data",params.get("data"));
+ 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");
+// response.addHeader("Access-Contro1-Allow-Origin", "*");
compile.write(response.getOutputStream());
compile.close();
} catch (IOException e) {
--
Gitblit v1.8.0