From 1b6cec5d8e3b200f65fab9af203be7d654a57a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Mon, 16 May 2022 15:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=A1=A3=E6=A1=88=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archives/pom.xml                              | 20 +++++++++++++++++++
 pom.xml                                       |  1 +
 .../controller/DictDetailController.java      | 10 ++++------
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 archives/pom.xml

diff --git a/archives/pom.xml b/archives/pom.xml
new file mode 100644
index 0000000..2716d5d
--- /dev/null
+++ b/archives/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>yxk_StoreroomSystem</artifactId>
+        <groupId>com.storeroom</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>archives</artifactId>
+    <name>档案配置</name>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 17fc3ae..933fdd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
         <module>common</module>
         <module>system</module>
         <module>logging</module>
+        <module>archives</module>
     </modules>
     <name>智能库房综合管理系统</name>
 
diff --git a/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java b/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java
index 577c73a..a9a7ef3 100644
--- a/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java
+++ b/system/src/main/java/com/storeroom/modules/system/controller/DictDetailController.java
@@ -15,8 +15,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,20 +34,20 @@ public class DictDetailController {
 
     @ApiOperation("查询字典详情")
     @GetMapping
-    public ResponseEntity<Object> queryDictDetail(DictDetailQueryCriteria criteria,
+    public ApiResponse<Object> queryDictDetail(DictDetailQueryCriteria criteria,
                                                   @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable) {
-        return new ResponseEntity<>(dictDetailService.queryAll(criteria, pageable), HttpStatus.OK);
+        return ApiResponse.success(dictDetailService.queryAll(criteria, pageable));
     }
 
     @ApiOperation("查询多个字典详情")
     @GetMapping(value = "/map")
-    public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName) {
+    public ApiResponse<Object> getDictDetailMaps(@RequestParam String dictName) {
         String[] names = dictName.split("[,，]");
         Map<String, List<DictDetailDto>> dictMap = new HashMap<>(16);
         for (String name : names) {
             dictMap.put(name, dictDetailService.getDictByName(name));
         }
-        return new ResponseEntity<>(dictMap, HttpStatus.OK);
+        return ApiResponse.success(dictMap);
     }
 
     @Log("新增字典详情")