From bfb4c1e1d4e3f99f74a51ef5b67531f9d91d0dde Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 08 九月 2022 09:13:38 +0800
Subject: [PATCH] 目标fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 119 +++++++++++++++++++++++------------------------------------
1 files changed, 46 insertions(+), 73 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index ce65094..e8904ce 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -10,16 +11,19 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngImportExcel;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngExcel;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetMngBaseService;
import com.gkhy.safePlatform.targetDuty.utils.DateUtils;
import com.gkhy.safePlatform.targetDuty.utils.poihelper.ExcelLogs;
import com.gkhy.safePlatform.targetDuty.utils.poihelper.ExcelUtil;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -32,7 +36,6 @@
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 目标指标(TargetMng)表控制层
@@ -49,7 +52,8 @@
@Resource
private TargetMngService targetMngService;
@Resource
- private TargetDivideDetailService targetDivideDetailService;
+ private TargetMngBaseService targetMngBaseService;
+
@Autowired
public HttpServletRequest request;
@@ -65,13 +69,10 @@
*/
@PostMapping(value = "/page/list")
public ResultVO selectAll(@RequestBody PageQuery<TargetMngQueryCriteria> pageQuery){
- if(pageQuery.getSearchParams().getTargetType() == null){
- return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少targetType");
- }
- PageUtils.checkCheck(pageQuery);
- return this.targetMngService.queryAll(pageQuery);
- }
+ return this.targetMngService.queryAll(pageQuery);
+ }
+
/**
* 通过主键查询单条数据
@@ -99,9 +100,9 @@
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少必填字段");
}
if (targetMng.getId() == null) {
- return new ResultVO<>(ResultCodes.OK,targetMngService.save(targetMng));
+ return new ResultVO<>(ResultCodes.OK,targetMngBaseService.save(targetMng));
} else {
- targetMngService.update(targetMng,new UpdateWrapper<TargetMng>().eq("id",targetMng.getId()));
+ targetMngBaseService.update(targetMng,new UpdateWrapper<TargetMng>().eq("id",targetMng.getId()));
return new ResultVO<>(ResultCodes.OK);
}
}
@@ -112,14 +113,9 @@
* @param ids 主键结合
* @return 删除结果
*/
- @GetMapping(value = "/delete")
- public ResultVO delete(String ids) {
- List<String> idList = Arrays.stream(ids.split(","))
- .collect(Collectors.toList());
- //删除关联表数据
- this.targetDivideDetailService.remove(new QueryWrapper<TargetDivideDetail>().in("target_id",idList));
-
- this.targetMngService.removeByIds(idList);
+ @RequestMapping(value = "/delete",method = RequestMethod.POST)
+ public ResultVO delete(@RequestBody Long[] ids) {
+ this.targetMngService.delete(ids);
return new ResultVO<>(ResultCodes.OK);
}
@@ -129,23 +125,7 @@
*/
@GetMapping(value = "/exportTemplate")
public void exportTemplate() throws IOException {
- Map<String,String> map = new LinkedHashMap<>();
- map.put("1","安全目标指标");
- map.put("2","目标指标编号");
- map.put("3","指标类型 1:年指标 2:月指标");
- map.put("4","年度");
- map.put("5","指标值");
- map.put("6","指标级别 1:公司级 2:部门分厂级 3:工段班组级");
- map.put("7","完成期限(yyyy-MM-dd HH:mm:ss)");
- map.put("8","备注信息");
-
- 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();
+ targetMngService.exportTemplate();
}
/**
@@ -154,28 +134,7 @@
*/
@GetMapping(value = "/exportData")
public void exportData(TargetMngQueryCriteria queryCriteria) 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","备注信息");
-
- 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<TargetMngExcel> respList = BeanCopyUtils.copyBeanList(targetMngService.queryAll(queryCriteria), TargetMngExcel.class);
-
- ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
- response.getOutputStream().close();
+ targetMngService.exportData(queryCriteria);
}
/**
@@ -184,22 +143,36 @@
*/
@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<TargetMngImportExcel> importExcel = ExcelUtil.importExcel(TargetMngImportExcel.class, file.getInputStream(), "yyyy-MM-dd HH:mm:ss", new ExcelLogs() , 0);
-
- if (CollectionUtils.isEmpty(importExcel)) {
- return new ResultVO<>(ResultCodes.OK);
- }
-
- List<TargetMng> respList = BeanCopyUtils.copyBeanList((List<TargetMngImportExcel>)importExcel, TargetMng.class);
-
- targetMngService.saveBatch(respList);
+ targetMngService.importData(file);
return new ResultVO<>(ResultCodes.OK);
+ }
+
+
+
+ /**
+ * 分页查询所有数据 -- 【目标检查上报页面】使用
+ *
+ * @param pageQuery 查询实体
+ * @return 所有数据
+ */
+ @PostMapping(value = "/checkAndSubimt/list")
+ public ResultVO list(Authentication authentication, @RequestBody PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery){
+ if(pageQuery.getSearchParams().getRelateType() == null){
+ return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少targetType");
+ }
+ PageUtils.checkCheck(pageQuery);
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return this.targetMngService.queryAll(currentUser.getUid(),pageQuery);
+ }
+
+ /**
+ * 统计
+ *
+ * @return 删除结果
+ */
+ @GetMapping(value = "/statistics")
+ public ResultVO statistics(TargetMngQueryCriteria criteria) {
+ return new ResultVO<>(ResultCodes.OK,this.targetMngService.statistics(criteria));
}
@@ -217,4 +190,4 @@
System.out.println(JSONObject.toJSONString(mng));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2