From 54c0125835e850b97793601ac45ee62fa1c4b12e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 09:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 24 +++++++++++++++---------
1 files changed, 15 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..9215b71 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);
@@ -250,11 +252,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,20 +353,24 @@
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());
+ 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);
+// response.addHeader("Access-Contro1-Allow-Origin", "*");
-// compile.writeToFile("G:\\home\\mon1\\" + "���������������������"+params.get("time").toString()+".docx");
+ response.setHeader("Access-Control-Allow-Origin","*");//������������������������
+ response.setHeader("Access-Control-Allow-Methods", "*");//���������������������������GET, POST, HEAD ���
+ response.setHeader("Access-Control-Allow-Headers", "*");//������������������������
+ response.setHeader("Access-Control-Allow-Credentials", "true");//������������cooki
-// FileOutputStream out = new FileOutputStream("���������������������" + params.get("time").toString() + ".docx");
compile.write(response.getOutputStream());
compile.close();
} catch (IOException e) {
--
Gitblit v1.8.0