修改为查询数据库来配置品规名称

modules/common/pom.xml

@@ -51,6 +51,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <optional>true</optional>
         </dependency>
 

modules/filter/pom.xml

@@ -49,6 +49,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <optional>true</optional>
         </dependency>
 

modules/pom.xml

@@ -37,6 +37,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

pom.xml

@@ -34,6 +34,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <optional>true</optional>
         </dependency>
         <dependency>

web/pom.xml

@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <optional>true</optional>
         </dependency>
         <dependency>

web/src/main/java/com/zhehekeji/web/entity/Stock.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -13,6 +14,7 @@ import java.time.LocalDateTime;
 @TableName("`stock`")
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class Stock {
 
     @TableId(type = IdType.AUTO)

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -465,24 +465,21 @@ public class StockService {
         }
         return stock;
     }
+    @Resource
+    CategoryMapper categoryMapper;
 
     public Map<String,String> getCategoryList() {
+        List<Category> category = categoryMapper.selectList(new QueryWrapper<Category>());
         Map<String,String> map = new HashMap<>();
-        if(configProperties.getProductDoc() != null){
+        for (Category c : category)
-            List<String> list = new ArrayList<>();
+            map.put(c.getCode(),c.getName());
-            list = FileUtil.readLinesToList(configProperties.getProductDoc());
-            for(String s : list){
-                String[] split = s.split(":");
-                if(split.length == 2) {
-                    map.put(split[0], split[1]);
-                }else {
-                    map.put(split[0], split[0]);
-                }
-            }
-        }
         return map;
     }
 
+    public static void main(String[] args) {
+        System.out.println(FileUtil.readLinesToList("D:\\品规.txt"));
+    }
+
 
     public Map<String,Object> overview() {
         List<Stock> list = stockMapper.selectList(new QueryWrapper<Stock>());

web/src/main/java/com/zhehekeji/web/util/FileUtil.java

@@ -13,15 +13,11 @@ import java.util.List;
 public class FileUtil {
     public static List<String> readLinesToList(String path) {
         List<String> lines = new ArrayList<>();
-
+// ... existing code ...
-        try (BufferedReader reader = new BufferedReader( new InputStreamReader(Files.newInputStream(Paths.get(path)), StandardCharsets.UTF_8))) {
+        try {
-            //InputStreamReader isr = new InputStreamReader(reader,"UTF-8");//避免中文乱码
+            lines = Files.readAllLines(Paths.get(path), StandardCharsets.UTF_8);
-            String line;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
         } catch (IOException e) {
-            log.info("读取数据失败");
+            log.error("读取文件数据失败: " + path + ", 错误信息: " + e.getMessage(), e);
         }
 
         return lines;

web/src/main/resources/application-prod.yml

@@ -96,6 +96,6 @@ scanCodeMode:
 # 照片 視頻保存多久
 deleteFileDays: 30
 
-productDoc: "D:/desktop/新建文本文档.txt"
+productDoc: "D:品规.txt"
 
 inventorySimulationFollow: false