锁定增加原因

yangys

2025-08-30 db22fa669998e1b4c87bb2ea20e99b80ff6b0e9e

锁定增加原因

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java

@@ -4,21 +4,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
@@ -71,11 +66,23 @@

    @PostMapping("/lock")
    @Operation(summary = "锁定节点(程序包名)")
    public R<Boolean> lock(@Parameter(description="程序包名节点id)")Long id) {
        ncNodeService.lock(id);
    public R<Boolean> lock(@Parameter(description="程序包名节点id)")Long id,@Parameter(description="锁定原因)")String remark) {
        ncNodeService.lock(id,remark);
        return R.<Boolean>status(true);
    }

    @GetMapping("/query-lock-remark")
    @Operation(summary = "查询锁定原因")
    public R<String> queryLockRemark(@Parameter(description="程序包名节点id)")Long id) {

        NcNode node = ncNodeService.getById(id);
        if(node.hasLocked()){
            return R.data(node.getRemark());
        }else{
            return R.data(StringUtils.EMPTY);
        }
    }

    @GetMapping("/lazy-list")
    @Operation(summary = "懒加载列表", description = "程序目录树形结构")
    public R<List<NcNodeVO>> lazyList(Long parentId) {

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java

@@ -222,6 +222,15 @@
        this.isLocked = LOCKED;
    }

    /**
     * 锁定节点
     * @param remark 锁定原因
     */
    public void lock(String remark) {
        this.isLocked = LOCKED;
        this.remark = remark;
    }

    public void unlock() {
        this.isLocked = UNLOCK;
    }

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java

@@ -383,6 +383,12 @@
        this.updateById(node);
    }
    @Transactional
    public void lock(Long id,String remark) {
        NcNode node = this.getById(id);
        node.lock(remark);
        this.updateById(node);
    }
    @Transactional
    public void unlock(Long id) {
        NcNode node = this.getById(id);
        node.unlock();