From c9f757b9cbfcea425179eca92d310319c1aac8b6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Mar 2024 11:34:46 +0800
Subject: [PATCH] fix:走航日报补充提交
---
screen-api/src/main/resources/word/盐城市走航监测报告.docx | 0
screen-api/src/main/java/com/moral/api/pojo/vo/excel/DailyVo.java | 5 +++++
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 11 ++++++++++-
screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java | 4 ++++
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 8 ++++++++
5 files changed, 27 insertions(+), 1 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 06f0500..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);
}
@@ -509,9 +512,12 @@
}*/
-
+ 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"));
// map.put("pho1",new PictureRenderData(500, 500, path+"\\0a4ab467-304d-4871-948f-55aa7e820975.png"));
@@ -523,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);
@@ -547,6 +555,7 @@
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");
diff --git a/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java b/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java
index 5f11771..719c4f2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java
@@ -16,5 +16,9 @@
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
private Date date;
+ private String mac;
+
+ private String type;
+
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/excel/DailyVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/excel/DailyVo.java
index bbee169..6caff58 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/excel/DailyVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/excel/DailyVo.java
@@ -15,4 +15,9 @@
private List<String> images;
+
+ private String type;
+
+ private String name;
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 4a52535..099b1a8 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -20,6 +20,7 @@
import com.moral.api.service.SpecialDeviceHistoryService;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysAreaService;
import com.moral.api.service.SysDictTypeService;
import com.moral.constant.Constants;
@@ -80,6 +81,9 @@
@Autowired
RedisTemplate redisTemplate;
+
+ @Autowired
+ private SysAreaService sysAreaService;
private final static Double dis = 50d;
@@ -452,6 +456,8 @@
ArrayList<String> rsList = new ArrayList<>();
DailyVo dailyVo = new DailyVo();
TbDaily tbDaily = dailyMapper.selectById(id);
+
+ SysArea areaByCode = sysAreaService.getAreaByCode(Integer.parseInt(tbDaily.getCode()));
if (tbDaily==null){
continue;
}
@@ -469,6 +475,8 @@
String join = String.join("-", list);
map.put("time",join);
dailyVo.setCode(map);
+ dailyVo.setName(areaByCode.getAreaName());
+ dailyVo.setType(tbDaily.getType().equals("car")?"���������":"���������");
dailyVos.add(dailyVo);
}
return dailyVos;
diff --git "a/screen-api/src/main/resources/word/\347\233\220\345\237\216\345\270\202\350\265\260\350\210\252\347\233\221\346\265\213\346\212\245\345\221\212.docx" "b/screen-api/src/main/resources/word/\347\233\220\345\237\216\345\270\202\350\265\260\350\210\252\347\233\221\346\265\213\346\212\245\345\221\212.docx"
index 13703ab..7e5d4b6 100644
--- "a/screen-api/src/main/resources/word/\347\233\220\345\237\216\345\270\202\350\265\260\350\210\252\347\233\221\346\265\213\346\212\245\345\221\212.docx"
+++ "b/screen-api/src/main/resources/word/\347\233\220\345\237\216\345\270\202\350\265\260\350\210\252\347\233\221\346\265\213\346\212\245\345\221\212.docx"
Binary files differ
--
Gitblit v1.8.0