whycxzp
2022-09-13 55d6dbfb1b4c334f832551f118bcc0593b95c4fa
产品历史版本锁定/解锁日志
3个文件已添加
2个文件已修改
144 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/ProductController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/ProductLockLogMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/ProductLockLog.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProductHistoryService.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProductLockLogService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/ProductController.java
@@ -82,8 +82,8 @@
    @ApiOperation(value = "历史版本可用性设定",notes = "8.31修改后使用")
    @GetMapping("setpHistoryEnable")
    public Response setpHistoryEnable( @RequestParam String parentCode, @RequestParam String customCode, @RequestParam int version,@RequestParam int enabled) {
        return historyService.setpHistoryEnable(parentCode, customCode, version, enabled);
    public Response setpHistoryEnable( @RequestParam String parentCode, @RequestParam String customCode, @RequestParam int version,@RequestParam int enabled,@RequestParam(required = false) String reason) {
        return historyService.setpHistoryEnable(parentCode, customCode, version, enabled,reason);
    }
    @PostMapping("zipParse")
    @ApiOperation(value = "zip解析",notes = "返回结果中,追加data3为对比结果,为key-value集合,key为diffList,addList,deleteList")
src/main/java/com/whyc/mapper/ProductLockLogMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.ProductLockLog;
public interface ProductLockLogMapper extends CustomMapper<ProductLockLog>{
}
src/main/java/com/whyc/pojo/ProductLockLog.java
New file
@@ -0,0 +1,86 @@
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;
import java.util.Date;
@TableName(schema = "db_doc",value = "tb_product_lock_log")
@Alias("ProductLockLog")
public class ProductLockLog {
    private Integer id;
    private String parentCode;
    private String customCode;
    private Integer version;
    @ApiModelProperty("1锁定,2解锁")
    private Integer lock;
    private String reason;
    private String owner;
    private Date createTime;
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
    public String getCustomCode() {
        return customCode;
    }
    public void setCustomCode(String customCode) {
        this.customCode = customCode;
    }
    public Integer getVersion() {
        return version;
    }
    public void setVersion(Integer version) {
        this.version = version;
    }
    public Integer getLock() {
        return lock;
    }
    public void setLock(Integer lock) {
        this.lock = lock;
    }
    public String getReason() {
        return reason;
    }
    public void setReason(String reason) {
        this.reason = reason;
    }
    public String getOwner() {
        return owner;
    }
    public void setOwner(String owner) {
        this.owner = owner;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}
src/main/java/com/whyc/service/ProductHistoryService.java
@@ -9,14 +9,14 @@
import com.whyc.mapper.ProductHistoryMapper;
import com.whyc.mapper.ProductMapper;
import com.whyc.pojo.Product;
import com.whyc.pojo.ProductBom;
import com.whyc.pojo.ProductBomHistory;
import com.whyc.pojo.ProductHistory;
import org.apache.poi.hssf.record.ProtectionRev4Record;
import com.whyc.pojo.ProductLockLog;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.awt.print.PrinterJob;
import java.util.Date;
import java.util.List;
@Service
@@ -32,6 +32,9 @@
    @Autowired(required = false)
    private ProductBomHistoryMapper productBomHistoryMapper;
    @Autowired
    private ProductLockLogService lockLogService;
    //产品详情查看版本信息
    public Response getProductVersion(String parentCode,String customCode) {
@@ -79,7 +82,8 @@
        return mapper.selectOne(query);
    }
    //历史版本可用性设定
    public Response setpHistoryEnable(String parentCode, String customCode, int version, int enabled) {
    @Transactional
    public Response setpHistoryEnable(String parentCode, String customCode, int version, int enabled, String reason) {
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.eq("parent_code",parentCode);
        wrapper.eq("custom_code",customCode);
@@ -146,6 +150,22 @@
            }
        }
        //锁定和解锁记录添加
        if(flag>0){ //操作成功
            ProductLockLog lockLog = new ProductLockLog();
            lockLog.setParentCode(parentCode);
            lockLog.setCustomCode(customCode);
            lockLog.setVersion(version);
            lockLog.setReason(reason);
            lockLog.setOwner(ActionUtil.getUser().getName());
            lockLog.setCreateTime(new Date());
            if(enabled==0){ //锁定
                lockLog.setLock(1);
            }else{ //解锁
                lockLog.setLock(0);
            }
            lockLogService.insert(lockLog);
        }
        return new Response().set(1,flag>0,"历史版本可用性设定");
    }
src/main/java/com/whyc/service/ProductLockLogService.java
New file
@@ -0,0 +1,18 @@
package com.whyc.service;
import com.whyc.mapper.ProductLockLogMapper;
import com.whyc.pojo.ProductLockLog;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class ProductLockLogService {
    @Resource
    private ProductLockLogMapper mapper;
    public void insert(ProductLockLog lockLog) {
        mapper.insert(lockLog);
    }
}