修改点检结果为异常，异常是否报修为否的情况下生成故障数据的逻辑；设备附件列表新增描述信息丢失

hyingbo

2 天以前 876e8a1c9e6e950d51e42f265ad3027869d4f908

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

@@ -2,6 +2,7 @@

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.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,15 +11,17 @@
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.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
@@ -121,7 +124,6 @@
        } else {
            queryWrapper.orderByDesc("wmo.create_time");
        }

        return equipmentSealUpMapper.queryPageList(page, queryWrapper);
    }

@@ -134,11 +136,11 @@
            throw new JeecgBootException("设备不存在！");
        }
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许借出！");
            throw new JeecgBootException("此设备当前资产状态不允许封存！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法添加借用记录！");
            throw new JeecgBootException("当前用户无法添加封存记录！");
        }
        request.setReportUser(sysUser.getUsername());
        return equipmentSealUpMapper.insert(request) > 0;
@@ -159,9 +161,12 @@
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许封存！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑借用记录！");
            throw new JeecgBootException("当前用户无法编辑封存记录！");
        }
        UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("equipment_id", request.getEquipmentId());
@@ -174,12 +179,57 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean unseal(String id) {
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的数据不存在，请刷新重试！");
        }
        if (!EquipmentSealUpStatusEnum.SEALED.name().equals(entity.getSealStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑封存记录！");
        }
        //启动审批流程
        flowCommonService.initActBusiness("工单号:" + entity.getCode() + ";设备编号: " + equipment.getEquipmentCode() + ";进行设备启封",
                entity.getId(), "IEamEquipmentSealUpService", "equipment_unseal", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        variables.put("organization", "新增启封默认启动流程");
        variables.put("comment", "新增启封默认启动流程");
        variables.put("proofreading", true);
        // 分配给设备管理员
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给设备管理员，无法进入下级审批！");
        }
        List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_unseal", variables);
        if (result != null) {
            entity.setSealEndTime(new Date());
            entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_UNSEALING_AUDIT.name());
            //保存工单
            equipmentSealUpMapper.updateById(entity);
            return result.isSuccess();
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(String id) {
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的数据不存在，请刷新重试！");
        }
        if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) {
        if (!EquipmentSealUpStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
@@ -233,8 +283,130 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SEAL_UP, businessTable = "eam_equipment_seal_up")
    public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
        return null;
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("审批的数据已删除，请刷新重试！");
        }
        // 获取当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("未获取到登录用户，请重新登录后再试！");
        }
        request.setApprovalUser(user.getUsername());
        // 获取流程业务记录
        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
        if (flowMyBusiness == null) {
            throw new JeecgBootException("流程实例不存在，请刷新后重试！");
        }

        boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
        if (!userAuthorized) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // 认领任务
        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }

        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }

        EquipmentSealUpStatusEnum status = EquipmentSealUpStatusEnum.getInstance(entity.getSealStatus());
        if (status == null) {
            return null;
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        switch (status) {
            // 审批
            case WAIT_CHECK:
                //执行完成
                values.put("dataId", entity.getId());
                values.put("organization", request.getApprovalComment());
                values.put("comment", request.getApprovalComment());
                values.put("approvalDealType", request.getApprovalDealType());
                request.setComment(request.getApprovalComment());
                entity.setApprovalUser(user.getUsername());// 审核人
                entity.setApprovalComment(request.getApprovalComment());// 审核意见
                entity.setApprovalTime(new Date());// 审核时间
                entity.setApprovalDealType(request.getApprovalDealType()); // 审批类型
                // 验证通过还是驳回
                if (request.getApprovalDealType().equals("1")) {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.SEALED.name());
                    List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
                    values.put("NextAssignee", userApprovalList);
                } else {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
                    // 修改设备状态
                    equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                    eamEquipmentService.updateById(equipment);
                }
                break;
            // 已封存
            case WAIT_UNSEALING_AUDIT:
                values.put("dataId", entity.getId());
                values.put("organization", request.getUnsealApprovalComment());
                values.put("comment", request.getUnsealApprovalComment());
                request.setComment(request.getUnsealApprovalComment());
                // 验证通过还是驳回
                if (request.getUnsealApprovalDealType().equals("1")) {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
                    // 修改设备状态
                    equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                } else {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.SEALED.name());
                    entity.setSealEndTime(null);
                }
                entity.setUnsealApprovalUser(user.getUsername());
                entity.setUnsealApprovalComment(request.getUnsealApprovalComment());
                entity.setUnsealApprovalTime(new Date());
                // 修改设备状态
                equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                eamEquipmentService.updateById(equipment);
                break;
        }
        request.setValues(values);

        // 完成流程任务
        Result result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        //保存工单
        equipmentSealUpMapper.updateById(entity);
        return entity;
    }

    /**
     * 判断用户是否拥有此权限
     *
     * @param flowMyBusiness
     * @param user
     * @return
     */
    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