NC程序签派流程配置

lyh

2025-01-24 0c9b8b3752b0a83c4b0b12b7aa6d40b413f91782

NC程序签派流程配置

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java

@@ -15,15 +15,15 @@
import org.springframework.web.bind.annotation.*;

@Slf4j
@Api(tags = "DNC流程配置")
@Api(tags = "DNC指派设备流程配置")
@RestController
@RequestMapping("/nc/definition")
public class ActivitiDefinitionController {
    @Autowired
    private IActivitiDefinitionService definitionService;

    @AutoLog(value = "DNC流程配置-添加配置")
    @ApiOperation(value = "DNC流程配置-添加配置", notes = "DNC流程配置-添加配置")
    @AutoLog(value = "DNC指派设备流程配置-添加配置")
    @ApiOperation(value = "DNC指派设备流程配置-添加配置", notes = "DNC指派设备流程配置-添加配置")
    @PostMapping("/add")
    public ResponseResult addDefinition(@RequestBody ActivitiDefinition definition) {
        boolean b = definitionService.addDefinition(definition);
@@ -32,8 +32,8 @@
        return new ResponseResult(CommonCode.FAIL);
    }

    @AutoLog(value = "DNC流程配置-修改配置")
    @ApiOperation(value = "DNC流程配置-修改配置", notes = "DNC流程配置-修改配置")
    @AutoLog(value = "DNC指派设备流程配置-修改配置")
    @ApiOperation(value = "DNC指派设备流程配置-修改配置", notes = "DNC指派设备流程配置-修改配置")
    @PutMapping("/edit")
    public ResponseResult editDefinition( @RequestBody ActivitiDefinition definition) {
        boolean b = definitionService.updateById(definition);
@@ -42,8 +42,8 @@
        return new ResponseResult(CommonCode.FAIL);
    }

    @AutoLog(value = "DNC流程配置-删除配置")
    @ApiOperation(value = "DNC流程配置-删除配置", notes = "DNC流程配置-删除配置")
    @AutoLog(value = "DNC指派设备流程配置-删除配置")
    @ApiOperation(value = "DNC指派设备流程配置-删除配置", notes = "DNC指派设备流程配置-删除配置")
    @DeleteMapping("/delete")
    public ResponseResult deleteDefinition(@RequestParam("id") String id) {
        boolean b = definitionService.deleteDefinition(id);
@@ -52,8 +52,8 @@
        return new ResponseResult(CommonCode.FAIL);
    }

    @AutoLog(value = "DNC流程配置-分页查询配置列表")
    @ApiOperation(value = "DNC流程配置-分页查询配置列表", notes = "DNC流程配置-分页查询配置列表")
    @AutoLog(value = "DNC指派设备流程配置-分页查询配置列表")
    @ApiOperation(value = "DNC指派设备流程配置-分页查询配置列表", notes = "DNC指派设备流程配置-分页查询配置列表")
    @GetMapping("/find/page")
    public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiSignExamineController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package org.jeecg.modules.activiti.controller;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.activiti.entity.ActivitiSignExamine;
import org.jeecg.modules.activiti.request.ActivitiDefinitionRequest;
import org.jeecg.modules.activiti.service.IActivitiDefinitionService;
import org.jeecg.modules.activiti.service.IActivitiSignExamineService;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.sql.Struct;

@Slf4j
@Api(tags = "NC程序签派流程配置")
@RestController
@RequestMapping("/nc/activitiSignExamine")
public class ActivitiSignExamineController {
    @Autowired
    private IActivitiSignExamineService iActivitiSignExamineService;

    @AutoLog(value = "NC程序签派流程配置-添加配置")
    @ApiOperation(value = "NC程序签派流程配置-添加配置", notes = "NC程序签派流程配置-添加配置")
    @PostMapping("/add")
    public Result<?> addDefinition(@RequestBody ActivitiSignExamine activitiSignExamine) {
        iActivitiSignExamineService.save(activitiSignExamine);
        return Result.ok("添加成功！");
    }

    @AutoLog(value = "NC程序签派流程配置-修改配置")
    @ApiOperation(value = "NC程序签派流程配置-修改配置", notes = "NC程序签派流程配置-修改配置")
    @PutMapping("/edit")
    public Result<?> editDefinition( @RequestBody ActivitiSignExamine activitiSignExamine) {
        iActivitiSignExamineService.updateById(activitiSignExamine);
        return Result.ok("编辑成功!");
    }

    @AutoLog(value = "NC程序签派流程配置-删除配置")
    @ApiOperation(value = "NC程序签派流程配置-删除配置", notes = "NC程序签派流程配置-删除配置")
    @DeleteMapping("/delete")
    public Result<?> deleteDefinition(@RequestParam("id") String id) {
        iActivitiSignExamineService.removeById(id);
        return Result.ok("删除成功!");
    }

    @AutoLog(value = "NC程序签派流程配置-分页查询配置列表")
    @ApiOperation(value = "NC程序签派流程配置-分页查询配置列表", notes = "NC程序签派流程配置-分页查询配置列表")
    @GetMapping("/find/page")
    public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                  ActivitiSignExamine activitiSignExamine) {
        QueryWrapper<ActivitiSignExamine> queryWrapper=new QueryWrapper<>();
        queryWrapper.like(StrUtil.isNotEmpty(activitiSignExamine.getActName()),"act_name",activitiSignExamine.getActName());
        queryWrapper.orderByDesc("create_time");
        IPage<ActivitiSignExamine> page=iActivitiSignExamineService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivitiSignExamine>(pageNo, pageSize),queryWrapper);
        return Result.ok(page);
        }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java

@@ -21,15 +21,15 @@
import java.util.List;

@Slf4j
@Api(tags = "DNC流程操作")
@Api(tags = "DNC指派设备流程操作")
@RestController
@RequestMapping("/nc/activit")
public class AssignFileStreamController  {
    @Autowired
    private IAssignFileStreamService assignFileStreamService;

    @AutoLog(value = "DNC流程操作-启动流程 ä¿å­˜ç›¸åº”的数据 ç»‘定businessKey")
    @ApiOperation(value = "DNC流程操作-启动流程 ä¿å­˜ç›¸åº”的数据 ç»‘定businessKey", notes = "DNC流程操作-启动流程 ä¿å­˜ç›¸åº”的数据 ç»‘定businessKey")
    @AutoLog(value = "DNC指派设备流程操作-启动流程 ä¿å­˜ç›¸åº”的数据 ç»‘定businessKey")
    @ApiOperation(value = "DNC指派设备流程操作-启动流程 ä¿å­˜ç›¸åº”的数据 ç»‘定businessKey", notes = "DNC指派设备流程操作-启动流程 ä¿å­˜ç›¸åº”的数据 ç»‘定businessKey")
    @PostMapping("/assign/file/apply")
    public ResponseResult applyAssignFile(@RequestBody AssignFileStream stream) {
        ResponseResult b = assignFileStreamService.applyAssignFile(stream);
@@ -39,8 +39,8 @@
        return b;
    }

    @AutoLog(value = "DNC流程操作-审批服务")
    @ApiOperation(value = "DNC流程操作-审批服务", notes = "DNC流程操作-审批服务")
    @AutoLog(value = "DNC指派设备流程操作-审批服务")
    @ApiOperation(value = "DNC指派设备流程操作-审批服务", notes = "DNC指派设备流程操作-审批服务")
    @PostMapping("/assign/file/approve/{taskId}/{streamId}")
    public ResponseResult approveAssignFile(@PathVariable("taskId") String taskId, @PathVariable("streamId") String streamId,
                                            @RequestBody AssignFileStream stream) {
@@ -50,8 +50,8 @@
        return new ResponseResult(CommonCode.FAIL);
    }

    @AutoLog(value = "DNC流程操作-获取当前用户的待办及可拾取的任务")
    @ApiOperation(value = "DNC流程操作-获取当前用户的待办及可拾取的任务", notes = "DNC流程操作-获取当前用户的待办及可拾取的任务")
    @AutoLog(value = "DNC指派设备流程操作-获取当前用户的待办及可拾取的任务")
    @ApiOperation(value = "DNC指派设备流程操作-获取当前用户的待办及可拾取的任务", notes = "DNC指派设备流程操作-获取当前用户的待办及可拾取的任务")
    @GetMapping("/find/task/list")
    public Result<?> getUndoTaskList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@@ -59,8 +59,8 @@
        return Result.ok(actTaskExtIPage);
    }

    @AutoLog(value = "DNC流程操作-批量指派到设备")
    @ApiOperation(value = "DNC流程操作-批量指派到设备", notes = "DNC流程操作-批量指派到设备")
    @AutoLog(value = "DNC指派设备流程操作-批量指派到设备")
    @ApiOperation(value = "DNC指派设备流程操作-批量指派到设备", notes = "DNC指派设备流程操作-批量指派到设备")
    @PostMapping("/assign/file/batch/apply")
    public ResponseResult applyBatchAssignFile(@RequestBody AssignFileRequest assignFileRequest) {
        boolean b = assignFileStreamService.applyBatchAssignFile(assignFileRequest);
@@ -69,8 +69,8 @@
        return new ResponseResult(CommonCode.FAIL);
    }

    @AutoLog(value = "DNC流程操作-批量审批")
    @ApiOperation(value = "DNC流程操作-批量审批", notes = "DNC流程操作-批量审批")
    @AutoLog(value = "DNC指派设备流程操作-批量审批")
    @ApiOperation(value = "DNC指派设备流程操作-批量审批", notes = "DNC指派设备流程操作-批量审批")
    @PostMapping("/assign/file/batch/approve")
    public ResponseResult approveBatchAssignFile(@RequestBody ApproveBatchRequest approveBatchRequest) {
        boolean b = assignFileStreamService.approveBatchAssignFile(approveBatchRequest);
@@ -79,31 +79,31 @@
        return new ResponseResult(CommonCode.FAIL);
    }

    @AutoLog(value = "DNC流程操作-已办列表获取")
    @ApiOperation(value = "DNC流程操作-已办列表获取", notes = "DNC流程操作-已办列表获取")
    @AutoLog(value = "DNC指派设备流程操作-已办列表获取")
    @ApiOperation(value = "DNC指派设备流程操作-已办列表获取", notes = "DNC指派设备流程操作-已办列表获取")
    @GetMapping("/find/page")
    public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, AssignFileStreamQueryRequest request) {
        return assignFileStreamService.findPageList(pageNo, pageSize, request);
    }

    @AutoLog(value = "DNC流程操作-查询文档的审批记录")
    @ApiOperation(value = "DNC流程操作-查询文档的审批记录", notes = "DNC流程操作-查询文档的审批记录")
    @AutoLog(value = "DNC指派设备流程操作-查询文档的审批记录")
    @ApiOperation(value = "DNC指派设备流程操作-查询文档的审批记录", notes = "DNC指派设备流程操作-查询文档的审批记录")
    @GetMapping("/find/page/{page}/{size}/{docId}")
    public QueryPageResponseResult<AssignFileStreamExt> findPageListByDocId(@PathVariable("page") int page, @PathVariable("size") int size, @PathVariable("docId") String docId) {
        return assignFileStreamService.findPageListByDocId(page, size, docId);
    }

    @AutoLog(value = "DNC流程操作-获取启用流程的标记")
    @ApiOperation(value = "DNC流程操作-获取启用流程的标记", notes = "DNC流程操作-获取启用流程的标记")
    @AutoLog(value = "DNC指派设备流程操作-获取启用流程的标记")
    @ApiOperation(value = "DNC指派设备流程操作-获取启用流程的标记", notes = "DNC指派设备流程操作-获取启用流程的标记")
    @GetMapping("/get/enable/flag")
    public DataResponseResult<Boolean> getActiveEnable() {
        Boolean b = assignFileStreamService.getActiveEnable();
        return new DataResponseResult<>(CommonCode.SUCCESS, b);
    }

    @AutoLog(value = "DNC流程操作-扫码传输程序 ä¸ç»è¿‡å®¡æ‰¹ æ–‡ä»¶å­˜åœ¨é‡‡ç”¨è¦†ç›–")
    @ApiOperation(value = "DNC流程操作-扫码传输程序 ä¸ç»è¿‡å®¡æ‰¹ æ–‡ä»¶å­˜åœ¨é‡‡ç”¨è¦†ç›–", notes = "DNC流程操作-扫码传输程序 ä¸ç»è¿‡å®¡æ‰¹ æ–‡ä»¶å­˜åœ¨é‡‡ç”¨è¦†ç›–")
    @AutoLog(value = "DNC指派设备流程操作-扫码传输程序 ä¸ç»è¿‡å®¡æ‰¹ æ–‡ä»¶å­˜åœ¨é‡‡ç”¨è¦†ç›–")
    @ApiOperation(value = "DNC指派设备流程操作-扫码传输程序 ä¸ç»è¿‡å®¡æ‰¹ æ–‡ä»¶å­˜åœ¨é‡‡ç”¨è¦†ç›–", notes = "DNC指派设备流程操作-扫码传输程序 ä¸ç»è¿‡å®¡æ‰¹ æ–‡ä»¶å­˜åœ¨é‡‡ç”¨è¦†ç›–")
    @PostMapping("/transfer/doc")
    public ResponseResult transferDocFile(String pnCode, String deviceNo) {
        boolean b = assignFileStreamService.transferDocFile(pnCode, deviceNo);

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java

@@ -13,7 +13,7 @@
@Data
@NoArgsConstructor
@TableName("nc_activiti_definition_info")
@Api(value= "流程定义")
@Api(value= "DNC指派设备流程定义")
public class ActivitiDefinition {
    @TableId(value = "id")
    private String id;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiSignExamine.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
package org.jeecg.modules.activiti.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.jeecg.common.aspect.annotation.Dict;

import java.util.Date;

@Data
@NoArgsConstructor
@TableName("nc_assign_to_sign_examine")
@Api(value= "NC程序签派流程定义")
public class ActivitiSignExamine {
    @TableId(value = "id")
    private String id;
    @TableField(value = "act_name")
    private String actName;
    @TableField(value = "depart_id")
    @Dict(dictTable = "sys_department",dicCode = "depart_id",dicText = "depart_name")
    private String departId;
    @TableField(value = "proofreader_user")
    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String proofreaderUser;
    @TableField(value = "approving_user")
    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String approveUser;
    @TableField(value = "cutter_user")
    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String cutterUser;
    @TableField(value = "typecast_user")
    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String typecastUser;
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    private Date createTime;
    @TableField(value = "update_time", fill = FieldFill.UPDATE)
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date updateTime;
    @JsonIgnore
    @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
    private String createBy;
    @JsonIgnore
    @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
    private String updateBy;
    @JsonIgnore
    @TableLogic
    @TableField(value = "delete_flag", select = false)
    private Integer deleteFlag = 0;
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java

@@ -13,7 +13,7 @@
@Data
@NoArgsConstructor
@TableName("nc_assign_file_stream")
@Api(value= "流程操作")
@Api(value= "DNC指派设备流程操作")
public class AssignFileStream {
    @TableId(value = "stream_id")
    private String streamId;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/mapper/ActivitiSignExamineMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package org.jeecg.modules.activiti.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.activiti.entity.ActivitiSignExamine;

public interface ActivitiSignExamineMapper extends BaseMapper<ActivitiSignExamine> {
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IActivitiSignExamineService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package org.jeecg.modules.activiti.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.activiti.entity.ActivitiSignExamine;


public interface IActivitiSignExamineService extends IService<ActivitiSignExamine> {

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiSignExamineServiceimpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package org.jeecg.modules.activiti.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.activiti.entity.ActivitiSignExamine;
import org.jeecg.modules.activiti.mapper.ActivitiSignExamineMapper;
import org.jeecg.modules.activiti.service.IActivitiSignExamineService;
import org.springframework.stereotype.Service;

@Service
public class ActivitiSignExamineServiceimpl extends ServiceImpl<ActivitiSignExamineMapper, ActivitiSignExamine> implements IActivitiSignExamineService {
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java

@@ -26,3 +26,4 @@
    List<MdcProduction> getDepartNonPermsByProcessId(@Param("procession") String processionId);

}


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessionDepartmentMapper.xml

@@ -10,7 +10,7 @@
             , org_code
        from mdc_production u
        inner join
        (select depart_id from nc_process_department  where process_id=#{c}) p
        (select depart_id from nc_process_department  where process_id=#{procession}) p
        on u.id=p.depart_id
    </select>


 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java

@@ -77,6 +77,9 @@
        query.orderByAsc(MdcProduction::getProductionOrder);
        List<MdcProduction> list = this.list(query);
        for (MdcProduction production : list) {
            if (production.getDescription().isEmpty()){
                production.setDescription("");
            }
            listResult.add(new MdcProductionTreeModel(production));
        }
        return listResult;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.system.util;

import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.model.MdcProductionTreeModel;
@@ -25,6 +26,9 @@
        List<MdcProductionTreeModel> records = new ArrayList<>();
        for (int i = 0; i < recordList.size(); i++) {
            MdcProduction mdcProduction = recordList.get(i);
            if (StrUtil.isEmpty(mdcProduction.getDescription())){
                mdcProduction.setDescription("");
            }
            records.add(new MdcProductionTreeModel(mdcProduction));
        }
        List<MdcProductionTreeModel> tree = findChildren(records, idList);

 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml

@@ -151,7 +151,7 @@
    async-executor-activate: false
    async-executor-enabled: true
activiti:
      enable: false # true å¯ç”¨å®¡æ‰¹ false ä¸å¯ç”¨å®¡æ‰¹
      enable: true # true å¯ç”¨å®¡æ‰¹ false ä¸å¯ç”¨å®¡æ‰¹
#mybatis plus è®¾ç½®
mybatis-plus:
  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml