From 83ed163b0d74aba0b84e69a95eaae7c316bd2d11 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 四月 2025 15:55:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 13b404e..30b42ec 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -1,15 +1,22 @@
package org.jeecg.modules.eam.controller;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
@@ -22,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @Description: 鍛ㄤ繚宸ュ崟
@@ -38,6 +46,10 @@
private IEamWeekMaintenanceOrderService eamWeekMaintenanceOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -78,6 +90,7 @@
}
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.WEEK_MAINTENANCE_CODE_RULE);
request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
boolean b = eamWeekMaintenanceOrderService.addWeekMaintenance(request);
if (!b) {
return Result.error("娣诲姞澶辫触锛�");
@@ -133,10 +146,10 @@
@DeleteMapping(value = "/abolish")
public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
- if(entity == null) {
+ if (entity == null) {
return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if (!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
}
entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.ABOLISH.name());
@@ -155,7 +168,7 @@
@GetMapping(value = "/collect")
public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
boolean b = eamWeekMaintenanceOrderService.collect(id);
- if(!b) {
+ if (!b) {
Result.OK("棰嗗彇澶辫触!");
}
return Result.OK("棰嗗彇鎴愬姛!");
@@ -186,14 +199,40 @@
@DeleteMapping(value = "/abolishBatch")
public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
list.forEach(id -> {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
if (entity != null && WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.ABOLISH.name());
eamWeekMaintenanceOrderService.updateById(entity);
+ i.getAndIncrement();
}
});
- return Result.OK("鎵归噺浣滃簾鎴愬姛锛�");
+ return Result.OK("鎵归噺浣滃簾鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺棰嗗彇
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @DeleteMapping(value = "/collectBatch")
+ public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
+ if (entity != null && WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ boolean b = eamWeekMaintenanceOrderService.collect(id);
+ if (b) {
+ i.getAndIncrement();
+ }
+ }
+ });
+ return Result.OK("鎵归噺棰嗗彇鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
}
/**
@@ -206,6 +245,50 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamWeekMaintenanceOrder eamWeekMaintenanceOrder = eamWeekMaintenanceOrderService.getById(id);
- return Result.OK(eamWeekMaintenanceOrder);
+ if (eamWeekMaintenanceOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamWeekMaintenanceOrder);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("equipmentId", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
+ translateDictTextUtils.translateField("standardId", eamWeekMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
+ translateDictTextUtils.translateField("operator", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("creationMethod", eamWeekMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
+ translateDictTextUtils.translateField("maintenanceStatus", eamWeekMaintenanceOrder.getMaintenanceStatus(), item, "week_maintenance_status");
+ translateDictTextUtils.translateField("confirmUser", eamWeekMaintenanceOrder.getConfirmUser(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("confirmDealType", eamWeekMaintenanceOrder.getConfirmDealType(), item, "approved_rejected");
+ translateDictTextUtils.translateField("initialAcceptanceUser", eamWeekMaintenanceOrder.getInitialAcceptanceUser(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("finalAcceptanceUser", eamWeekMaintenanceOrder.getFinalAcceptanceUser(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+
+ /**
+ * 鎴戠殑寰呭姙锛屽鎵瑰姩浣�
+ *
+ * @param request
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵ц鎿嶄綔", notes = "鍛ㄤ繚宸ュ崟-鎵ц鎿嶄綔")
+ @PutMapping(value = "/approval")
+ public Result<?> approval(@RequestBody EamWeekMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ EamWeekMaintenanceOrder b = eamWeekMaintenanceOrderService.approval(request);
+ if (b == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
}
}
--
Gitblit v1.9.3