whycxzp
2024-01-12 862408c8749d6150ed1a3703b49dbcfef306782c
锁定/解锁日志
2个文件已添加
2个文件已修改
62 ■■■■ 已修改文件
src/main/java/com/whyc/controller/TechnicalSpecificationController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/TechnicalSpecificationLockLogMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/TechnicalSpecificationLockLogService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/TechnicalSpecificationService.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/TechnicalSpecificationController.java
@@ -49,8 +49,8 @@
    @ApiOperation("更新锁定状态")
    @PostMapping("updateLock")
    public Response updateLock(@RequestParam int id,@RequestParam int lockFlag) throws IOException {
        return service.updateLock(id,lockFlag);
    public Response updateLock(@RequestParam int id,@RequestParam int lockFlag,@RequestParam(required = false) String reason) throws IOException {
        return service.updateLock(id,lockFlag,reason);
    }
    @ApiOperation("查询技术规格书")
src/main/java/com/whyc/mapper/TechnicalSpecificationLockLogMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.TechnicalSpecificationLockLog;
public interface TechnicalSpecificationLockLogMapper extends CustomMapper<TechnicalSpecificationLockLog> {
}
src/main/java/com/whyc/service/TechnicalSpecificationLockLogService.java
New file
@@ -0,0 +1,19 @@
package com.whyc.service;
import com.whyc.mapper.TechnicalSpecificationLockLogMapper;
import com.whyc.pojo.TechnicalSpecificationLockLog;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class TechnicalSpecificationLockLogService {
    @Resource
    private TechnicalSpecificationLockLogMapper mapper;
    public void add(TechnicalSpecificationLockLog lockLog){
        mapper.insert(lockLog);
    }
}
src/main/java/com/whyc/service/TechnicalSpecificationService.java
@@ -8,6 +8,7 @@
import com.whyc.dto.Response;
import com.whyc.mapper.TechnicalSpecificationMapper;
import com.whyc.pojo.TechnicalSpecification;
import com.whyc.pojo.TechnicalSpecificationLockLog;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.DateUtil;
@@ -42,7 +43,7 @@
    private ProductHistoryService productHistoryService;
    @Autowired
    private DocLogService logService;
    private TechnicalSpecificationLockLogService lockLogService;
    public Response<Object> excelParse(InputStream inputStream) throws IOException, InvalidFormatException, ParseException {
        TechnicalSpecification specification = new TechnicalSpecification();
@@ -167,10 +168,17 @@
        specification.setCreateTime(date);
        //锁定-负责人才能解锁
        specification.setLockFlag(1);
        specification.setLockReason("系统默认锁定,新版本技术规则书上传");
        mapper.insert(specification);
        //锁定适用机型的生效版本
        lockOtherByAppliedProduct(specification);
        //锁定日志
        TechnicalSpecificationLockLog lockLog = new TechnicalSpecificationLockLog();
        lockLog.setUserName(ActionUtil.getUser().getName());
        lockLog.setTechnicalSpecificationId(specification.getId());
        lockLog.setReason("系统默认锁定,新版本技术规则书上传");
        lockLog.setCreateTime(date);
        lockLog.setStatus(0);
        lockLogService.add(lockLog);
        return new Response().set(1,true,"上传完成");
    }
@@ -187,7 +195,8 @@
    }
    @Transactional
    public Response updateLock(int id, int lockFlag) {
    public Response updateLock(int id, int lockFlag, String reason) {
        Date date = new Date();
        String userName = ActionUtil.getUser().getName();
        TechnicalSpecification specificationInDB = get(id);
        if(!userName.equals(specificationInDB.getOwner())){
@@ -202,14 +211,28 @@
                }else{
                    //锁定目前生效版本
                    availableVersion.setLockFlag(1);
                    availableVersion.setLockReason("新版本解锁,此旧版本锁定");
                    mapper.updateById(availableVersion);
                    //锁定日志
                    TechnicalSpecificationLockLog lockLog = new TechnicalSpecificationLockLog();
                    lockLog.setUserName(userName);
                    lockLog.setTechnicalSpecificationId(id);
                    lockLog.setReason("新版本解锁,此旧版本锁定");
                    lockLog.setCreateTime(date);
                    lockLog.setStatus(0);
                    lockLogService.add(lockLog);
                }
            }
        }
        specificationInDB.setLockFlag(lockFlag);
        mapper.updateById(specificationInDB);
        //锁定/解锁日志
        TechnicalSpecificationLockLog lockLog = new TechnicalSpecificationLockLog();
        lockLog.setUserName(userName);
        lockLog.setTechnicalSpecificationId(id);
        lockLog.setReason(reason);
        lockLog.setCreateTime(date);
        lockLog.setStatus(lockFlag==1?0:1);
        lockLogService.add(lockLog);
        return new Response().set(1, true, "更新完成");
    }