合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

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

@@ -1,33 +1,23 @@
package com.gkhy.safePlatform.targetDuty.controller;
import java.util.Date;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.google.common.collect.Lists;
import java.sql.Timestamp;



import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.targetDuty.entity.ExamineTemplate;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineTemplateDto;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
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.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
import com.google.common.collect.Lists;
import org.springframework.security.core.Authentication;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;

/**
@@ -56,7 +46,7 @@
      PageUtils.checkCheck(pageQuery);
      return this.examineTemplateService.queryAll(pageQuery);
    }

	

    /**
     * 通过主键查询单条数据
@@ -76,10 +66,16 @@
     * @return 修改结果
     */
    @PostMapping(value = "/addOrUpdate")
    public ResultVO update(@RequestBody ExamineTemplateSaveOrUpdate examineTemplateSaveOrUpdate) {
    public ResultVO update(Authentication authentication, @RequestBody ExamineTemplateSaveOrUpdate examineTemplateSaveOrUpdate) {
        if(!StringUtils.hasText(examineTemplateSaveOrUpdate.getTitle())){
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少title");
        }
        // 获取当前用户
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();

        //设置设定人ID和设定人部门ID
        examineTemplateSaveOrUpdate.setSetPersonDepartmentId(currentUser.getDepId());
        examineTemplateSaveOrUpdate.setSetPersonId(currentUser.getUid());
        examineTemplateService.addOrUpdate(examineTemplateSaveOrUpdate);
        return new ResultVO<>(ResultCodes.OK);
    }
@@ -90,10 +86,12 @@
     * @param ids 主键结合
     * @return 删除结果
     */
    @GetMapping(value = "/delete")
    public ResultVO delete(String ids) {
   List<String> idList = Arrays.stream(ids.split(","))
                .collect(Collectors.toList());
    @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.examineTemplateService.removeByIds(idList);
        return new ResultVO<>(ResultCodes.OK);
    }
@@ -120,4 +118,4 @@
        examineTemplateSaveOrUpdate.setExamineItemList(examineItemList);
        System.out.println(JSONObject.toJSONString(examineTemplateSaveOrUpdate));
    }
}
}