目标fix

songhuangfeng123

2022-09-08 bfb4c1e1d4e3f99f74a51ef5b67531f9d91d0dde

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentStandardController.java

@@ -4,18 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.RewardPunishmentStandard;
import com.gkhy.safePlatform.targetDuty.model.dto.req.RewardPunishmentStandardImportExcel;
import com.gkhy.safePlatform.targetDuty.model.dto.req.RewardPunishmentStandardQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.RewardPunishmentStandardExcel;
import com.gkhy.safePlatform.targetDuty.service.RewardPunishmentStandardService;
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 com.gkhy.safePlatform.targetDuty.service.baseService.RewardPunishmentStandardBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -26,9 +19,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Serializable;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;

/**
 * (RewardPunishmentStandard)表控制层
@@ -44,7 +34,8 @@
     */
    @Resource
    private RewardPunishmentStandardService rewardPunishmentStandardService;

    @Resource
    private RewardPunishmentStandardBaseService rewardPunishmentStandardBaseService;
    @Autowired
    public HttpServletRequest request;

@@ -59,7 +50,6 @@
     */
    @PostMapping(value = "/page/list")
    public ResultVO selectAll(@RequestBody PageQuery<RewardPunishmentStandardQueryCriteria> pageQuery){
      PageUtils.checkCheck(pageQuery);
      return this.rewardPunishmentStandardService.queryAll(pageQuery);
    }
   
@@ -72,7 +62,7 @@
     */
    @GetMapping(value = "/selectOne/{id}")
    public ResultVO selectOne(@PathVariable Serializable id) {
        return new ResultVO<>(ResultCodes.OK,this.rewardPunishmentStandardService.getById(id));
        return new ResultVO<>(ResultCodes.OK,this.rewardPunishmentStandardBaseService.getById(id));
    }

   /**
@@ -90,9 +80,9 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少qName");
        }
        if (rewardPunishmentStandard.getId() == null) {
            return new ResultVO<>(ResultCodes.OK,rewardPunishmentStandardService.save(rewardPunishmentStandard));
            return new ResultVO<>(ResultCodes.OK,rewardPunishmentStandardBaseService.save(rewardPunishmentStandard));
        } else {
            rewardPunishmentStandardService.update(rewardPunishmentStandard,new UpdateWrapper<RewardPunishmentStandard>().eq("id",rewardPunishmentStandard.getId()));
            rewardPunishmentStandardBaseService.update(rewardPunishmentStandard,new UpdateWrapper<RewardPunishmentStandard>().eq("id",rewardPunishmentStandard.getId()));
            return new ResultVO<>(ResultCodes.OK);
        }
    }
@@ -105,19 +95,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);

        List<RewardPunishmentStandard> delList = new ArrayList<>();
        idList.forEach(f->{
            RewardPunishmentStandard info = new RewardPunishmentStandard();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.rewardPunishmentStandardService.updateBatchById(delList);
        this.rewardPunishmentStandardService.delete(ids);
        return new ResultVO<>(ResultCodes.OK);
    }

@@ -130,20 +108,7 @@
     */
    @GetMapping(value = "/exportTemplate")
    public void exportTemplate() throws IOException {
        Map<String,String> map = new LinkedHashMap<>();
        map.put("1","奖惩名称");
        map.put("2","奖惩类型 1:奖励 2:惩罚");
        map.put("3","奖惩内容");
        map.put("4","依据");
        map.put("5","备注");

        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();
        rewardPunishmentStandardService.exportTemplate();
    }

    /**
@@ -152,24 +117,8 @@
     */
    @GetMapping(value = "/exportData")
    public void exportData(RewardPunishmentStandardQueryCriteria queryCriteria) throws IOException {
        Map<String,String> map = new LinkedHashMap<>();
        map.put("1","奖惩名称");
        map.put("2","奖惩类型");
        map.put("3","奖惩内容");
        map.put("4","依据");
        map.put("5","备注");
        rewardPunishmentStandardService.exportData(queryCriteria);

        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<RewardPunishmentStandardExcel> respList = BeanCopyUtils.copyBeanList(rewardPunishmentStandardService.queryAll(queryCriteria), RewardPunishmentStandardExcel.class);

        ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
        response.getOutputStream().close();
    }

    /**
@@ -178,21 +127,8 @@
     */
    @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<RewardPunishmentStandardImportExcel> importExcel = ExcelUtil.importExcel(RewardPunishmentStandardImportExcel.class, file.getInputStream(), "yyyy-MM-dd HH:mm:ss", new ExcelLogs() , 0);

        if (CollectionUtils.isEmpty(importExcel)) {
            return new ResultVO<>(ResultCodes.OK);
        }

        List<RewardPunishmentStandard> respList = BeanCopyUtils.copyBeanList((List<RewardPunishmentStandardImportExcel>)importExcel, RewardPunishmentStandard.class);

        rewardPunishmentStandardService.saveBatch(respList);
        rewardPunishmentStandardService.importData(file);
        return new ResultVO<>(ResultCodes.OK);
    }