From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 222 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index c122711..5ee5fac 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -1,5 +1,7 @@
package org.jeecg.modules.eam.service.impl;
+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;
@@ -7,27 +9,38 @@
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.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.system.service.IMdcProductionService;
+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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
@@ -35,18 +48,30 @@
* @Date: 2025-05-13
* @Version: V1.0
*/
-@Service
-public class EamEquipmentLeanOutServiceImpl extends ServiceImpl<EamEquipmentLeanOutMapper, EamEquipmentLeanOut> implements IEamEquipmentLeanOutService {
+@Service("IEamEquipmentLeanOutService")
+public class EamEquipmentLeanOutServiceImpl extends ServiceImpl<EamEquipmentLeanOutMapper, EamEquipmentLeanOut> implements IEamEquipmentLeanOutService, FlowCallBackServiceI {
@Resource
private EamEquipmentLeanOutMapper equipmentLeanOutMapper;
@Autowired
private IEamEquipmentService eamEquipmentService;
@Autowired
- private IMdcProductionService mdcProductionService;
+ 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<EamEquipmentLeanOut> queryPageList(Page<EamEquipmentLeanOut> page, EamEquipmentLeanOutQuery query) {
QueryWrapper<EamEquipmentLeanOut> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
@@ -129,7 +154,7 @@
if (entity == null) {
throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if(!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
+ if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
}
//妫�鏌ヨ澶�
@@ -167,7 +192,7 @@
if (entity == null) {
throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if(!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
+ if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
}
//妫�鏌ヨ澶�
@@ -187,11 +212,198 @@
updateWrapper.eq("id", id);
updateWrapper.eq("lean_person", sysUser.getUsername());
boolean success = super.update(updateWrapper);
- if(success) {
+ if (success) {
equipment.setAssetStatus(AssetStatusEnum.LEAN_OUT.name());
eamEquipmentService.updateById(equipment);
}
- //鍚姩瀹℃壒娴佺▼ TODO
+ //鍚姩瀹℃壒娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧鍊熺敤",
+ entity.getId(), "IEamEquipmentLeanOutService", "equipment_lean_out", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ if (StrUtil.isEmpty(entity.getLeanReason())) {
+ variables.put("organization", "鏂板鍊熺敤宸ュ崟榛樿鍚姩娴佺▼");
+ variables.put("comment", "鏂板鍊熺敤宸ュ崟榛樿鍚姩娴佺▼");
+ } else {
+ variables.put("organization", entity.getLeanReason());
+ variables.put("comment", entity.getLeanReason());
+ }
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
+ usernames.add(equipment.getEquipmentManager());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
+ if (result != null) {
+ entity.setLeanStartTime(new Date());
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
+ return result.isSuccess();
+ }
return true;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.LEAN_OUT, businessTable = "eam_equipment_lean_out")
+ public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
+ EamEquipmentLeanOut entity = equipmentLeanOutMapper.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("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ switch (status) {
+ // 瀹℃壒
+ case WAIT_APPROVAL:
+ //鎵ц瀹屾垚
+ 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.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ eamEquipmentService.updateById(equipment);
+ }
+ break;
+ // 褰掕繕
+ case WAIT_RETURN:
+ if (StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+ userApprovalList.add(equipment.getEquipmentManager());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getReturnComment());
+ values.put("comment", request.getReturnComment());
+ values.put("NextAssignee", userApprovalList);
+ request.setComment(request.getReturnComment());
+ entity.setLeanEndTime(new Date()); //褰掕繕鏃堕棿
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setLeanEndTime(new Date());// 褰掕繕鏃堕棿
+ entity.setReturnComment(request.getReturnComment());// 褰掕繕澶囨敞
+ break;
+ // 褰掕繕纭
+ case WAIT_CONFIRM:
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ request.setComment(request.getConfirmComment());
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ entity.setConfirmUser(user.getUsername());
+ entity.setConfirmComment(request.getConfirmComment());
+ entity.setConfirmTime(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("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
+ return entity;
+ }
+
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ 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;
+ }
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ *
+ * @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());
+ }
+
+ @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;
+ }
}
--
Gitblit v1.9.3