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 | 40 ++++++++++------------------------------ 1 files changed, 10 insertions(+), 30 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 1942653..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 @@ -12,6 +12,7 @@ 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; @@ -46,11 +47,11 @@ @Resource private RewardPunishmentDetailService rewardPunishmentDetailService; + @Resource + private RewardPunishmentDetailBaseService rewardPunishmentDetailBaseService; @Autowired public HttpServletRequest request; - @Autowired - public HttpServletResponse response; /** * 分页查询所有数据 @@ -60,10 +61,10 @@ */ @PostMapping(value = "/page/list") public ResultVO selectAll(@RequestBody PageQuery<RewardPunishmentDetailQueryCriteria> pageQuery){ - PageUtils.checkCheck(pageQuery); + return this.rewardPunishmentDetailService.queryAll(pageQuery); } - + /** * 通过主键查询单条数据 @@ -103,9 +104,9 @@ // }); if (rewardPunishmentDetail.getId() == null) { rewardPunishmentDetail.setCreateTime(new Date()); - return new ResultVO<>(ResultCodes.OK,rewardPunishmentDetailService.save(rewardPunishmentDetail)); + return new ResultVO<>(ResultCodes.OK,rewardPunishmentDetailBaseService.save(rewardPunishmentDetail)); } else { - rewardPunishmentDetailService.updateById(rewardPunishmentDetail); + rewardPunishmentDetailBaseService.updateById(rewardPunishmentDetail); return new ResultVO<>(ResultCodes.OK); } } @@ -118,11 +119,7 @@ */ @RequestMapping(value = "/delete",method = RequestMethod.POST) public ResultVO delete(@RequestBody Long[] ids) { - if(ids == null){ - return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL); - } - List<Long> idList = Arrays.asList(ids); - this.rewardPunishmentDetailService.removeByIds(idList); + this.rewardPunishmentDetailService.delete(ids); return new ResultVO<>(ResultCodes.OK); } @@ -134,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); } -} \ No newline at end of file +} -- Gitblit v1.9.2