art: 设备管理-三保-三保数据库设计变更代码修改

zhangherong

2025-05-21 1dbc8f9ee50b2979decba91ea177f275c09833b4

art: 设备管理-三保-三保数据库设计变更代码修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java

@@ -8,51 +8,62 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: 设备精度检测明细
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Date: 2025-05-13
 * @Version: V1.0
 */
@Data
@TableName("eam_precision_check_detail")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="eam_precision_check_detail对象", description="设备精度检测明细")
@ApiModel(value = "eam_precision_check_detail对象", description = "设备精度检测明细")
public class EamPrecisionCheckDetail implements Serializable {
    
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)

    /**
     * 主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @Excel(name = "创建人", width = 15)
    private String id;
    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    private String createBy;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @Excel(name = "更新人", width = 15)
    private Date createTime;
    /**
     * 更新人
     */
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    private String updateBy;
    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**设备参数id*/
    @Excel(name = "设备参数id", width = 15)
    private Date updateTime;
    /**
     * 工单ID
     */
    @ApiModelProperty(value = "工单ID")
    private String orderId;
    /**
     * 设备参数id
     */
    @ApiModelProperty(value = "设备参数id")
    private String equipmentPrecisionId;
    /**实测值*/
    @Excel(name = "实测值", width = 15)
    private String equipmentPrecisionId;
    /**
     * 实测值
     */
    @ApiModelProperty(value = "实测值")
    private java.math.BigDecimal actualValue;
    private java.math.BigDecimal actualValue;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java

@@ -127,10 +127,10 @@
    @Dict(dicCode = "order_creation_method")
    private String creationMethod;
    /**
     * 设备管理员确认
     * 机动办确认
     */
    @Excel(name = "设备管理员确认", width = 15)
    @ApiModelProperty(value = "设备管理员确认")
    @Excel(name = "机动办确认", width = 15)
    @ApiModelProperty(value = "机动办确认")
    @Dict(dicCode = "sys_user, realname, username")
    private String confirmUser;
    /**
@@ -146,6 +146,39 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "确认时间")
    private Date confirmTime;

    /**
     * 单位领导确认
     */
    @Excel(name = "单位领导确认", width = 15)
    @ApiModelProperty(value = "单位领导确认")
    @Dict(dicCode = "sys_user, realname, username")
    private String confirmLeader;
    /**
     * 领导意见
     */
    @ApiModelProperty(value = "领导意见")
    private String leaderConfirmComment;
    /**
     * 领导确认时间
     */
    @ApiModelProperty(value = "领导确认时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date leaderConfirmTime;

    @ApiModelProperty(value = "精度检验人")
    @Dict(dicCode = "sys_user, realname, username")
    private String precisionChecker;

    /**
     * 精度检验时间
     */
    @ApiModelProperty(value = "精度检验时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date precisionCheckTime;

    /**
     * 保养上传图片
     */

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java

@@ -3,6 +3,8 @@
import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @Description: 设备精度检测明细
 * @Author: jeecg-boot
@@ -11,4 +13,18 @@
 */
public interface IEamPrecisionCheckDetailService extends IService<EamPrecisionCheckDetail> {

    /**
     * 根据工单ID 查询 精度信息
     * @param orderId
     * @return
     */
    List<EamPrecisionCheckDetail> getByOrderId(String orderId);

    /**
     * 校验是否存在精度检验
     * @param orderId
     * @return
     */
    boolean hasPrecisionCheckDetail(String orderId);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java

@@ -1,11 +1,15 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import org.jeecg.modules.eam.mapper.EamPrecisionCheckDetailMapper;
import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;

/**
 * @Description: 设备精度检测明细
@@ -16,4 +20,18 @@
@Service
public class EamPrecisionCheckDetailServiceImpl extends ServiceImpl<EamPrecisionCheckDetailMapper, EamPrecisionCheckDetail> implements IEamPrecisionCheckDetailService {

    @Resource
    private EamPrecisionCheckDetailMapper eamPrecisionCheckDetailMapper;

    @Override
    public List<EamPrecisionCheckDetail> getByOrderId(String orderId) {
        return Collections.emptyList();
    }

    @Override
    public boolean hasPrecisionCheckDetail(String orderId) {
        LambdaQueryWrapper<EamPrecisionCheckDetail> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(EamPrecisionCheckDetail::getOrderId, orderId);
        return eamPrecisionCheckDetailMapper.selectCount(wrapper) > 0;
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java

@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,12 +10,15 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.SecondMaintenanceStatusEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
@@ -23,7 +28,9 @@
import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
@@ -33,10 +40,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -45,8 +49,8 @@
 * @Date: 2025-04-29
 * @Version: V1.0
 */
@Service
public class EamThirdMaintenanceOrderServiceImpl extends ServiceImpl<EamThirdMaintenanceOrderMapper, EamThirdMaintenanceOrder> implements IEamThirdMaintenanceOrderService {
@Service("IEamThirdMaintenanceOrderService")
public class EamThirdMaintenanceOrderServiceImpl extends ServiceImpl<EamThirdMaintenanceOrderMapper, EamThirdMaintenanceOrder> implements IEamThirdMaintenanceOrderService, FlowCallBackServiceI {
    @Resource
    private EamThirdMaintenanceOrderMapper eamThirdMaintenanceOrderMapper;
    @Autowired
@@ -70,6 +74,8 @@
    private IEamReportRepairService eamReportRepairService;
    @Autowired
    private IEamEquipmentExtendService eamEquipmentExtendService;
    @Autowired
    private IEamPrecisionCheckDetailService precisionCheckDetailService;

    @Override
    public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
@@ -150,6 +156,8 @@
            });
            thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
        }
        //处理精度参数 TODO

        //判断是否存在保养人 如果存在则启动流程
        if (StringUtils.isNotBlank(order.getOperator())) {
            //启动流程 TODO
@@ -281,28 +289,72 @@
        entity.setActualStartTime(new Date());
        eamThirdMaintenanceOrderMapper.updateById(entity);

//        //启动流程
//        flowCommonService.initActBusiness("工单号:" + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";进行设备周保",
//                entity.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
//        Map<String, Object> variables = new HashMap<>();
//        variables.put("dataId", entity.getId());
//        if (StrUtil.isEmpty(entity.getRemark())) {
//            variables.put("organization", "新增周保工单默认启动流程");
//            variables.put("comment", "新增周保工单默认启动流程");
//        } else {
//            variables.put("organization", entity.getRemark());
//            variables.put("comment", entity.getRemark());
//        }
//        variables.put("proofreading", true);
//        List<String> usernames = new ArrayList<>();
//        usernames.add(entity.getOperator());
//        variables.put("NextAssignee", usernames);
//        Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
//        if (result != null) {
//            //更新设备保养状态
//            eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
//            return result.isSuccess();
//        }
        //启动流程
        flowCommonService.initActBusiness("工单号:" + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";进行设备三保",
                entity.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
        Map<String, Object> variables = new HashMap<>();
        boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
        variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
        variables.put("dataId", entity.getId());
        if (StrUtil.isEmpty(entity.getRemark())) {
            variables.put("organization", "新增三保工单默认启动流程");
            variables.put("comment", "新增三保工单默认启动流程");
        } else {
            variables.put("organization", entity.getRemark());
            variables.put("comment", entity.getRemark());
        }
        variables.put("proofreading", true);
        List<String> usernames = new ArrayList<>();
        usernames.add(entity.getOperator());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
        if (result != null) {
            //更新设备保养状态
            eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
            return result.isSuccess();
        }
        return true;
    }

    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
        List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
        return todoUsers != null && todoUsers.contains(user.getUsername());
    }

    private boolean claimTask(String taskId, LoginUser user) {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (task == null) {
            return false;
        }
        if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
            return false;
        }
        taskService.claim(taskId, user.getUsername());
        return true;
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程，业务干预，流程干预，指定人员进行处理
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}