From 876e8a1c9e6e950d51e42f265ad3027869d4f908 Mon Sep 17 00:00:00 2001 From: hyingbo <1363390067@qq.com> Date: 星期二, 22 七月 2025 18:26:06 +0800 Subject: [PATCH] 修改点检结果为异常,异常是否报修为否的情况下生成故障数据的逻辑;设备附件列表新增描述信息丢失 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 422 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 418 insertions(+), 4 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java index 978500f..94195b3 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java @@ -1,19 +1,433 @@ 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.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.EquipmentOperationTagEnum; +import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum; +import org.jeecg.modules.eam.entity.EamEquipment; import org.jeecg.modules.eam.entity.EamEquipmentSealUp; import org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper; +import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery; +import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest; import org.jeecg.modules.eam.service.IEamEquipmentSealUpService; +import org.jeecg.modules.eam.service.IEamEquipmentService; +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; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.UserSelector; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 璁惧灏佸瓨鍚皝 * @Author: jeecg-boot - * @Date: 2025-05-13 + * @Date: 2025-05-13 * @Version: V1.0 */ -@Service -public class EamEquipmentSealUpServiceImpl extends ServiceImpl<EamEquipmentSealUpMapper, EamEquipmentSealUp> implements IEamEquipmentSealUpService { +@Service("IEamEquipmentSealUpService") +public class EamEquipmentSealUpServiceImpl extends ServiceImpl<EamEquipmentSealUpMapper, EamEquipmentSealUp> implements IEamEquipmentSealUpService, FlowCallBackServiceI { + @Resource + private EamEquipmentSealUpMapper equipmentSealUpMapper; + @Autowired + private IEamEquipmentService eamEquipmentService; + @Autowired + private FlowCommonService flowCommonService; + @Autowired + private IFlowDefinitionService flowDefinitionService; + @Autowired + private IFlowMyBusinessService flowMyBusinessService; + @Autowired + private TaskService taskService; + @Autowired + private IFlowTaskService flowTaskService; + + @Autowired + private ISysUserService sysUserService; + + + @Override + public IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, EamEquipmentSealUpQuery query) { + QueryWrapper<EamEquipmentSealUp> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0); + //鐢ㄦ埛鏁版嵁鏉冮檺 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (sysUser == null) { + return page; + } + if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) { + //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧 + List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(",")); + queryWrapper.in("e.equipment_code", equipArr); + } else { + //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶� + queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId()); + } + //鎺у埗寰呮彁浜ょ姸鎬佺殑鏁版嵁鍙兘鏈汉鏌ョ湅 + queryWrapper.and(i -> i.ne("wmo.seal_status", EquipmentSealUpStatusEnum.WAIT_SUBMIT).or().eq("wmo.report_user", sysUser.getUsername())); + //鏌ヨ鏉′欢杩囨护 + if (query != null) { + if (StringUtils.isNotBlank(query.getEquipmentId())) { + queryWrapper.eq("wmo.equipment_id", query.getEquipmentId()); + } + if (StringUtils.isNotBlank(query.getCode())) { + queryWrapper.like("wmo.code", query.getCode()); + } + if (StringUtils.isNotBlank(query.getSealStatus())) { + queryWrapper.eq("wmo.seal_status", query.getSealStatus()); + } + if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) { + queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd()); + } + //鎺掑簭 + if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) { + String column = query.getColumn(); + if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) { + column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX)); + } + if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) { + queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column)); + } else { + queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column)); + } + } else { + queryWrapper.orderByDesc("wmo.create_time"); + } + } else { + queryWrapper.orderByDesc("wmo.create_time"); + } + return equipmentSealUpMapper.queryPageList(page, queryWrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean addSealUp(EamEquipmentSealUp request) { + //妫�鏌ヨ澶� + EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId()); + 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("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞灏佸瓨璁板綍锛�"); + } + request.setReportUser(sysUser.getUsername()); + return equipmentSealUpMapper.insert(request) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean editSealUp(EamEquipmentSealUp request) { + EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId()); + if (entity == null) { + throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒"); + } + if (!EquipmentSealUpStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) { + throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�"); + } + //妫�鏌ヨ澶� + EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId()); + 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("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫灏佸瓨璁板綍锛�"); + } + UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("equipment_id", request.getEquipmentId()); + updateWrapper.set("remark", request.getRemark()); + updateWrapper.set("seal_up_reason", request.getSealUpReason()); + updateWrapper.eq("id", request.getId()); + updateWrapper.eq("report_user", sysUser.getUsername()); + return super.update(updateWrapper); + } + + @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 (!EquipmentSealUpStatusEnum.WAIT_SUBMIT.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("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫灏佸瓨璁板綍锛�"); + } + UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("seal_status", EquipmentSealUpStatusEnum.WAIT_SUBMIT.name()); + updateWrapper.eq("id", id); + updateWrapper.eq("report_user", sysUser.getUsername()); + boolean success = super.update(updateWrapper); + if (success) { + equipment.setAssetStatus(AssetStatusEnum.SEAL_UP.name()); // 璁惧灏佸瓨 + eamEquipmentService.updateById(equipment); + } + //鍚姩瀹℃壒娴佺▼ + flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧灏佸瓨", + entity.getId(), "IEamEquipmentSealUpService", "equipment_seal_up", null); + Map<String, Object> variables = new HashMap<>(); + variables.put("dataId", entity.getId()); + if (StrUtil.isEmpty(entity.getSealUpReason())) { + variables.put("organization", "鏂板灏佸瓨榛樿鍚姩娴佺▼"); + variables.put("comment", "鏂板灏佸瓨宸ュ崟榛樿鍚姩娴佺▼"); + } else { + variables.put("organization", entity.getSealUpReason()); + variables.put("comment", entity.getSealUpReason()); + } + 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_seal_up", variables); + if (result != null) { + entity.setSealStartTime(new Date()); + entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_CHECK.name()); + //淇濆瓨宸ュ崟 + equipmentSealUpMapper.updateById(entity); + return result.isSuccess(); + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SEAL_UP, businessTable = "eam_equipment_seal_up") + public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) { + 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 + 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) { + return null; + } } -- Gitblit v1.9.3