From 07e4b1114feadc19478847a9bcda869b5d6a5bf7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 02 Sep 2022 14:23:10 +0800
Subject: [PATCH] 项目目录结构调整
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java | 88 ++++---------------------------------------
1 files changed, 9 insertions(+), 79 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
index f5973a5..54629c8 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
@@ -51,8 +51,6 @@
@Autowired
public HttpServletRequest request;
- @Autowired
- public HttpServletResponse response;
/**
* 分页查询所有数据
@@ -62,10 +60,10 @@
*/
@PostMapping(value = "/page/list")
public ResultVO selectAll(@RequestBody PageQuery<KeypointEquipmentInfoQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
+ PageUtils.checkCheck(pageQuery);
return this.keypointEquipmentInfoService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -100,11 +98,9 @@
* @param ids 主键结合
* @return 删除结果
*/
- @GetMapping(value = "/delete")
- public ResultVO delete(String ids) {
- List<String> idList = Arrays.stream(ids.split(","))
- .collect(Collectors.toList());
- this.keypointEquipmentInfoService.removeByIds(idList);
+ @RequestMapping(value = "/delete",method = RequestMethod.POST)
+ public ResultVO delete(@RequestBody Long[] ids) {
+ this.keypointEquipmentInfoService.delete(ids);
return new ResultVO<>(ResultCodes.OK);
}
@@ -115,31 +111,7 @@
*/
@GetMapping(value = "/exportTemplate")
public void exportTemplate() throws IOException {
- Map<String,String> map = new LinkedHashMap<>();
- map.put("1","类型/类别外键 ");
- map.put("2","装置/部位名称");
- map.put("3","所属单位部门/外键");
- map.put("4","具体位置");
- map.put("5","负责人姓名");
- map.put("6","联系人/外键");
- map.put("7","录入人/外键");
- map.put("8","责任人/外键");
- map.put("9","装置部位分类 1：关键装置 2：重点部位");
- map.put("10","检查周期");
- map.put("11","应急预案/外键");
- map.put("12","主要危险有害因素");
- map.put("13","易导致风险");
- map.put("14","应急处置措施");
- map.put("15","现场图片地址路径");
-
-
- String fileName = URLEncoder.encode("重点监管装置设备数据导入模板.xls", "UTF-8");
- response.setContentType("application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
- response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-
- ExcelUtil.exportExcel(map,new ArrayList<>() , response.getOutputStream());
- response.getOutputStream().close();
+ keypointEquipmentInfoService.exportTemplate();
}
@@ -149,21 +121,7 @@
*/
@RequestMapping(value = "/importData")
public ResultVO importData(MultipartFile file) throws IOException {
- String contentType = file.getContentType();
- if(!"application/vnd.ms-excel".equals(contentType)
- && !"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(contentType)) {
- return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL, "上传的excel格式错误");
- }
-
- Collection<KeypointEquipmentInfoImportExcel> importExcel = ExcelUtil.importExcel(KeypointEquipmentInfoImportExcel.class, file.getInputStream(), "yyyy-MM-dd HH:mm:ss", new ExcelLogs() , 0);
-
- if (CollectionUtils.isEmpty(importExcel)) {
- return new ResultVO<>(ResultCodes.OK);
- }
-
- List<KeypointEquipmentInfo> respList = BeanCopyUtils.copyBeanList((List<KeypointEquipmentInfoImportExcel>)importExcel, KeypointEquipmentInfo.class);
-
- keypointEquipmentInfoService.saveBatch(respList);
+ keypointEquipmentInfoService.importData(file);
return new ResultVO<>(ResultCodes.OK);
}
@@ -176,35 +134,7 @@
*/
@GetMapping(value = "/exportData")
public void exportData(KeypointEquipmentInfoQueryCriteria queryCriteria) throws IOException {
- Map<String,String> map = new LinkedHashMap<>();
- map.put("0","ID");
- map.put("1","类型/类别外键");
- map.put("2","装置/部位名称");
- map.put("3","所属单位部门/外键");
- map.put("4","具体位置");
- map.put("5","负责人姓名");
- map.put("6","联系人/外键");
- map.put("7","录入人/外键");
- map.put("8","责任人/外键");
- map.put("9","装置部位分类 1：关键装置 2：重点部位");
- map.put("10","检查周期");
- map.put("11","应急预案/外键");
- map.put("12","主要危险有害因素");
- map.put("13","易导致风险");
- map.put("14","应急处置措施");
- map.put("15","现场图片地址路径");
-
- String key = DateUtils.date2String(new Date(), DateUtils.PATTERN_ALLTIME_NOSIGN) ;
- String fileName = URLEncoder.encode("重点监管装置设备"+key+".xls", "UTF-8");
- response.setContentType("application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
- response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-
-
- List<KeypointEquipmentInfoExcel> respList = BeanCopyUtils.copyBeanList(keypointEquipmentInfoService.queryAll(queryCriteria), KeypointEquipmentInfoExcel.class);
-
- ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
- response.getOutputStream().close();
+ keypointEquipmentInfoService.exportData(queryCriteria);
}
@@ -286,4 +216,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2