From dd2aa08e6109951b8d2b14dcc1953704af56e445 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 18 Apr 2024 16:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dictionary/service/DictionaryService.java |  2 +-
 .../coal/emDevice/dto/EmDeviceDto.java        |  3 +++
 .../coal/emDevice/entity/EmDeviceEntity.java  | 19 ++-----------------
 .../coal/pdcDevice/dto/PdcDeviceDto.java      |  7 +++----
 .../pdcDevice/entity/PdcDeviceEntity.java     |  9 +--------
 5 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/dictionary/service/DictionaryService.java b/src/main/java/cn/lihongjie/coal/dictionary/service/DictionaryService.java
index e77f48cb..61b17ed4 100644
--- a/src/main/java/cn/lihongjie/coal/dictionary/service/DictionaryService.java
+++ b/src/main/java/cn/lihongjie/coal/dictionary/service/DictionaryService.java
@@ -93,7 +93,7 @@ public class DictionaryService extends BaseService<DictionaryEntity, DictionaryR
             ans.setTree(TreeDto.buildList(result.getResponse(), flatten));
         } else {
 
-            throw new BizException("不支持的字典类型 " + dict.getDictTypeName());
+            throw new BizException("不支持的字典类型 " + dict.getDictType());
         }
 
         return ans;
diff --git a/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java b/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java
index 3e5ce23d..edfdbc9f 100644
--- a/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java
@@ -1,8 +1,10 @@
 package cn.lihongjie.coal.emDevice.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
 import cn.lihongjie.coal.emDevice.entity.EmDeviceItemConfig;
 import cn.lihongjie.coal.emDeviceSupplier.dto.EmDeviceSupplierDto;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 import cn.lihongjie.coal.thirdAccount.dto.ThirdAccountDto;
 
 import lombok.Data;
@@ -28,6 +30,7 @@ public class EmDeviceDto extends OrgCommonDto {
     private String location;
     private String archiveStatus;
 
+    @DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
     private String archiveStatusName;
 
     private List<EmDeviceItemConfig> itemConfig;
diff --git a/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java
index 34a0af3e..76c3a3e5 100644
--- a/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java
+++ b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java
@@ -12,7 +12,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 import java.util.List;
 
@@ -27,14 +26,7 @@ public class EmDeviceEntity extends OrgCommonEntity {
     @Comment("设备类型")
     private String deviceType;
 
-    @Formula(
-            "(select i.name\n"
-                    + "from t_dictionary d,\n"
-                    + "     t_dictionary_item i\n"
-                    + "where d.id = i.dictionary_id\n"
-                    + "  and d.code = 'em.device.type'\n"
-                    + "  and i.code = device_type)")
-    private String deviceTypeName;
+
 
     private String location;
 
@@ -42,14 +34,7 @@ public class EmDeviceEntity extends OrgCommonEntity {
     @ColumnDefault("'0'")
     private String archiveStatus = "0";
 
-    @Formula(
-            "(select i.name\n"
-                    + "from t_dictionary d,\n"
-                    + "     t_dictionary_item i\n"
-                    + "where d.id = i.dictionary_id\n"
-                    + "  and d.code = 'archiveStatus'\n"
-                    + "  and i.code = archive_status)")
-    private String archiveStatusName;
+
 
 
     @ElementCollection
diff --git a/src/main/java/cn/lihongjie/coal/pdcDevice/dto/PdcDeviceDto.java b/src/main/java/cn/lihongjie/coal/pdcDevice/dto/PdcDeviceDto.java
index 9a2a5626..0cb2dbbd 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDevice/dto/PdcDeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDevice/dto/PdcDeviceDto.java
@@ -1,8 +1,10 @@
 package cn.lihongjie.coal.pdcDevice.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
 import cn.lihongjie.coal.dataCollector.dto.DataCollectorDto;
 import cn.lihongjie.coal.pdcDeviceSupplier.dto.PdcDeviceSupplierDto;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 
 import jakarta.persistence.ManyToOne;
 
@@ -34,12 +36,9 @@ public class PdcDeviceDto extends OrgCommonDto {
     @Comment("煤类型")
     private String coalType;
 
- 
+    @DictTranslate(dictKey = DictCode.COAL_TYPE)
     private String coalTypeName;
 
-
-
-
     @Comment("MODBUS地址")
     private String modbusUId;
 
diff --git a/src/main/java/cn/lihongjie/coal/pdcDevice/entity/PdcDeviceEntity.java b/src/main/java/cn/lihongjie/coal/pdcDevice/entity/PdcDeviceEntity.java
index bca8f7d0..aa610d29 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDevice/entity/PdcDeviceEntity.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDevice/entity/PdcDeviceEntity.java
@@ -34,14 +34,7 @@ public class PdcDeviceEntity extends OrgCommonEntity {
     @Comment("煤类型")
     private String coalType;
 
-    @Formula(
-            "(select i.name\n"
-                    + "from t_dictionary d,\n"
-                    + "     t_dictionary_item i\n"
-                    + "where d.id = i.dictionary_id\n"
-                    + "  and d.code = 'coal.type'\n"
-                    + "  and i.code = coal_type)")
-    private String coalTypeName;
+