Merge pull request #32 from wansenai/v2-orm-adjust

V2 orm adjust

.gitignore

@@ -13,9 +13,10 @@
 hs_err_pid*
 
 .idea
-**/target
+**/target/
 /logs.home_IS_UNDEFINED
 
 **/*.iml
 .gitattributes
 
+/api/src/main/resources/application-prod.yml

api/src/main/java/com/wansensoft/api/ErpApplication.java

@@ -11,10 +11,10 @@
 
 import java.io.IOException;
 
+@EnableScheduling
 @MapperScan("com.wansensoft.mappers")
 @ComponentScan("com.wansensoft")
 @SpringBootApplication
-@EnableScheduling
 public class ErpApplication {
 
     public static void main(String[] args) throws IOException {
@@ -24,4 +24,5 @@ public static void main(String[] args) throws IOException {
                 + environment.getProperty("server.port") + "/wansenerp/doc.html");
         System.out.println("您还需启动前端服务，启动命令：yarn run serve 或 npm run serve，测试用户：wansenerp，密码：123456");
     }
+
 }

api/src/main/java/com/wansensoft/api/IncomeExpenseController.java

@@ -0,0 +1,19 @@
+package com.wansensoft.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 收支项目 前端控制器
+ * </p>
+ *
+ * @author James Zow
+ * @since 2023-09-05
+ */
+@RestController
+@RequestMapping("/incomeExpense")
+public class IncomeExpenseController {
+
+}

api/src/main/java/com/wansensoft/api/LogController.java

@@ -0,0 +1,43 @@
+package com.wansensoft.api;
+
+import com.wansensoft.entities.log.Log;
+import com.wansensoft.entities.user.User;
+import com.wansensoft.service.log.LogService;
+import com.wansensoft.utils.BaseResponseInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/log")
+public class LogController {
+
+    private final LogService logService;
+
+    public LogController(LogService logService) {
+        this.logService = logService;
+    }
+
+    @GetMapping("/getAllList")
+    public BaseResponseInfo getAllList(HttpServletRequest request)throws Exception {
+        BaseResponseInfo res = new BaseResponseInfo();
+        try {
+            Map<String, Object> data = new HashMap<>();
+            List<Log> dataList = logService.getLog();
+            if(dataList!=null) {
+                data.put("logList", dataList);
+            }
+            res.code = 200;
+            res.data = data;
+        } catch(Exception e){
+            res.code = 500;
+            res.data = "获取失败";
+        }
+        return res;
+    }
+}

api/src/main/java/com/wansensoft/api/OperatorController.java

@@ -0,0 +1,20 @@
+package com.wansensoft.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 经手人表 前端控制器
+ * </p>
+ *
+ * @author James Zow
+ * @since 2023-09-05
+ */
+@RestController
+@RequestMapping("/operator")
+public class OperatorController {
+
+}