From 38c16c1746cdea83e6d2577e4f4f6a0535ea4f4f Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Sun, 22 Dec 2024 16:52:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=92=8C=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=98=8E?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yg/cz/enmu/MonitorEnum.java  | 20 +++++++++----------
 .../com/kms/yg/cz/service/MonitorService.java |  3 +--
 .../yxgh/common/enums/DataSyncBasicEnum.java  | 14 ++++++-------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java
index da0cd783..ca69b5a2 100644
--- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java
+++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java
@@ -29,27 +29,27 @@ public enum MonitorEnum {
     MS_DSM_SRHRDS("表面水平位移监测表", Mock.MS_DSM_SRHRDS, MsHdmSrhrds.class),
     ;
 
-    private final String name;
+    private final String zhName;
     private final MonitorTypeEnum type;
     private final String mockData;
     private final Class<?> clazz;
 
 
-    MonitorEnum(String name, Class<?> clazz) {
-        this(name, Mock.DEFAULT, MonitorTypeEnum.MONITOR, clazz);
+    MonitorEnum(String zhName, Class<?> clazz) {
+        this(zhName, Mock.DEFAULT, MonitorTypeEnum.MONITOR, clazz);
 
     }
 
-    MonitorEnum(String name, String mockData, Class<?> clazz) {
-        this(name, mockData, MonitorTypeEnum.MONITOR, clazz);
+    MonitorEnum(String zhName, String mockData, Class<?> clazz) {
+        this(zhName, mockData, MonitorTypeEnum.MONITOR, clazz);
     }
 
-    MonitorEnum(String name, MonitorTypeEnum type, Class<?> clazz) {
-        this(name, Mock.DEFAULT, type, clazz);
+    MonitorEnum(String zhName, MonitorTypeEnum type, Class<?> clazz) {
+        this(zhName, Mock.DEFAULT, type, clazz);
     }
 
-    MonitorEnum(String name, String mockData, MonitorTypeEnum type, Class<?> clazz) {
-        this.name = name;
+    MonitorEnum(String zhName, String mockData, MonitorTypeEnum type, Class<?> clazz) {
+        this.zhName = zhName;
         this.type = type;
         this.mockData = mockData;
         this.clazz = clazz;
@@ -125,7 +125,7 @@ public enum MonitorEnum {
 
     @Override
     public String toString() {
-        return "表[" + this.getName() + "](" + this.name + ")";
+        return "表[" + this.getTableName() + "](" + this.zhName + ")";
     }
 
     public final static class Mock {
diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java
index 9c075ab4..d7c42763 100644
--- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java
+++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java
@@ -1,7 +1,6 @@
 package com.kms.yg.cz.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yg.cz.dto.MonitorQueDto;
 import com.kms.yg.cz.enmu.MonitorEnum;
 import com.kms.yxgh.util.DataCenterRestTemplateUtils;
@@ -29,7 +28,7 @@ public class MonitorService {
 
     public  IPage<Object> pageQuery(MonitorQueDto queDto) {
         MonitorEnum table = queDto.getMonitorType();
-        String path = paths.get(table.getTableName());
+        String path = paths.get(table.getZhName());
         if (path == null) {
             log.error("未找到对应的路径配置, table:{}", table);
             return table.getMockData(queDto);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java
index 3faa9cff..7d704273 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java
@@ -74,24 +74,24 @@ public enum DataSyncBasicEnum {
     }}),
     ;
 
-    private final String name;
+    private final String zhName;
     private final Map<String, Function<JsonObjProxy, Object>> valueHandler;
     private final Consumer<JSONArray> afterHandler;
 
 
-    DataSyncBasicEnum(String name, Map<String, Function<JsonObjProxy, Object>> valueHandler) {
-        this(name, valueHandler, a -> {
+    DataSyncBasicEnum(String zhName, Map<String, Function<JsonObjProxy, Object>> valueHandler) {
+        this(zhName, valueHandler, a -> {
         });
     }
 
-    DataSyncBasicEnum(String name, Map<String, Function<JsonObjProxy, Object>> valueHandler, Consumer<JSONArray> afterHandler) {
-        this.name = name;
+    DataSyncBasicEnum(String zhName, Map<String, Function<JsonObjProxy, Object>> valueHandler, Consumer<JSONArray> afterHandler) {
+        this.zhName = zhName;
         this.valueHandler = valueHandler;
         this.afterHandler = afterHandler;
     }
 
     public TableInfo getTableInfo() {
-        return TableInfoHelper.getTableInfo(this.name().toLowerCase());
+        return TableInfoHelper.getTableInfo(this.getTableName());
     }
 
     public String getTableName() {
@@ -100,7 +100,7 @@ public enum DataSyncBasicEnum {
 
     @Override
     public String toString() {
-        return "表[" + this.getName() + "](" + this.name + ")";
+        return "表[" + this.getZhName() + "](" + this.zhName + ")";
     }
 
     public static class Constants {