From 914b259a751eec0daa49e3bc5e97f19fc17af624 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Thu, 13 Nov 2025 16:49:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crdn/service/bean/ImportServiceBean.java | 22 +++++++++++-------- .../xit/fims/crdn/web/Crdn05Controller.java | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java index 719cf6a2..78fa566c 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java @@ -3,7 +3,6 @@ package cokr.xit.fims.crdn.service.bean; import java.io.File; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; @@ -27,6 +26,7 @@ import cokr.xit.fims.crdn.dao.CrdnTeamMapper; import cokr.xit.fims.crdn.receive.eqpmnt.SingleFileParser; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.crdn.service.ImportService; +import cokr.xit.fims.eqplc.dao.EqplcMapper; import cokr.xit.fims.mngt.service.bean.TaskProcessor; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -56,6 +56,8 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ protected UserMapper userMapper; @Resource(name = "crdnTeamMapper") private CrdnTeamMapper crdnTeamMapper; + @Resource(name="eqplcMapper") + private EqplcMapper eqplcMapper; @Override public int createCrdns(List interfaceSequences) { @@ -112,7 +114,10 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ setCrdnPlc(divided); List invalidPlace = divided.stream() - .filter(info -> "invalid".equals(info.get("status"))) + .filter(info -> { + DataObject metaInfo = (DataObject)info.get("metaInfo"); + return "invalidPlace".equals(metaInfo.get("status")); + }) .toList(); divided.removeAll(invalidPlace); // 잘못된 단속장소 제외 resp.set("invalidPlace", invalidPlace.size()); @@ -328,27 +333,26 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ .toList(); if (metaInfoList.isEmpty()) return; - List eqpPlcList = Collections.emptyList(); // TODO: EquipmentPlace 완료되면 교체할 것 - if (eqpPlcList.isEmpty()) return; - //키 = 장비코드-장소이름 - Map eqpPlcMap = eqpPlcList.stream().collect(Collectors.toMap( + Map eqpPlcMap = eqplcMapper.selectList(null).stream().collect(Collectors.toMap( info -> info.get("EQP_CD") + "-" + info.get("PLC_NM"), info -> info )); + if (eqpPlcMap.isEmpty()) return; for (DataObject metaInfo: metaInfoList) { String key = metaInfo.get("EQPMNT_CD") + "-" + metaInfo.get("CRDN_PLC"); DataObject eqpPlc = eqpPlcMap.get(key); if (eqpPlc == null) { - metaInfo.set("status", "invalid"); + log().debug("invalid place name: {}", key); + metaInfo.set("status", "invalidPlace"); continue; } metaInfo .set("CRDN_STDG_NM", eqpPlc.get("STDG_NM")) - .set("CRDN_ROAD_NM", eqpPlcMap.get("ROAD_NM")) - .set("CRDN_PLC", eqpPlcMap.get("PLC")); + .set("CRDN_ROAD_NM", eqpPlc.get("ROAD_NM")) + .set("CRDN_PLC", eqpPlc.get("PLC")); } } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index 6fc5e148..6718eba5 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -442,6 +442,7 @@ public class Crdn05Controller extends ApplicationController { || path.contains("success") || path.contains("fail") || path.contains("duplicates") + || path.contains("invalidPlace") ) return false; }