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

---
 .../cn/lihongjie/coal/device/dto/DeviceDto.java     | 13 +++----------
 .../lihongjie/coal/device/entity/DeviceEntity.java  |  9 ---------
 .../coal/deviceSupplier/dto/DeviceSupplierDto.java  |  3 +++
 .../deviceSupplier/entity/DeviceSupplierEntity.java | 10 +---------
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java b/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
index 0bba2673..c6f7f9e0 100644
--- a/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
@@ -1,7 +1,9 @@
 package cn.lihongjie.coal.device.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
 import cn.lihongjie.coal.deviceCategory.dto.DeviceCategoryDto;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 import cn.lihongjie.coal.user.dto.UserDto;
 
 import jakarta.persistence.ManyToOne;
@@ -10,7 +12,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 public class DeviceDto extends OrgCommonDto {
@@ -51,14 +52,6 @@ public class DeviceDto extends OrgCommonDto {
     @ColumnDefault("'0'")
     private String archiveStatus;
 
-
-
-    @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)")
+    @DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
     private String archiveStatusName;
 }
diff --git a/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java b/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
index f8d90321..54a891b8 100644
--- a/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
+++ b/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
@@ -12,7 +12,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 @Entity
@@ -57,12 +56,4 @@ public class DeviceEntity extends OrgCommonEntity {
 
 
 
-    @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;
 }
diff --git a/src/main/java/cn/lihongjie/coal/deviceSupplier/dto/DeviceSupplierDto.java b/src/main/java/cn/lihongjie/coal/deviceSupplier/dto/DeviceSupplierDto.java
index fca2ecff..4781f2c4 100644
--- a/src/main/java/cn/lihongjie/coal/deviceSupplier/dto/DeviceSupplierDto.java
+++ b/src/main/java/cn/lihongjie/coal/deviceSupplier/dto/DeviceSupplierDto.java
@@ -1,6 +1,8 @@
 package cn.lihongjie.coal.deviceSupplier.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 
 import lombok.Data;
 
@@ -8,6 +10,7 @@ import lombok.Data;
 public class DeviceSupplierDto extends OrgCommonDto {
     private String archiveStatus;
 
+    @DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
     private String archiveStatusName;
 
     private String contact;
diff --git a/src/main/java/cn/lihongjie/coal/deviceSupplier/entity/DeviceSupplierEntity.java b/src/main/java/cn/lihongjie/coal/deviceSupplier/entity/DeviceSupplierEntity.java
index d2c457f7..e5b9d8ad 100644
--- a/src/main/java/cn/lihongjie/coal/deviceSupplier/entity/DeviceSupplierEntity.java
+++ b/src/main/java/cn/lihongjie/coal/deviceSupplier/entity/DeviceSupplierEntity.java
@@ -8,7 +8,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 @Entity
@@ -17,14 +16,7 @@ public class DeviceSupplierEntity 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;
+