From fb054df875df5f59025c4487b713ed2b4c6da384 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 18 Apr 2024 15:09:40 +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

---
 .../coal/acDevice/dto/AcDeviceDto.java        | 12 ++++--------
 .../coal/acDevice/entity/AcDeviceEntity.java  | 19 ++-----------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/acDevice/dto/AcDeviceDto.java b/src/main/java/cn/lihongjie/coal/acDevice/dto/AcDeviceDto.java
index d868e20b..871af485 100644
--- a/src/main/java/cn/lihongjie/coal/acDevice/dto/AcDeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/acDevice/dto/AcDeviceDto.java
@@ -2,14 +2,15 @@ package cn.lihongjie.coal.acDevice.dto;
 
 import cn.lihongjie.coal.acDeviceSupplier.dto.AcDeviceSupplierDto;
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
 import cn.lihongjie.coal.dataCollector.dto.DataCollectorDto;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 
 import jakarta.persistence.ManyToOne;
 
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 public class AcDeviceDto extends OrgCommonDto {
@@ -23,13 +24,7 @@ public class AcDeviceDto extends OrgCommonDto {
     @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 = 'ac.device.type'\n"
-            + "  and i.code = device_type)")
+    @DictTranslate(dictKey =  DictCode.AC_DEVICE_TYPE)
     private String deviceTypeName;
 
     private String location;
@@ -37,5 +32,6 @@ public class AcDeviceDto extends OrgCommonDto {
     
     private String archiveStatus;
 
+    @DictTranslate(dictKey =  DictCode.ARCHIVESTATUS)
     private String archiveStatusName;
 }
diff --git a/src/main/java/cn/lihongjie/coal/acDevice/entity/AcDeviceEntity.java b/src/main/java/cn/lihongjie/coal/acDevice/entity/AcDeviceEntity.java
index 5fc6ec56..6515e82f 100644
--- a/src/main/java/cn/lihongjie/coal/acDevice/entity/AcDeviceEntity.java
+++ b/src/main/java/cn/lihongjie/coal/acDevice/entity/AcDeviceEntity.java
@@ -11,7 +11,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 @Entity
@@ -25,26 +24,12 @@ public class AcDeviceEntity 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 = 'ac.device.type'\n"
-            + "  and i.code = device_type)")
-    private String deviceTypeName;
+
 
     private String location;
     @Comment("归档状态")
     @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;
+
 }