新增设备类信息管理，修改bug，删除多余结构

lyh

2025-03-17 cf7d913ff24fce658f72cb996d056ccdaf1b96e0

新增设备类信息管理，修改bug，删除多余结构

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

@@ -125,4 +125,16 @@
        return Result.OK(deviceManagementService.getDeviceManagementListByProductionId(productionId));
    }

    /**
     * é€šè¿‡id查询设备列表信息
     * @param id
     * @return
     */
    @AutoLog(value = "设备类管理信息-通过id查询设备列表信息")
    @ApiOperation(value = "设备类管理信息-通过id查询设备列表信息", notes = "设备类管理信息-通过id查询设备列表信息")
    @GetMapping("/getEquipmentListById")
    public Result<?> getEquipmentListByProductionId(String id){
        return Result.OK(deviceManagementService.getEquipmentListById(id));
    }

}

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

@@ -1,9 +1,6 @@
package org.jeecg.modules.dnc.entity;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
@@ -21,7 +18,7 @@
public class ProcessSpecVersion implements Serializable {
    private static final long serialVersionUID = 1529244980533421687L;
    //id
    @TableField(value = "id")
    @TableId(value = "id")
    private String id;
    //产品id
    @TableField(value = "product_id")

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

@@ -1,9 +1,6 @@
package org.jeecg.modules.dnc.entity;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
@@ -21,7 +18,7 @@
public class WorkStep implements Serializable {
    private static final long serialVersionUID = 1529244980533421687L;
    //工步id
    @TableField(value = "id")
    @TableId(value = "id")
    private String id;
    //产品id
    @TableField(value = "product_id")

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -66,4 +66,11 @@
     * @return
     */
    List<DeviceManagement> getDeviceManagementListByProductionId(String productionId);

    /**
     * é€šè¿‡id查询设备列表信息
     * @param id
     * @return
     */
    List<MdcEquipment> getEquipmentListById(String id);
}

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

@@ -25,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

@@ -218,4 +219,21 @@
        queryWrapper.orderByDesc("create_time");
        return super.list(queryWrapper);
    }

    /**
     * é€šè¿‡id查询设备列表信息
     * @param id
     * @return
     */
    @Override
    public List<MdcEquipment> getEquipmentListById(String id){
        DeviceManagement deviceManagement = super.getById(id);
        if (deviceManagement == null) {
            return null;
        }else {
            List<String> equipmentIds = Arrays.asList(deviceManagement.getEquipmentIds().split(","));
            return equipmentService.list(new QueryWrapper<MdcEquipment>()
                   .in("equipment_id", equipmentIds));
        }
    }
}

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

@@ -225,7 +225,7 @@
            ExceptionCast.cast(PartsInfoCode.PARTS_NOT_EXIST);
        List<ProcessStream> processStreams = processStreamService.findBypsvId(id);
        if(processStreams!= null &&!processStreams.isEmpty())
            ExceptionCast.cast(PartsInfoCode.PARTS_PROCESS_EXIST);
            ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_PROCESS_EXIST);
        boolean b = processSpecVersionPermissionService.deleteByPsvId(processSpecVersion.getId());
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartApproveUser.java

ÎļþÒÑɾ³ý

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartmentUser.java

ÎļþÒÑɾ³ý

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java

@@ -69,8 +69,8 @@
                                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                       HttpServletRequest req) {
        Page<FlowMyBusinessDto> page = new Page<FlowMyBusinessDto>(pageNo, pageSize);
        IPage<FlowMyBusinessDto> pageList = flowMyBusinessService.findPageList(page, flowMyBusinessDto);
        Page page = new Page(pageNo, pageSize);
        IPage<FlowMyBusinessDto> pageList = flowMyBusinessService.getPageList(page, flowMyBusinessDto);
        pageList.getRecords().forEach(item -> {
            //去除[]
            item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/HisWorkTask.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.dncFlow.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -18,7 +19,7 @@
public class HisWorkTask implements Serializable {
    /**主键*/
    //flow_my_business
    @TableField("id")
    @TableId(value = "id")
    private String id;
    @TableField("name")
    private String name;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/UserRole.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.dncFlow.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -9,7 +10,7 @@
@Data
@TableName("sys_role")
public class UserRole implements Serializable {
    @TableField("id")
    @TableId(value = "id")
    private String id;
    @TableField("role_name")
    private String roleName;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/WorkTaskData.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.dncFlow.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -18,7 +19,7 @@
@ApiModel(value="act_ru_task", description="工作流任务数据")
public class WorkTaskData implements Serializable {
    /**主键*/
    @TableField("id_")
    @TableId("id_")
    private String id;
    /**版本号，用于乐观锁控制并发更新*/
    @TableField("rev_")

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/FlowMyBusinessMapper.java

@@ -20,6 +20,6 @@
     * @param flowMyBusinessDto
     * @return
     */
    IPage<FlowMyBusinessDto> getPageList(@Param("page") Page page, @Param("flowMyBusinessDto") FlowMyBusinessDto flowMyBusinessDto);
    IPage<FlowMyBusinessDto> PageList(@Param("page") Page page, @Param("flowMyBusinessDto") FlowMyBusinessDto flowMyBusinessDto);

}

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.flowable.apithird.business.mapper.FlowMyBusinessMapper">
    <select id="getPageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
    <select id="PageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
        SELECT
            flow_my_business.*,
            ACT_HI_PROCINST.START_TIME_ as start_time,

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java

@@ -45,7 +45,7 @@
     * @param flowMyBusinessDto
     * @return
     */
    public IPage<FlowMyBusinessDto> findPageList(Page page, FlowMyBusinessDto flowMyBusinessDto){
        return flowMyBusinessMapper.getPageList(page,flowMyBusinessDto);
    public IPage<FlowMyBusinessDto> getPageList(Page page, FlowMyBusinessDto flowMyBusinessDto){
        return flowMyBusinessMapper.PageList(page,flowMyBusinessDto);
    }
}

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1,6 +1,5 @@
package org.jeecg.modules.flowable.service.impl;


import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
@@ -13,8 +12,8 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.identity.Authentication;
@@ -39,13 +38,13 @@
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.common.constant.ProcessConstants;
import org.jeecg.modules.flowable.apithird.common.enums.FlowComment;
import org.jeecg.modules.flowable.apithird.common.exception.CustomException;
import org.jeecg.modules.flowable.apithird.entity.ActStatus;
import org.jeecg.modules.flowable.apithird.entity.SysUser;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.IFlowThirdService;
import org.jeecg.modules.flowable.apithird.common.constant.ProcessConstants;
import org.jeecg.modules.flowable.apithird.common.enums.FlowComment;
import org.jeecg.modules.flowable.apithird.common.exception.CustomException;
import org.jeecg.modules.flowable.domain.dto.FlowCommentDto;
import org.jeecg.modules.flowable.domain.dto.FlowNextDto;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
@@ -872,7 +871,7 @@
        String myTaskId = null;
        HistoricTaskInstance myTask = null;
        for (HistoricTaskInstance hti : htiList) {
            if (loginUser.getUsername().toString().equals(hti.getAssignee())) {
            if (loginUser.getUsername().equals(hti.getAssignee())) {
                myTaskId = hti.getId();
                myTask = hti;
                break;
@@ -992,7 +991,10 @@
            flowTask.setProcDefId(histTask.getProcessDefinitionId());
            flowTask.setTaskDefKey(histTask.getTaskDefinitionKey());
            flowTask.setTaskName(histTask.getName());
            flowTask.setDescription(flowMyBusinessService.getByProcessInstanceId(histTask.getProcessInstanceId()).getTitle());
            FlowMyBusiness flowMyBusiness = flowMyBusinessService.getByProcessInstanceId(histTask.getProcessInstanceId());
            if (flowMyBusiness != null) {
                flowTask.setDescription(flowMyBusiness.getTitle());
            }
            // æµç¨‹å®šä¹‰ä¿¡æ¯
            ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
                    .processDefinitionId(histTask.getProcessDefinitionId())

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java

@@ -16,7 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@@ -84,24 +83,11 @@
        // todo èŽ·å–流程分类信息，此处为例子
        SysCategory category1 = new SysCategory();
        category1.setId("drApproval");
        category1.setName("导入审批流程");
        category1.setName("指派NC程序至设备");
        SysCategory category2 = new SysCategory();
        category2.setId("ggApproval");
        category2.setName("设计更改单流程");
        SysCategory category3 = new SysCategory();
        category3.setId("jjApproval");
        category3.setName("机加工艺规程流程");
        SysCategory category4 = new SysCategory();
        category4.setId("lsApproval");
        category4.setName("临时工艺规程流程");
        SysCategory category5 = new SysCategory();
        category5.setId("fxApproval");
        category5.setName("返修工艺规程流程");
        SysCategory category6 = new SysCategory();
        category6.setId("jjggApproval");
        category6.setName("机加更改单流程");
        ArrayList<SysCategory> sysCategories = Lists.newArrayList(category1,category2,category3,category4,category5,category6);
        return sysCategories;
        category2.setName("NC程序签派");
        return Lists.newArrayList(category1,category2);
    }

    @Override