From 4c50c77f3a5cf63746068d4a703e65792701bc09 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 30 五月 2025 16:42:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e5a735d..bb23cb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -1,8 +1,12 @@
package org.jeecg.modules.eam.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
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.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;
@@ -10,8 +14,11 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
+import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
@@ -47,7 +54,15 @@
private IEamEquipmentService eamEquipmentService;
@Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
+
+ @Autowired
private IMdcEquipmentService mdcEquipmentService;
+
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -89,7 +104,8 @@
MdcEquipment mdcEquipment = new MdcEquipment();
mdcEquipment.setEquipmentId(entity.getEquipmentCode());
mdcEquipment.setEquipmentType(entity.getDeviceType());
- mdcEquipment.setEquipmentName(entity.getEquipmentName());
+ mdcEquipment.setEquipmentName(entity.getInstallationPosition());
+ mdcEquipment.setEquipmentAddress(entity.getEquipmentName());
mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -155,7 +171,30 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamEquipment eamEquipment = eamEquipmentService.getById(id);
- return Result.OK(eamEquipment);
+ if (eamEquipment == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ EamEquipmentExtend extend = eamEquipmentExtendService.getById(id);
+ if(extend != null){
+ eamEquipment.setRepairStatus(extend.getRepairStatus());
+ eamEquipment.setMaintenanceStatus(extend.getMaintenanceStatus());
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamEquipment);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamEquipment.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("updateBy", eamEquipment.getUpdateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("technologyStatus", eamEquipment.getTechnologyStatus(), item, "technology_status");
+ translateDictTextUtils.translateField("orgId", eamEquipment.getOrgId(), item, "mdc_production,production_name,id");
+ translateDictTextUtils.translateField("equipmentManager", eamEquipment.getEquipmentManager(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("equipmentCategory", eamEquipment.getEquipmentCategory(), item, "equipment_category");
+ translateDictTextUtils.translateField("assetStatus", eamEquipment.getAssetStatus(), item, "asset_status");
+ translateDictTextUtils.translateField("repairStatus", eamEquipment.getRepairStatus(), item, "equipment_repair_status");
+ translateDictTextUtils.translateField("maintenanceStatus", eamEquipment.getMaintenanceStatus(), item, "equipment_maintenance_status");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
@@ -187,6 +226,8 @@
params.setTitleRows(0);
params.setHeadRows(1);
params.setNeedSave(true);
+ params.setStartSheetIndex(0);
+ params.setSheetNum(1);
try {
List<EamEquipment> list = ExcelImportUtil.importExcel(file.getInputStream(), EamEquipment.class, params);
//update-begin-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
@@ -207,10 +248,10 @@
sb.append(String.format("璁惧缂栫爜[%s]浣跨敤杞﹂棿鎴栬澶囩鐞嗗憳涓虹┖锛屾棤娉曞鍏n\n", eamEquipment.getEquipmentCode()));
continue;
}
- if (eamEquipment.getAcceptanceCheckDate() == null) {
- sb.append(String.format("璁惧缂栫爜[%s]楠屾敹涓虹┖锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
- continue;
- }
+// if (eamEquipment.getAcceptanceCheckDate() == null) {
+// sb.append(String.format("璁惧缂栫爜[%s]楠屾敹涓虹┖锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
+// continue;
+// }
if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
sb.append(String.format("璁惧缂栫爜[%s]鎶�鏈姸鎬佷负绌猴紝鏃犳硶瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
continue;
@@ -219,6 +260,9 @@
if (one != null) {
sb.append(String.format("璁惧缂栫爜[%s]宸插瓨鍦紝鏃犳硶閲嶅瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
continue;
+ }
+ if (!CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
+ eamEquipment.setMdcFlag(CommonConstant.DEFAULT_0);
}
EamEquipment equipment = eamEquipmentService.saveEquipment(eamEquipment);
if (equipment == null) {
@@ -232,7 +276,8 @@
MdcEquipment mdcEquipment = new MdcEquipment();
mdcEquipment.setEquipmentId(eamEquipment.getEquipmentCode());
mdcEquipment.setEquipmentType(eamEquipment.getDeviceType());
- mdcEquipment.setEquipmentName(eamEquipment.getEquipmentName());
+ mdcEquipment.setEquipmentName(eamEquipment.getInstallationPosition());
+ mdcEquipment.setEquipmentAddress(eamEquipment.getEquipmentName());
mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
}
--
Gitblit v1.9.3