From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java | 62 ++++++++++++-------------------
1 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
index ab5bb18..dfd8048 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
@@ -7,9 +7,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.targetDuty.entity.RewardPunishmentDetail;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineMngDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineTemplateDto;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.RewardPunishmentDetailDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.RewardPunishmentDetailExcel;
import com.gkhy.safePlatform.targetDuty.service.RewardPunishmentDetailService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.RewardPunishmentDetailBaseService;
import com.gkhy.safePlatform.targetDuty.utils.DateUtils;
import com.gkhy.safePlatform.targetDuty.utils.poihelper.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,11 +47,11 @@
@Resource
private RewardPunishmentDetailService rewardPunishmentDetailService;
+ @Resource
+ private RewardPunishmentDetailBaseService rewardPunishmentDetailBaseService;
@Autowired
public HttpServletRequest request;
- @Autowired
- public HttpServletResponse response;
/**
* 分页查询所有数据
@@ -58,7 +61,7 @@
*/
@PostMapping(value = "/page/list")
public ResultVO selectAll(@RequestBody PageQuery<RewardPunishmentDetailQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
+
return this.rewardPunishmentDetailService.queryAll(pageQuery);
}
@@ -71,7 +74,8 @@
*/
@GetMapping(value = "/selectOne/{id}")
public ResultVO selectOne(@PathVariable Serializable id) {
- return new ResultVO<>(ResultCodes.OK,this.rewardPunishmentDetailService.getById(id));
+ RewardPunishmentDetailDto mngDto = this.rewardPunishmentDetailService.selectOne(id);
+ return new ResultVO<>(ResultCodes.OK,mngDto);
}
/**
@@ -89,19 +93,20 @@
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少rewardPunishmentStandardId");
}
- List<Long> pIdList = Arrays.stream(rewardPunishmentDetail.getPersonId().split(",")).map(s-> Long.parseLong(s.trim()))
- .collect(Collectors.toList());
-
- List<RewardPunishmentDetail> list = new ArrayList<>();
- pIdList.forEach(f->{
- RewardPunishmentDetail new1 = BeanCopyUtils.copyBean(rewardPunishmentDetail, RewardPunishmentDetail.class);
- new1.setPersonId(f+"");
- list.add(new1);
- });
+// List<Long> pIdList = Arrays.stream(rewardPunishmentDetail.getPersonId().split(",")).map(s-> Long.parseLong(s.trim()))
+// .collect(Collectors.toList());
+//
+// List<RewardPunishmentDetail> list = new ArrayList<>();
+// pIdList.forEach(f->{
+// RewardPunishmentDetail new1 = BeanCopyUtils.copyBean(rewardPunishmentDetail, RewardPunishmentDetail.class);
+// new1.setPersonId(f+"");
+// list.add(new1);
+// });
if (rewardPunishmentDetail.getId() == null) {
- return new ResultVO<>(ResultCodes.OK,rewardPunishmentDetailService.saveBatch(list));
+ rewardPunishmentDetail.setCreateTime(new Date());
+ return new ResultVO<>(ResultCodes.OK,rewardPunishmentDetailBaseService.save(rewardPunishmentDetail));
} else {
- rewardPunishmentDetailService.updateBatchById(list);
+ rewardPunishmentDetailBaseService.updateById(rewardPunishmentDetail);
return new ResultVO<>(ResultCodes.OK);
}
}
@@ -112,11 +117,9 @@
* @param ids 主键结合
* @return 删除结果
*/
- @GetMapping(value = "/delete")
- public ResultVO delete(String ids) {
- List<String> idList = Arrays.stream(ids.split(","))
- .collect(Collectors.toList());
- this.rewardPunishmentDetailService.removeByIds(idList);
+ @RequestMapping(value = "/delete",method = RequestMethod.POST)
+ public ResultVO delete(@RequestBody Long[] ids) {
+ this.rewardPunishmentDetailService.delete(ids);
return new ResultVO<>(ResultCodes.OK);
}
@@ -128,24 +131,7 @@
*/
@GetMapping(value = "/exportData")
public void exportData(RewardPunishmentDetailQueryCriteria queryCriteria) throws IOException {
- Map<String,String> map = new LinkedHashMap<>();
- map.put("1","奖惩日期");
- map.put("2","奖惩类型");
- map.put("3","被奖惩者");
- map.put("4","奖惩内容");
- map.put("5","奖惩依据");
-
- 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<RewardPunishmentDetailExcel> respList = BeanCopyUtils.copyBeanList(rewardPunishmentDetailService.queryAllRelation(queryCriteria), RewardPunishmentDetailExcel.class);
-
- ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
- response.getOutputStream().close();
+ rewardPunishmentDetailService.exportData(queryCriteria);
}
}
--
Gitblit v1.9.2