From f72da3bc5ca43fd37c1f0de15a1e9128a627a563 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 13:59:35 +0800
Subject: [PATCH] fix：日报数据调整
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 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 e550ddc..23c3e71 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
@@ -164,6 +164,9 @@
public void loadDaily( @RequestBody Map<String,Object> params,HttpServletResponse response) throws IOException {
List<Integer> ids = (List<Integer>) params.get("ids");
List<DailyVo> dailyVos = specialDeviceService.loadDaily(ids);
+ if (ObjectUtils.isEmpty(dailyVos)){
+ throw new BusinessException("���������������������");
+ }
dailyDocx(dailyVos,response);
}
@@ -402,7 +405,7 @@
//������jar���������������
ApplicationHome applicationHome = new ApplicationHome(getClass());
//���jar������������������������������upload������������������������������������
- String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
+ String path = applicationHome.getSource().getParentFile().toString() + "\\static\\img";
try {
//InputStream inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/���������������������.docx");
InputStream stream = WordUtil.class.getClassLoader().getResourceAsStream("word/���������������������������.docx");
@@ -446,25 +449,36 @@
// picMap.put("urlImg1", Pictures.ofUrl("G:\\home\\3d423e3cb05d7edc35c38e3173af2a0d.jpg", PictureType.JPEG).size(500, 500).create());
int i =1;
for (DailyVo dailyVo : dailyVos) {
- Map picMap = new HashMap();
+ Map picMap1 = new HashMap();
+ Map picMap2 = new HashMap();
+ Map picMap3 = new HashMap();
+ Map picMap4 = new HashMap();
+ Map picMap5 = new HashMap();
+ Map picMap6 = new HashMap();
+ Map picMap7 = new HashMap();
+ Map picMap8 = new HashMap();
List<String> images = dailyVo.getImages();
if (!ObjectUtils.isEmpty(images)){
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(0)));
- pic1.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(1)));
- pic2.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(2)));
- pic3.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(3)));
- pic4.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(4)));
- pic5.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(5)));
- pic6.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(6)));
- pic7.add(picMap);
- picMap.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(7)));
- pic8.add(picMap);
+
+ picMap1.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(0)));
+// picMap1.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\0a4ab467-304d-4871-948f-55aa7e820975.png"));
+ pic1.add(picMap1);
+ picMap2.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(1)));
+// picMap2.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\0a4ab467-304d-4871-948f-55aa7e820975.png"));
+ pic2.add(picMap2);
+ picMap3.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(2)));
+ pic3.add(picMap3);
+ picMap4.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(3)));
+ pic4.add(picMap4);
+ picMap5.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(4)));
+ pic5.add(picMap5);
+ picMap6.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(5)));
+ pic6.add(picMap6);
+ picMap7.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(6)));
+ pic7.add(picMap7);
+ picMap8.put("urlImg"+i,new PictureRenderData(500, 500, path+"\\"+images.get(7)));
+ pic8.add(picMap8);
+ i++;
}
detailList1.add(dailyVo.getCode());
detailList2.add(dailyVo.getCode());
@@ -498,12 +512,14 @@
}*/
-
+ String name = dailyVos.get(0).getName();
+ String type = dailyVos.get(0).getType();
map.put("code",builder);
map.put("time1",DateUtils.getCurCNDate());
+ map.put("name",name);
+ map.put("type",type);
// map.put("pho",new PictureRenderData(100, 100, "G:\\home\\3d423e3cb05d7edc35c38e3173af2a0d.jpg"));
-// Pictures.ofLocal(null);
-// map.put("pho1",new PictureRenderData(100, 100, path+"\\0a4ab467-304d-4871-948f-55aa7e820975.png"));
+// map.put("pho1",new PictureRenderData(500, 500, path+"\\0a4ab467-304d-4871-948f-55aa7e820975.png"));
HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy();
Configure config = Configure.newBuilder().bind("detailList1", policy).bind("detailList2", policy).bind("detailList3", policy).bind("detailList4", policy)
@@ -513,6 +529,8 @@
put("time1",map.get("time1"));
// put("pho", map.get("pho"));
// put("pho1", map.get("pho1"));
+ put("name",map.get("name"));
+ put("type",map.get("type"));
put("detailList1", detailList1);
put("detailList2", detailList2);
put("detailList3", detailList3);
@@ -537,11 +555,12 @@
response.setContentType("multipart/form-data");
// ���������������
response.addHeader("Content-Disposition", "attachment;fileName=ce.docx" );
+// response.setHeader("Content-Disposition", "attachment; filename=\"" + name+type+"������������" + "\"");
response.setCharacterEncoding("UTF-8");
//���������������
-// File file1 = new File("G:\\test\\test2.docx");
-// FileOutputStream out = new FileOutputStream(file1);
-// compile.write(out);
+/* File file1 = new File("G:\\test\\test2.docx");
+ FileOutputStream out = new FileOutputStream(file1);
+ compile.write(out);*/
//���������������
OutputStream out = response.getOutputStream();
compile.write(out);
--
Gitblit v1.8.0