From d583272ee68f3f80e11fddf17769eea773ff9053 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 四月 2025 17:41:03 +0800
Subject: [PATCH] 解决批量启动流程死锁问题，增加点检后异常保修
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 127 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 66f9c60..c8c4bcb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -2,12 +2,17 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
@@ -21,6 +26,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,6 +44,55 @@
@Autowired
private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
+
+ @Override
+ public IPage<EamMaintenanceStandard> queryPageList(Page<EamMaintenanceStandard> page, EamMaintenanceStandard eamMaintenanceStandard) {
+ LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandard::getDelFlag, 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(","));
+ StringBuilder sqlSb = new StringBuilder("select 1 from eam_equipment t where t.id = equipment_id and t.equipment_code in (");
+ equipArr.forEach(equipmentCode -> {
+ sqlSb.append("'").append(equipmentCode).append("',");
+ });
+ sqlSb.append(")");
+ String sql = sqlSb.toString().replaceAll(",\\)", ")");
+ queryWrapper.exists(sql);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from eam_equipment e where exists (select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id) and e.id = equipment_id", sysUser.getId());
+ }
+ if(eamMaintenanceStandard != null) {
+ //缂栫爜 妯＄硦鏌ヨ
+ if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardCode())) {
+ queryWrapper.like(EamMaintenanceStandard::getStandardCode, eamMaintenanceStandard.getStandardCode());
+ }
+ //鍚嶇О 妯＄硦鏌ヨ
+ if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardName())) {
+ queryWrapper.like(EamMaintenanceStandard::getStandardName, eamMaintenanceStandard.getStandardName());
+ }
+ //璁惧
+ if(StringUtils.isNotBlank(eamMaintenanceStandard.getEquipmentId())) {
+ queryWrapper.eq(EamMaintenanceStandard::getEquipmentId, eamMaintenanceStandard.getEquipmentId());
+ }
+ //淇濆吇鍒嗙被
+ if(StringUtils.isNotBlank(eamMaintenanceStandard.getMaintenanceCategory())) {
+ queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, eamMaintenanceStandard.getMaintenanceCategory());
+ }
+ //淇濆吇鍒嗙被
+ if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardStatus())) {
+ queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, eamMaintenanceStandard.getStandardStatus());
+ }
+ }
+ queryWrapper.orderByDesc(EamMaintenanceStandard::getCreateTime);
+ return eamMaintenanceStandardMapper.selectPage(page, queryWrapper);
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -134,6 +189,64 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean upgradeMaintenanceStandard(EamMaintenanceStandardRequest standardRequest) {
+ EamMaintenanceStandard entity = eamMaintenanceStandardMapper.selectById(standardRequest.getId());
+ if(entity == null){
+ throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ entity.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
+ //鍘熸潵鐨勪綔搴�
+ eamMaintenanceStandardMapper.updateById(entity);
+
+ //鏂板涓�涓増鏈�
+ EamMaintenanceStandard newEntity = new EamMaintenanceStandard();
+ newEntity.setStandardCode(standardRequest.getStandardCode());
+ newEntity.setStandardName(standardRequest.getStandardName());
+ newEntity.setMaintenanceCategory(standardRequest.getMaintenanceCategory());
+ newEntity.setMaintenancePeriod(standardRequest.getMaintenancePeriod());
+ newEntity.setInitialDate(standardRequest.getInitialDate());
+ newEntity.setFileCode(standardRequest.getFileCode());
+ newEntity.setStandardStatus(MaintenanceStandardStatusEnum.NORMAL.name());
+ //鐗堟湰閫掑
+ newEntity.setStandardVersion(entity.getStandardVersion() + 1);
+ //璁惧澶勭悊
+ newEntity.setEquipmentId(standardRequest.getEquipmentId());
+ //鍒犻櫎鏍囪
+ newEntity.setDelFlag(CommonConstant.DEL_FLAG_0);
+ //閲嶅鎬ф牎楠�
+ EamMaintenanceStandard exist = checkDuplicate(newEntity.getEquipmentId(), newEntity.getMaintenanceCategory());
+ if(exist != null){
+ throw new JeecgBootException("璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
+ //澶勭悊闄勪欢
+ if(CollectionUtil.isNotEmpty(standardRequest.getFileList())) {
+ FileUploadResult fileUploadResult = standardRequest.getFileList().get(0);
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResult);
+ newEntity.setReferenceFile(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ eamMaintenanceStandardMapper.insert(newEntity);
+ //澶勭悊鏄庣粏鏁版嵁
+ if(CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
+ standardRequest.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setId(null);
+ tableDetail.setCreateBy(null);
+ tableDetail.setUpdateBy(null);
+ tableDetail.setCreateTime(null);
+ tableDetail.setUpdateTime(null);
+ tableDetail.setStandardId(newEntity.getId());
+ });
+ eamMaintenanceStandardDetailService.saveBatch(standardRequest.getTableDetailList());
+ }
+ return true;
+ }
+
+ @Override
public EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory) {
LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EamMaintenanceStandard::getEquipmentId, equipmentId);
@@ -143,9 +256,21 @@
queryWrapper.orderByDesc(EamMaintenanceStandard::getStandardVersion);
List<EamMaintenanceStandard> list = eamMaintenanceStandardMapper.selectList(queryWrapper);
- if(CollectionUtil.isNotEmpty(list)) {
+ if(CollectionUtil.isEmpty(list)) {
return null;
}
return list.get(0);
}
+
+ /**
+ * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
+ * @param keyword 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ @Override
+ public List<EamMaintenanceStandard> queryListBykeywordAndCategory(String keyword, String maintenanceCategory){
+ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ return eamMaintenanceStandardMapper.queryListBykeywordAndCategory(loginUser.getId(),keyword, maintenanceCategory);
+ }
}
--
Gitblit v1.9.3