save

getmoneynote · Mar 16, 2024 · afbf6ed · afbf6ed
1 parent b111005
commit afbf6ed
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/cn/biq/mn/TestController.java b/src/main/java/cn/biq/mn/TestController.java
@@ -21,7 +21,7 @@ public class TestController {
 
     @RequestMapping(method = RequestMethod.GET, value = "/version")
     public BaseResponse handleVersion() {
-        return new DataResponse<>("93.34");
+        return new DataResponse<>("93.35");
     }
 
     @GetMapping("/test3")

diff --git a/src/main/java/cn/biq/mn/book/BookService.java b/src/main/java/cn/biq/mn/book/BookService.java
@@ -1,6 +1,7 @@
 package cn.biq.mn.book;
 
 import cn.biq.mn.bean.ApplicationScopeBean;
+import cn.biq.mn.book.tpl.BookTplDataLoader;
 import cn.biq.mn.exception.FailureMessageException;
 import cn.biq.mn.exception.ItemExistsException;
 import cn.biq.mn.exception.ItemNotFoundException;
@@ -166,7 +167,7 @@ public boolean toggle(Integer id) {
     // 账本模板列表，复制功能使用
     public boolean addByTemplate(BookAddByTemplateForm form) {
         Group group = sessionUtil.getCurrentGroup();
-        List<BookTemplate> bookTplList = applicationScopeBean.getBookTplList();
+        List<BookTemplate> bookTplList = BookTplDataLoader.load();
         Optional<BookTemplate> bookTemplateOptional = bookTplList.stream()
                 .filter(bookTemplate -> bookTemplate.getId().equals(form.getTemplateId()))
                 .findFirst();

diff --git a/src/main/java/cn/biq/mn/book/tpl/BookTplDataLoader.java b/src/main/java/cn/biq/mn/book/tpl/BookTplDataLoader.java
@@ -9,7 +9,9 @@
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 
 @Component
@@ -20,13 +22,22 @@ public class BookTplDataLoader implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) {
+        try {
+            applicationScopeBean.setBookTplList(load());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static List<BookTemplate> load() {
         try {
             Resource resource = new ClassPathResource("book_tpl.json");
             ObjectMapper objectMapper = new ObjectMapper();
             BookTemplate[] bookTemplateList = objectMapper.readValue(resource.getInputStream(), BookTemplate[].class);
-            applicationScopeBean.setBookTplList(Arrays.asList(bookTemplateList));
+            return Arrays.asList(bookTemplateList);
         } catch (Exception e) {
             e.printStackTrace();
+            return new ArrayList<>();
         }
     }