From 58020f3d711d4baa16ef092c2ea826071c7d23b9 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 16 七月 2025 18:26:35 +0800
Subject: [PATCH] 消息推送定时任务逻辑调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 390 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 332 insertions(+), 58 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 9409834..c962434 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
@@ -3,6 +3,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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,47 +12,63 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
+import org.flowable.engine.impl.el.DateUtil;
import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.flowable.variable.api.persistence.entity.VariableInstance;
import org.jeecg.common.api.vo.FileUploadResult;
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.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
-import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.vo.EquipmentInspectionStatistics;
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.domain.vo.FlowTaskVo;
+import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.qywx.message.vo.TemplateCard;
+import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.IMdcUserProductionService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.IThirdAppService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 鐐规宸ュ崟
* @Author: jeecg-boot
- * @Date: 2025-04-02
+ * @Date: 2025-04-02
* @Version: V1.0
*/
@Service("IEamInspectionOrderService")
@@ -79,6 +96,19 @@
private IMdcUserProductionService mdcUserProductionService;
@Autowired
private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
+ @Autowired
+ private IMdcProductionService mdcProductionService;
+ @Autowired
+ private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private HistoryService historyService;
+
+ @Value("${wechatEnterprise.cardActionUrl}")
+ private String cardActionUrl;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -132,19 +162,57 @@
}
@Override
+ public List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate) {
+ LambdaQueryWrapper<EamInspectionOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.lt(EamInspectionOrder::getInspectionDate, expiredDate);
+ List<String> unCompleteStatus = new ArrayList<>();
+ unCompleteStatus.add(InspectionStatus.WAIT_INSPECTION.name());
+ unCompleteStatus.add(InspectionStatus.UNDER_INSPECTION.name());
+ queryWrapper.in(EamInspectionOrder::getInspectionStatus, unCompleteStatus);
+ queryWrapper.orderByAsc(EamInspectionOrder::getInspectionDate);
+ return eamInspectionOrderMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<EquipmentInspectionStatistics> equipmentInspectionStatistics(String productionId, LocalDate firstOfMonth, LocalDate today) {
+ if (StringUtils.isNotBlank(productionId)) {
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(productionId);
+ if (CollectionUtil.isEmpty(productIds)) {
+ return Collections.emptyList();
+ }
+ List<EquipmentInspectionStatistics> list = this.baseMapper.equipmentInspectionStatistics(productIds, firstOfMonth.toString(), today.plusDays(1).toString());
+ if (CollectionUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ return list;
+ }
+ List<EquipmentInspectionStatistics> list = this.baseMapper.equipmentInspectionStatistics(null, firstOfMonth.toString(), today.plusDays(1).toString());
+ if (CollectionUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ return list;
+ }
+
+ @Override
+ public List<EamInspectionOrder> selectUnReceivedInspectionOrder() {
+ return this.baseMapper.selectUnReceivedInspectionOrder();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
- BeanUtils.copyProperties(eamInspectionOrderRequest,eamInspectionOrder);
+ BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
//淇敼鐘舵��
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
- }else {
+ } else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
}
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
- if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
tableDetail.setOrderId(eamInspectionOrder.getId());
tableDetail.setId(null);
@@ -152,7 +220,7 @@
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
}
//澶勭悊闄勪欢
- if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
ObjectMapper mapper = new ObjectMapper();
try {
@@ -162,14 +230,179 @@
log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
}
}
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamInspectionOrder, null);
}
+
return true;
+ }
+
+ private void sendQywxTemplateCardMessage(EamInspectionOrder eamInspectionOrder, EamInspectionOrderRequest request) {
+ TemplateCard templateCard = new TemplateCard();
+ String inspectionStatus = eamInspectionOrder.getInspectionStatus();
+ EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
+ eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
+ //todo 鐩墠纭锛屽緟棰嗗彇宸ュ崟涓嶆帹閫�
+ //if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ // //宸ュ崟寰呴鍙栵紝鎺ㄩ�佹秷鎭粰鎵�鏈夋搷浣滃伐
+ // String orgId = Optional.ofNullable(eamEquipmentService.getById(eamInspectionOrder.getEquipmentId()))
+ // .map(EamEquipment::getOrgId)
+ // .orElse(null);
+ // if (orgId == null) {
+ // throw new IllegalArgumentException("鏈壘鍒拌澶囩殑缁勭粐 ID");
+ // }
+ // //鏌ヨ璇ヨ澶囨墍灞炰骇绾跨殑鎵�鏈夋搷浣滃伐
+ // List<SysUser> sysUserList = mdcUserProductionService.queryByPostAndProId("PCR0001", orgId);
+ // List<String> usernameList = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
+ // if (usernameList.isEmpty()) {
+ // throw new IllegalArgumentException("鏈壘鍒拌璁惧鎵�灞炰骇绾跨殑鎿嶄綔宸ワ紝璇疯仈绯荤鐞嗗憳澶勭悊");
+ // }
+ // String nextAssigneeStr = usernameList.stream()
+ // .filter(Objects::nonNull) // 鍙�夛細杩囨护 null 鍊�
+ // .collect(Collectors.joining(","));
+ // String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
+ // templateCard.setTouser(touser);
+ //}
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
+ //宸ュ崟宸插紑濮嬬偣妫�锛屾帹閫佹秷鎭粰鍏蜂綋鎿嶄綔宸ワ紙鏂板宸ュ崟鏃舵寚瀹氥�侀鍙栧伐鍗曠殑鎿嶄綔宸ワ級
+ String operator = eamInspectionOrder.getOperator();
+ if (StrUtil.isNotBlank(operator)) {
+ //鏂板宸ュ崟鏃躲�佸伐鍗曢鍙栨椂宸叉寚瀹氱偣妫�浜�
+ String touser = wechatEnterpriseService.getTouser(operator, false);
+ templateCard.setTouser(touser);
+ }
+ }
+ if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
+ //宸ュ崟宸茬偣妫�瀹屾垚锛屾帹閫佹秷鎭粰鐝粍闀跨‘璁�
+ List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
+ String nextAssigneeStr = nextAssignee.stream()
+ .filter(Objects::nonNull) // 鍙�夛細杩囨护 null 鍊�
+ .collect(Collectors.joining(","));
+ String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
+ templateCard.setTouser(touser);
+ }
+ //todo 宸ュ崟瀹屾垚锛屼笉鎺ㄩ�佹秷鎭�
+ //if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
+ // //宸ュ崟宸茬‘璁ゅ畬鎴愶紝鎺ㄩ�佹秷鎭粰鐐规浜�
+ // String touser = wechatEnterpriseService.getTouser(eamInspectionOrder.getOperator(), false);
+ // templateCard.setTouser(touser);
+ //}
+
+ TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+ templateCard.setTemplate_card(templateCardEntity);
+ templateCardEntity.setTask_id(eamInspectionOrder.getId());
+ TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+ mainTitle.setTitle("璁惧鐐规");
+ templateCardEntity.setMain_title(mainTitle);
+
+ //if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ // templateCardEntity.setSub_title_text("鏂板璁惧鐐规宸ュ崟: " + eamInspectionOrder.getOrderNum() + " ,璇疯繘鍏ョ郴缁熼鍙�");
+ //}
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
+ if (Objects.nonNull(request) && StrUtil.isNotBlank(request.getConfirmDealType())) {
+ //鏄┏鍥炵殑鍗曞瓙
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 琚┏鍥烇紝璇烽噸鏂拌繘琛岃澶囩偣妫�");
+ } else {
+ templateCardEntity.setSub_title_text("宸查鍙栧伐鍗�: " + eamInspectionOrder.getOrderNum() + "锛屽紑濮嬭繘琛岃澶囩偣妫�");
+ }
+ }
+ if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸插畬鎴愯澶囩偣妫�,璇疯繘鍏ョ郴缁熺‘璁�");
+ }
+ //if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
+ // templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸插畬鎴愮偣妫�鍚庣‘璁�");
+ //}
+
+ List<TemplateCardEntity.HorizontalContent> horizontalContentList = CollectionUtil.newArrayList();
+ TemplateCardEntity.HorizontalContent content1 = new TemplateCardEntity.HorizontalContent();
+ content1.setKeyname("宸ュ崟鍙�");
+ content1.setValue(eamInspectionOrder.getOrderNum());
+ horizontalContentList.add(content1);
+ TemplateCardEntity.HorizontalContent content2 = new TemplateCardEntity.HorizontalContent();
+ content2.setKeyname("璁惧缂栧彿");
+ content2.setValue(eamInspectionOrder.getEquipmentCode());
+ horizontalContentList.add(content2);
+
+ //濡傛灉宸ュ崟鐘舵�佷负寰呯偣妫�锛堟病鎸囧畾鐐规浜虹殑鏈鍙栫姸鎬侊級锛屾祦绋嬫槸娌℃湁鍚姩鐨勶紝鏃犳硶鑾峰彇鑺傜偣淇℃伅
+ if (!InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ WorkTaskDataVo previousFlowInfo = flowTaskService.getPreviousFlowInfo(eamInspectionOrder.getId());
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ content3.setKeyname("鍓嶉┍鑺傜偣");
+ content3.setValue(previousFlowInfo.getPreNode());
+ horizontalContentList.add(content3);
+ TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ content4.setKeyname("褰撳墠鑺傜偣");
+ if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
+ content4.setValue("宸插畬鎴�");
+ } else {
+ content4.setValue(previousFlowInfo.getName());
+ }
+ horizontalContentList.add(content4);
+ }
+
+ //if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
+ // TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ // content3.setKeyname("鍙戣捣浜�");
+ // SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getCreateBy());
+ // content3.setValue(sysUser.getRealname());
+ // horizontalContentList.add(content3);
+ //}
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
+ if (Objects.isNull(request)) {
+ TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
+ content.setKeyname("棰嗗彇浜�");
+ SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getOperator());
+ content.setValue(sysUser.getRealname());
+ horizontalContentList.add(content);
+ } else {
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ content3.setKeyname("纭浜�");
+ String confirmAssignee = request.getAssignee();
+ SysUser confirmUser = sysUserService.getUserByName(confirmAssignee);
+ content3.setValue(confirmUser.getRealname());
+ horizontalContentList.add(content3);
+ content4.setKeyname("纭鎰忚");
+ content4.setValue("椹冲洖");
+ horizontalContentList.add(content4);
+ }
+ }
+ if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ content3.setKeyname("鐐规浜�");
+ SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getOperator());
+ content3.setValue(sysUser.getRealname());
+ horizontalContentList.add(content3);
+ }
+ //if ((InspectionStatus.COMPLETE.name().equals(inspectionStatus))) {
+ // TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ // TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ // content3.setKeyname("纭浜�");
+ // SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getCreateBy());
+ // content3.setValue(sysUser.getRealname());
+ // horizontalContentList.add(content3);
+ // content4.setKeyname("纭鎰忚");
+ // content4.setValue("閫氳繃");
+ // horizontalContentList.add(content4);
+ //}
+
+ templateCardEntity.setHorizontal_content_list(horizontalContentList);
+
+ TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+ cardAction.setType(1);
+ cardAction.setUrl(cardActionUrl);
+ templateCardEntity.setCard_action(cardAction);
+
+ wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
}
/**
* 瑙﹀彂娴佺▼
+ *
* @param eamInspectionOrder
* @return
*/
@@ -177,36 +410,40 @@
EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
if (equipment == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
}
System.out.println("璁惧鐐规锛�" + eamInspectionOrder.getId());
- flowCommonService.initActBusiness("宸ュ崟鍙凤細"+eamInspectionOrder.getOrderNum()+"璁惧缂栧彿"+eamInspectionOrder.getEquipmentCode()+"杩涜璁惧鐐规",
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + eamInspectionOrder.getEquipmentCode() + ";瀹夎浣嶇疆: " + equipment.getInstallationPosition(),
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
- if (StrUtil.isEmpty(eamInspectionOrder.getRemark())){
+ if (StrUtil.isEmpty(eamInspectionOrder.getRemark())) {
variables.put("organization", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
variables.put("comment", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
- }else {
+ } else {
variables.put("organization", eamInspectionOrder.getRemark());
variables.put("comment", eamInspectionOrder.getRemark());
}
- variables.put("proofreading",true);
- List<String> usernames=new ArrayList<>();
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
usernames.add(eamInspectionOrder.getOperator());
variables.put("NextAssignee", usernames);
- Result result= flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
+ Result result = flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
return result.isSuccess();
}
@Override
+ @Transactional(rollbackFor = {Exception.class})
public boolean editInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
- if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())){
+ if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
+ triggerProcess(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
}
super.updateById(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
@@ -224,36 +461,46 @@
/**
* 棰嗗彇鐐规宸ュ崟
+ *
* @param id
* @return
*/
@Override
- public boolean takeInspectionOrder(String id){
+ @Transactional(rollbackFor = Exception.class)
+ public boolean takeInspectionOrder(String id) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- EamInspectionOrder eamInspectionOrder=this.getById(id);
- if (eamInspectionOrder==null) {
+ if(user == null || !BusinessCodeConst.PCR0001.equals(user.getPost())) {
+ throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
+ }
+ EamInspectionOrder eamInspectionOrder = this.getById(id);
+ if (eamInspectionOrder == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setOperator(user.getUsername());
//淇敼鐘舵��
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
this.triggerProcess(eamInspectionOrder);
this.updateById(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamInspectionOrder, null);
return true;
}
}
/**
* 浣滃簾鐐规宸ュ崟
+ *
* @param id
* @return
*/
@Override
- public boolean cancelInspectionOrder(String id){
+ public boolean cancelInspectionOrder(String id) {
EamInspectionOrder eamInspectionOrder = this.getById(id);
if (eamInspectionOrder == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.ABOLISH.name());
return updateById(eamInspectionOrder);
}
@@ -261,44 +508,47 @@
/**
* 鐐规娴佺▼
+ *
* @param eamInspectionOrderRequest
* @return
*/
@Override
- public Result<?> inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.POINT_INSPECTION, businessTable = "eam_inspection_order")
+ public EamInspectionOrder inspectionProcess(EamInspectionOrderRequest eamInspectionOrderRequest) {
try {
// 妫�鏌ヨ姹傚弬鏁�
if (!isValidRequest(eamInspectionOrderRequest)) {
- return Result.error("闈炴硶鍙傛暟");
+ throw new JeecgBootException("闈炴硶鍙傛暟");
}
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
LoginUser user = getCurrentUser();
if (user == null || StrUtil.isBlank(user.getId())) {
- return Result.error("璐﹀彿涓嶅瓨鍦�");
+ throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
}
eamInspectionOrderRequest.setAssignee(user.getUsername());
// 鑾峰彇鐐规宸ュ崟淇℃伅
EamInspectionOrder eamInspectionOrder = getEamInspectionOrder(eamInspectionOrderRequest.getDataId());
if (eamInspectionOrder == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
+ throw new JeecgBootException("鏈壘鍒板搴旀暟鎹�");
}
// 鑾峰彇娴佺▼涓氬姟璁板綍
FlowMyBusiness flowMyBusiness = getFlowMyBusiness(eamInspectionOrderRequest.getInstanceId());
if (flowMyBusiness == null) {
- return Result.error("娴佺▼璁板綍涓嶅瓨鍦�");
+ throw new JeecgBootException("娴佺▼璁板綍涓嶅瓨鍦�");
}
// 妫�鏌ョ敤鎴锋槸鍚︽湁鏉冮檺鎿嶄綔浠诲姟
if (!isUserAuthorized(flowMyBusiness, user)) {
- return Result.error("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
}
// 璁ら浠诲姟
if (!claimTask(flowMyBusiness.getTaskId(), user)) {
- return Result.error("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
}
// 璁剧疆娴佺▼鍙橀噺
@@ -313,17 +563,21 @@
// 鏇存柊宸ュ崟淇℃伅
updateEamInspectionOrder(eamInspectionOrder);
+ //寰俊娑堟伅鎺ㄩ�侊紙宸ュ崟瀹屾垚涓嶆帹閫侊級
+ if (!InspectionStatus.COMPLETE.name().equals(eamInspectionOrder.getInspectionStatus())) {
+ sendQywxTemplateCardMessage(eamInspectionOrder, eamInspectionOrderRequest);
+ }
+
//鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
- if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())){
+ if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) {
updateEamInspectionOrderDetail(eamInspectionOrder);
}
- return Result.OK("鎿嶄綔鎴愬姛");
+ return eamInspectionOrder;
} catch (Exception e) {
- return Result.error("鎿嶄綔澶辫触锛�" + e.getMessage());
+ throw new JeecgBootException("鎿嶄綔澶辫触锛�" + e.getMessage());
}
}
-
private boolean isValidRequest(EamInspectionOrderRequest request) {
@@ -388,11 +642,11 @@
} 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())) {
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ values.put("confirmation", request.getConfirmDealType());
+ request.setComment(request.getConfirmComment());
+ if ("2".equals(request.getConfirmDealType())) {
// 鐝粍闀块┏鍥�
List<String> usernames = new ArrayList<>();
usernames.add(order.getOperator());
@@ -405,17 +659,33 @@
private void updateOrderStatus(Result result, EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
if (result.isSuccess()) {
- if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getConfirmDealType())) {
// 鐐规瀹屾垚
order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
order.setOperateTime(new Date());
+ if (CollectionUtil.isNotEmpty(request.getFileList())) {
+ List<FileUploadResult> fileUploadResultList = request.getFileList();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+ order.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
- } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getDealType())) {
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.INSPECTION_CONFIRM.name());
+ } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
// 鐝粍闀跨‘璁や换鍔�
order.setInspectionStatus(InspectionStatus.COMPLETE.name());
order.setConfirmUser(user.getUsername());
+ order.setConfirmComment(request.getConfirmComment());
+ order.setConfirmDealType(request.getConfirmDealType());
order.setConfirmTime(new Date());
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
}
}
}
@@ -426,40 +696,44 @@
/**
* 璁惧鏄惁瀛樺湪寮傚父,骞惰繘琛岃澶囩淮淇�
+ *
* @param eamInspectionOrder
*/
private void updateEamInspectionOrderDetail(EamInspectionOrder eamInspectionOrder) {
List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
.list(new QueryWrapper<EamInspectionOrderDetail>()
- .eq("order_id", eamInspectionOrder.getId()).eq("report_flag","1").eq("inspection_result", "2"));
+ .eq("order_id", eamInspectionOrder.getId()).eq("report_flag", "1").eq("inspection_result", "2"));
eamReportRepairService.reportRepairFromInspection(eamInspectionOrder.getEquipmentId(), eamInspectionOrder.getOperator(), eamInspectionOrderDetails);
}
/**
* 鎵归噺浣滃簾涓庨鍙�
+ *
* @param ids
* @param type
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result<?> batchCancelOrTakeInspectionOrder(String ids, String type){
+ 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<EamInspectionOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", list);
queryWrapper.eq("inspection_status", InspectionStatus.WAIT_INSPECTION.name());
- List<EamInspectionOrder> eamInspectionOrderList =this.list(queryWrapper);
- if (!eamInspectionOrderList.isEmpty()){
+ List<EamInspectionOrder> eamInspectionOrderList = this.list(queryWrapper);
+ if (!eamInspectionOrderList.isEmpty()) {
eamInspectionOrderList.forEach(eamInspectionOrder -> {
eamInspectionOrder.setInspectionStatus(type);
- if (InspectionStatus.UNDER_INSPECTION.name().equals(type)){
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(type)) {
eamInspectionOrder.setOperator(loginUser.getUsername());
this.triggerProcess(eamInspectionOrder);
- }else {
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
+ } else {
eamInspectionOrder.setOperator(null);
}
});
@@ -470,13 +744,13 @@
@Override
- public Result<?> selectVoById(String id){
- List<EamInspectionOrder> eamInspectionOrders=this.list(new QueryWrapper<EamInspectionOrder>().eq("id", id));
- List<EamInspectionOrderRequest> eamInspectionOrderRequestList=new ArrayList<>();
+ 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
+ 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);
@@ -505,7 +779,7 @@
public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
//涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
//鑾峰彇涓嬩竴姝ュ鐞嗕汉
- Object object=values.get("NextAssignee");
+ Object object = values.get("NextAssignee");
return (List<String>) object;
}
}
--
Gitblit v1.9.3