From b9a9e2259c30e60289af3e5985ef7ccbb5b4cb26 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 8 Oct 2024 13:48:08 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4icdconfig=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=AD=97=E6=AE=B5=E7=9A=84=E6=8B=86=E5=88=86=E5=92=8C?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/entity/IcdConfigType.java    |  5 +++--
 .../java/com/xydl/cac/entity/IcdConfigTypeAtt.java | 14 +++++++++++---
 .../cac/service/impl/ParamBindServiceImpl.java     |  2 +-
 src/main/java/com/xydl/cac/util/IcdXmlUtil.java    |  5 ++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigType.java b/src/main/java/com/xydl/cac/entity/IcdConfigType.java
index f001479..cdad773 100644
--- a/src/main/java/com/xydl/cac/entity/IcdConfigType.java
+++ b/src/main/java/com/xydl/cac/entity/IcdConfigType.java
@@ -61,7 +61,7 @@ public class IcdConfigType {
     @Transient
     private List<IcdConfigTypeInst> instList;
 
-    public void addAtt(String doName, String desc, String param, String inst) {
+    public void addAtt(String doName, String fc, String lastName, String desc, String inst) {
         if (attMap == null) {
             attMap = new LinkedHashMap<>();
         }
@@ -69,8 +69,9 @@ public class IcdConfigType {
         if (item == null) {
             item = IcdConfigTypeAtt.builder()
                     .doName(doName)
+                    .fc(fc)
+                    .lastName(lastName)
                     .description(desc)
-                    .param(param)
                     .build();
             attMap.put(doName, item);
         }
diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java
index 33998e0..ac96ffd 100644
--- a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java
+++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java
@@ -37,9 +37,13 @@ public class IcdConfigTypeAtt {
     @Column(name = "do_name")
     private String doName;
 
-    @ApiModelProperty(name = "参数")
-    @Column(name = "param")
-    private String param;
+    @ApiModelProperty(name = "fc")
+    @Column(name = "fc")
+    private String fc;
+
+    @ApiModelProperty(name = "lastName")
+    @Column(name = "last_name")
+    private String lastName;
 
     @ApiModelProperty(name = "备注")
     @Column(name = "description")
@@ -76,4 +80,8 @@ public class IcdConfigTypeAtt {
         return instList.contains(inst);
     }
 
+    public String getParam() {
+        return fc + "$" + doName + "$" + lastName;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java
index a4c3228..db7b2cd 100644
--- a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java
@@ -161,7 +161,7 @@ public class ParamBindServiceImpl implements ParamBindService {
         List<IcdConfigTypeAtt> attList = attRepository.findByIcdConfigTypeId(type.getId());
         List<String> msgList = new ArrayList<>();
         for (IcdConfigTypeAtt att : attList) {
-            if (StringUtils.isBlank(att.getColName()) && att.containInst(inst.getInst()) && att.getParam().startsWith("MX")) {
+            if (StringUtils.isBlank(att.getColName()) && att.containInst(inst.getInst()) && att.getFc().equalsIgnoreCase("MX")) {
                 msgList.add(att.getDoName() + "该属性还未配置绑定字段");
             } else {
 //                String paramindex = param + "$" + att.getParam();
diff --git a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java
index 64e662c..aef2ab3 100644
--- a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java
+++ b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java
@@ -123,9 +123,8 @@ public class IcdXmlUtil {
                             .build();
                     configMap.put(key, config);
                 }
-                String param = fc + "$" + doName + "$" + lastname;
                 config.addInst(lnInst);
-                config.addAtt(doName, doDesc, param, lnInst);
+                config.addAtt(doName, fc, lastname, doDesc, lnInst);
             } else if ("ST".equals(fc)) {
                 IcdConfigType config = configMap.get(key);
                 if (config == null) {
@@ -138,7 +137,7 @@ public class IcdXmlUtil {
                 }
                 String param = fc + "$" + doName + "$" + lastname;
                 config.addInst(lnInst);
-                config.addAtt(doName, doDesc, param, lnInst);
+                config.addAtt(doName, fc, lastname, doDesc, lnInst);
             }
         }
     }