From f82d898daaa78dbf5884c6e0624967358204ced3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 四月 2025 15:13:55 +0800
Subject: [PATCH] 修改点检与系统参数
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 456 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 452 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 925a9f5..3642513 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -1,10 +1,41 @@
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.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.constant.InspectionStatus;
+import org.jeecg.modules.eam.constant.ReportRepairEnum;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
+import org.jeecg.modules.eam.service.*;
+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.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.entity.SysUser;
+import org.jeecg.modules.system.service.IMdcUserProductionService;
+import org.springframework.beans.BeanUtils;
+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.*;
+import java.util.stream.Collectors;
/**
* @Description: 鐐规宸ュ崟
@@ -12,7 +43,424 @@
* @Date: 2025-04-02
* @Version: V1.0
*/
-@Service
-public class EamInspectionOrderServiceImpl extends ServiceImpl<EamInspectionOrderMapper, EamInspectionOrder> implements IEamInspectionOrderService {
+@Service("IEamInspectionOrderService")
+public class EamInspectionOrderServiceImpl extends ServiceImpl<EamInspectionOrderMapper, EamInspectionOrder> implements IEamInspectionOrderService, FlowCallBackServiceI {
+ @Autowired
+ private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
+ @Resource
+ private FlowCommonService flowCommonService;
+ @Resource
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private FlowMyBusinessServiceImpl flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IEamEquipmentService iEamEquipmentService;
+ @Autowired
+ private IMdcUserProductionService mdcUserProductionService;
+ @Autowired
+ private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentFaultReasonService eamEquipmentFaultReasonService;
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
+ BeanUtils.copyProperties(eamInspectionOrderRequest,eamInspectionOrder);
+ //淇敼鐘舵��
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.IN_PROGRESS.getCode());
+ }else {
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.INIT.getCode());
+ }
+ save(eamInspectionOrder);
+ //澶勭悊鏄庣粏鏁版嵁
+ if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+ eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setOrderId(eamInspectionOrder.getId());
+ tableDetail.setId(null);
+ });
+ eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
+ }
+ //澶勭悊闄勪欢
+ if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
+ FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResult);
+ eamInspectionOrder.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ triggerProcess(eamInspectionOrder);
+ }
+ return true;
+ }
+
+ /**
+ * 瑙﹀彂娴佺▼
+ * @param eamInspectionOrder
+ * @return
+ */
+ public boolean triggerProcess(EamInspectionOrder eamInspectionOrder) {
+ EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
+ if (equipment == null) {
+ return false;
+ }else {
+ eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
+ }
+ System.out.println("璁惧鐐规锛�" + eamInspectionOrder.getId());
+ flowCommonService.initActBusiness("宸ュ崟鍙凤細"+eamInspectionOrder.getOrderNum()+"璁惧缂栧彿"+eamInspectionOrder.getEquipmentCode()+"杩涜璁惧鐐规",
+ eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", eamInspectionOrder.getId());
+ if (StrUtil.isEmpty(eamInspectionOrder.getRemark())){
+ variables.put("organization", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
+ variables.put("comment", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
+ }else {
+ variables.put("organization", eamInspectionOrder.getRemark());
+ variables.put("comment", eamInspectionOrder.getRemark());
+ }
+ variables.put("proofreading",true);
+ List<String> usernames=new ArrayList<>();
+ usernames.add(eamInspectionOrder.getOperator());
+ variables.put("NextAssignee", usernames);
+ Result result= flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
+ return result.isSuccess();
+ }
+
+
+ @Override
+ public boolean editInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
+ BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
+ if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())){
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.IN_PROGRESS.getCode());
+ }
+ updateById(eamInspectionOrder);
+ //澶勭悊鏄庣粏鏁版嵁
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+ eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setOrderId(eamInspectionOrder.getId());
+ tableDetail.setCreateTime(new Date());
+ });
+ //鍒犻櫎鏄庣粏
+ eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
+ eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
+ }
+ return true;
+ }
+
+ /**
+ * 棰嗗彇鐐规宸ュ崟
+ * @param id
+ * @return
+ */
+ @Override
+ public boolean takeInspectionOrder(String id){
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ EamInspectionOrder eamInspectionOrder=this.getById(id);
+ if (eamInspectionOrder==null) {
+ return false;
+ }else {
+ eamInspectionOrder.setOperator(user.getUsername());
+ //淇敼鐘舵��
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.IN_PROGRESS.getCode());
+ this.triggerProcess(eamInspectionOrder);
+ this.updateById(eamInspectionOrder);
+ return true;
+ }
+ }
+
+ /**
+ * 浣滃簾鐐规宸ュ崟
+ * @param id
+ * @return
+ */
+ @Override
+ public boolean cancelInspectionOrder(String id){
+ EamInspectionOrder eamInspectionOrder = this.getById(id);
+ if (eamInspectionOrder == null) {
+ return false;
+ }else {
+ eamInspectionOrder.setInspectionStatus("5");
+ return updateById(eamInspectionOrder);
+ }
+ }
+
+ /**
+ * 鐐规娴佺▼
+ * @param eamInspectionOrderRequest
+ * @return
+ */
+ @Override
+ public Result<?> inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ try {
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (!isValidRequest(eamInspectionOrderRequest)) {
+ return Result.error("闈炴硶鍙傛暟");
+ }
+
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = getCurrentUser();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ return Result.error("璐﹀彿涓嶅瓨鍦�");
+ }
+ eamInspectionOrderRequest.setAssignee(user.getUsername());
+
+ // 鑾峰彇鐐规宸ュ崟淇℃伅
+ EamInspectionOrder eamInspectionOrder = getEamInspectionOrder(eamInspectionOrderRequest.getDataId());
+ if (eamInspectionOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = getFlowMyBusiness(eamInspectionOrderRequest.getInstanceId());
+ if (flowMyBusiness == null) {
+ return Result.error("娴佺▼璁板綍涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ョ敤鎴锋槸鍚︽湁鏉冮檺鎿嶄綔浠诲姟
+ if (!isUserAuthorized(flowMyBusiness, user)) {
+ return Result.error("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
+ }
+
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ return Result.error("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
+ }
+
+ // 璁剧疆娴佺▼鍙橀噺
+ setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(eamInspectionOrderRequest);
+
+ // 鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊宸ュ崟鐘舵��
+ updateOrderStatus(result, eamInspectionOrderRequest, eamInspectionOrder, user);
+
+ // 鏇存柊宸ュ崟淇℃伅
+ updateEamInspectionOrder(eamInspectionOrder);
+
+ //鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
+ if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.CONFIRMED.getCode())){
+ updateEamInspectionOrderDetail(eamInspectionOrder);
+ }
+
+ return Result.OK("鎿嶄綔鎴愬姛");
+ } catch (Exception e) {
+ return Result.error("鎿嶄綔澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ private boolean isValidRequest(EamInspectionOrderRequest request) {
+ return StrUtil.isNotBlank(request.getTaskId()) && StrUtil.isNotBlank(request.getDataId());
+ }
+
+ private LoginUser getCurrentUser() {
+ try {
+ return (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private EamInspectionOrder getEamInspectionOrder(String dataId) {
+ return this.getById(dataId);
+ }
+
+ private FlowMyBusiness getFlowMyBusiness(String instanceId) {
+ List<FlowMyBusiness> businessList = flowMyBusinessService.list(
+ new QueryWrapper<FlowMyBusiness>().eq("process_instance_id", instanceId));
+ return businessList.isEmpty() ? null : businessList.get(0);
+ }
+
+ 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;
+ }
+
+ private void setupProcessVariables(EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
+ Map<String, Object> values = new HashMap<>();
+ if (InspectionStatus.IN_PROGRESS.getCode().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) {
+ // 鐐规浜虹偣妫�缁撴潫
+ String orgId = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId()))
+ .map(equipment -> equipment.getOrgId())
+ .orElse(null);
+ if (orgId == null) {
+ throw new IllegalArgumentException("鏈壘鍒拌澶囩殑缁勭粐 ID");
+ }
+ List<SysUser> sysUserList = mdcUserProductionService.queryByPostAndProId("PCR0003", orgId);
+ List<String> usernameList = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
+ if (usernameList.isEmpty()) {
+ throw new IllegalArgumentException("鏈壘鍒拌璁惧瀵瑰簲杞﹂棿鐨勭彮缁勯暱锛岃鑱旂郴绠＄悊鍛樺鐞�");
+ }
+ values.put("dataId", order.getId());
+ values.put("organization", "鐐规浜虹偣妫�缁撴潫");
+ values.put("comment", "鐐规浜虹偣妫�缁撴潫");
+ values.put("NextAssignee", usernameList);
+ request.setComment("鐐规浜虹偣妫�缁撴潫");
+ } else {
+ // 鐝粍闀跨‘璁�
+ values.put("dataId", order.getId());
+ values.put("organization", request.getDealSuggestion());
+ values.put("comment", request.getDealSuggestion());
+ values.put("confirmation", request.getDealType());
+ request.setComment(request.getDealSuggestion());
+ if ("2".equals(request.getDealType())) {
+ // 鐝粍闀块┏鍥�
+ List<String> usernames = new ArrayList<>();
+ usernames.add(order.getOperator());
+ order.setInspectionStatus("2");
+ values.put("NextAssignee", usernames);
+ }
+ }
+ request.setValues(values);
+ }
+
+ private void updateOrderStatus(Result result, EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
+ if (result.isSuccess()) {
+ if (InspectionStatus.IN_PROGRESS.getCode().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
+ // 鐐规瀹屾垚
+ order.setInspectionStatus("3");
+ order.setOperateTime(new Date());
+ eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
+ eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
+ } else if (InspectionStatus.COMPLETED.getCode().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getDealType())) {
+ // 鐝粍闀跨‘璁や换鍔�
+ order.setInspectionStatus("4");
+ order.setConfirmUser(user.getUsername());
+ order.setConfirmTime(new Date());
+ }
+ }
+ }
+
+ private void updateEamInspectionOrder(EamInspectionOrder eamInspectionOrder) {
+ this.updateById(eamInspectionOrder);
+ }
+
+ /**
+ * 璁惧鏄惁瀛樺湪寮傚父,骞惰繘琛岃澶囩淮淇�
+ * @param eamInspectionOrder
+ */
+ private void updateEamInspectionOrderDetail(EamInspectionOrder eamInspectionOrder) {
+ EamEquipmentFaultReason eamEquipmentFaultReason=eamEquipmentFaultReasonService.
+ getOne(new QueryWrapper<EamEquipmentFaultReason>().eq("fault_code","EFR20250003"));
+ List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
+ .list(new QueryWrapper<EamInspectionOrderDetail>()
+ .eq("order_id", eamInspectionOrder.getId()).eq("report_flag","1"));
+ List<EamReportRepair> eamReportRepairs = new ArrayList<>();
+ if (!eamInspectionOrderDetails.isEmpty()) {
+ eamInspectionOrderDetails.forEach(item->{
+ EamReportRepair eamReportRepair=new EamReportRepair();
+ eamReportRepair.setEquipmentId(eamInspectionOrder.getEquipmentId());
+ eamReportRepair.setFaultName(eamEquipmentFaultReason.getFaultName());
+ eamReportRepair.setFaultType(eamEquipmentFaultReason.getFaultCategory());
+ eamReportRepair.setFaultDescription(eamEquipmentFaultReason.getFaultDescription());
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
+ eamReportRepair.setBreakdownFlag("1");
+ eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamReportRepair.setFaultStartTime(new Date());
+ eamReportRepair.setRemark(item.getExceptionDescription());
+ eamReportRepairs.add(eamReportRepair);
+ });
+ }
+ if (!eamReportRepairs.isEmpty()) {
+ eamReportRepairService.saveBatch(eamReportRepairs);
+ }
+ }
+
+ /**
+ * 鎵归噺浣滃簾涓庨鍙�
+ * @param ids
+ * @param type
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result<?> batchCancelOrTakeInspectionOrder(String ids, String type){
+ if (type == null) {
+ return Result.error("璇烽�夋嫨鎿嶄綔绫诲瀷");
+ }
+ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List<String> list = Arrays.asList(ids.split(","));
+ QueryWrapper<EamInspectionOrder> queryWrapper =new QueryWrapper<>();
+ queryWrapper.in("id", list);
+ queryWrapper.eq("inspection_status", "1");
+ List<EamInspectionOrder> eamInspectionOrderList =this.list(queryWrapper);
+ if (!eamInspectionOrderList.isEmpty()){
+ eamInspectionOrderList.forEach(eamInspectionOrder -> {
+ eamInspectionOrder.setInspectionStatus(type);
+ if (type.equals("2")){
+ eamInspectionOrder.setOperator(loginUser.getUsername());
+ this.triggerProcess(eamInspectionOrder);
+ }else {
+ eamInspectionOrder.setOperator(null);
+ }
+ });
+ this.updateBatchById(eamInspectionOrderList);
+ }
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
+
+
+ @Override
+ public Result<?> selectVoById(String id){
+ List<EamInspectionOrder> eamInspectionOrders=this.list(new QueryWrapper<EamInspectionOrder>().eq("id", id));
+ List<EamInspectionOrderRequest> eamInspectionOrderRequestList=new ArrayList<>();
+ eamInspectionOrders.forEach(eamInspectionOrder -> {
+ EamInspectionOrderRequest eamInspectionOrderRequest=new EamInspectionOrderRequest();
+ BeanUtils.copyProperties(eamInspectionOrder,eamInspectionOrderRequest);
+ List<EamInspectionOrderDetail> eamInspectionOrderDetails=eamInspectionOrderDetailService
+ .list(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
+ eamInspectionOrderRequest.setTableDetailList(eamInspectionOrderDetails);
+ eamInspectionOrderRequestList.add(eamInspectionOrderRequest);
+ });
+ return Result.ok(eamInspectionOrderRequestList);
+ }
+
+ @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;
+ }
}
--
Gitblit v1.9.3