From 00a70cda62ddc232a5f1f1b7ddba3023d73cca9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Wed, 30 Jul 2025 11:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9D=A5=E9=85=8D=E7=BD=AE=E5=93=81?= =?UTF-8?q?=E8=A7=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/common/pom.xml | 1 + modules/filter/pom.xml | 1 + modules/pom.xml | 1 + pom.xml | 1 + web/pom.xml | 1 + .../java/com/zhehekeji/web/entity/Stock.java | 2 ++ .../zhehekeji/web/service/StockService.java | 21 ++++++++----------- .../java/com/zhehekeji/web/util/FileUtil.java | 14 +++++-------- web/src/main/resources/application-prod.yml | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 2340aa1..c3d01e1 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -51,6 +51,7 @@ org.projectlombok lombok + 1.18.30 true diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml index 068c85d..2ff7bfa 100644 --- a/modules/filter/pom.xml +++ b/modules/filter/pom.xml @@ -49,6 +49,7 @@ org.projectlombok lombok + 1.18.30 true diff --git a/modules/pom.xml b/modules/pom.xml index da6a14c..e5b0996 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -37,6 +37,7 @@ org.projectlombok lombok + 1.18.30 true diff --git a/pom.xml b/pom.xml index 19d96e6..d0b2ee2 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ org.projectlombok lombok + 1.18.30 true diff --git a/web/pom.xml b/web/pom.xml index 5ada756..cc15a8c 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -40,6 +40,7 @@ org.projectlombok lombok + 1.18.30 true diff --git a/web/src/main/java/com/zhehekeji/web/entity/Stock.java b/web/src/main/java/com/zhehekeji/web/entity/Stock.java index 6b8b7a1..afb0168 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java +++ b/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) diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index efbb2e4..68562c8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -465,24 +465,21 @@ public class StockService { } return stock; } + @Resource + CategoryMapper categoryMapper; public Map getCategoryList() { + List category = categoryMapper.selectList(new QueryWrapper()); Map map = new HashMap<>(); - if(configProperties.getProductDoc() != null){ - List list = new ArrayList<>(); - 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]); - } - } - } + for (Category c : category) + map.put(c.getCode(),c.getName()); return map; } + public static void main(String[] args) { + System.out.println(FileUtil.readLinesToList("D:\\品规.txt")); + } + public Map overview() { List list = stockMapper.selectList(new QueryWrapper()); diff --git a/web/src/main/java/com/zhehekeji/web/util/FileUtil.java b/web/src/main/java/com/zhehekeji/web/util/FileUtil.java index 7179f3d..c6e210e 100644 --- a/web/src/main/java/com/zhehekeji/web/util/FileUtil.java +++ b/web/src/main/java/com/zhehekeji/web/util/FileUtil.java @@ -13,15 +13,11 @@ import java.util.List; public class FileUtil { public static List readLinesToList(String path) { List lines = new ArrayList<>(); - - try (BufferedReader reader = new BufferedReader( new InputStreamReader(Files.newInputStream(Paths.get(path)), StandardCharsets.UTF_8))) { - //InputStreamReader isr = new InputStreamReader(reader,"UTF-8");//避免中文乱码 - String line; - while ((line = reader.readLine()) != null) { - lines.add(line); - } - }catch (IOException e){ - log.info("读取数据失败"); +// ... existing code ... + try { + lines = Files.readAllLines(Paths.get(path), StandardCharsets.UTF_8); + } catch (IOException e) { + log.error("读取文件数据失败: " + path + ", 错误信息: " + e.getMessage(), e); } return lines; diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index f6bd094..c4f2aeb 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -96,6 +96,6 @@ scanCodeMode: # 照片 視頻保存多久 deleteFileDays: 30 -productDoc: "D:/desktop/新建文本文档.txt" +productDoc: "D:品规.txt" inventorySimulationFollow: false \ No newline at end of file