From 1fca851e22aa4dbac3ac3d4b20e68bbda3f9b94c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 31 七月 2023 15:59:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/common/web/DatavController.java |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/crm/common/web/DatavController.java b/src/main/java/com/zy/crm/common/web/DatavController.java
index ee065f0..ea43349 100644
--- a/src/main/java/com/zy/crm/common/web/DatavController.java
+++ b/src/main/java/com/zy/crm/common/web/DatavController.java
@@ -1,33 +1,61 @@
 package com.zy.crm.common.web;
 
+import com.core.common.Cools;
 import com.core.common.R;
+import com.zy.crm.common.service.DbSqlServer;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by vincent on 2023/7/25
  */
 @RestController
+@SuppressWarnings("all")
 public class DatavController {
 
-    private String sql1;
+    private String 鐢熶骇璁㈠崟;
+    private String 閿�鍞鍗�;
 
-    @PostConstruct
-    public void init() throws IOException {
-        this.sql1 = read(new ClassPathResource("datav/sql/1.sql").getInputStream());
+    {
+        try {
+            this.鐢熶骇璁㈠崟 = read(new ClassPathResource("datav/sql/鐢熶骇璁㈠崟.sql").getInputStream());
+            this.閿�鍞鍗� = read(new ClassPathResource("datav/sql/閿�鍞鍗�.sql").getInputStream());
+        } catch (IOException ignore) {}
     }
 
-    @GetMapping("/1test")
-    public R test1() {
-        return R.ok(this.sql1);
+    @Autowired
+    private DbSqlServer dbSqlServer;
+
+    @GetMapping("/data1")
+    public R data1() {
+        List<Map<String, Object>> res = dbSqlServer.select(this.鐢熶骇璁㈠崟);
+        if (Cools.isEmpty(res)) {
+            return R.ok();
+        }
+        int limit = 30;
+        if (res.size() > limit) {
+            res = res.subList(0, limit);
+        }
+        return R.ok().add(res);
     }
 
-    public static String read(InputStream inputStream) {
+    @GetMapping("/data3")
+    public R data3() {
+        List<Map<String, Object>> res = dbSqlServer.select(this.閿�鍞鍗�);
+        if (Cools.isEmpty(res)) {
+            return R.ok();
+        }
+        return R.ok().add(res);
+    }
+
+    private static String read(InputStream inputStream) {
         StringBuilder stringBuilder = new StringBuilder();
         byte[] buffer = new byte[1024];
         try {

--
Gitblit v1.9.1