From 9795450e50d6aefedc89460616c70a8f40ed6b79 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 17 May 2023 10:36:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SchBasePointServiceImpl.java | 25 ++++++-----------
 .../main/java/org/nl/wms/utils/PointUtil.java | 28 +++++++++++++++++++
 2 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/utils/PointUtil.java

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index b86204c..91f3daf 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -17,6 +17,7 @@ import org.nl.wms.sch.point.service.dao.mapper.SchBasePointMapper;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.region.service.dao.SchBaseRegion;
 import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper;
+import org.nl.wms.utils.PointUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -66,25 +67,15 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
             String pointStatus = point.getPoint_status(); // 点位状态
             String pointType = point.getPoint_type(); // 点位类型
             SchBaseRegion regionObj = regionMapper.selectById(point.getRegion_code());
-            if (ObjectUtil.isNotEmpty(pointStatus)) {
-                JSONObject statusArr = new JSONObject();
-                String[] split = regionObj.getPoint_status_explain().split("，");
-                for ( int j = 0; j < split.length; j++) {
-                    String[] status = split[j].split("-");
-                    statusArr.put(status[0], status[1]);
+            if (ObjectUtil.isNotEmpty(regionObj)) {
+                if (ObjectUtil.isNotEmpty(pointStatus) && ObjectUtil.isNotEmpty(regionObj.getPoint_status_explain())) {
+                    // 设置
+                    point.setPoint_status_name(PointUtil.getStatusOrTypeName(regionObj.getPoint_status_explain(), pointStatus));
                 }
-                // 设置
-                point.setPoint_status_name(statusArr.getString(pointStatus));
-            }
-            if (ObjectUtil.isNotEmpty(pointType)) {
-                JSONObject typeArr = new JSONObject();
-                String[] split = regionObj.getPoint_type_explain().split("，");
-                for ( int j = 0; j < split.length; j++) {
-                    String[] types = split[j].split("-");
-                    typeArr.put(types[0], types[1]);
+                if (ObjectUtil.isNotEmpty(pointType) && ObjectUtil.isNotEmpty(regionObj.getPoint_type_explain())) {
+                    // 设置
+                    point.setPoint_type_name(PointUtil.getStatusOrTypeName(regionObj.getPoint_type_explain(), pointType));
                 }
-                // 设置
-                point.setPoint_type_name(typeArr.getString(pointType));
             }
         });
         return pages;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/utils/PointUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/utils/PointUtil.java
new file mode 100644
index 0000000..b6f25fd
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/utils/PointUtil.java
@@ -0,0 +1,28 @@
+package org.nl.wms.utils;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @Author: lyd
+ * @Description: 点位工具类
+ * @Date: 2023/5/17
+ */
+public class PointUtil {
+
+    /**
+     * 获取状态名或者类型名
+     * @param explain
+     * @param label
+     * @return
+     */
+    public static String getStatusOrTypeName(String explain, String label) {
+        JSONObject statusArr = new JSONObject();
+        String[] split =  explain.split("，");
+        for ( int j = 0; j < split.length; j++) {
+            String[] status = split[j].split("-");
+            statusArr.put(status[0], status[1]);
+        }
+        // 设置
+        return statusArr.getString(label);
+    }
+}