Ver código fonte

1.sql查询接口新增分页功能,2.数据源配置切换到123.60.219.66服务器

‘xugp 2 anos atrás
pai
commit
a18ece9af7

+ 1 - 0
src/main/java/com/gyee/table/entity/Table.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 @Data
 public class Table {
+    private int count;
     private List<TableColumnHeader> tableHeader;
     private List<LinkedHashMap<String, Object>> tableData;
 }

+ 11 - 3
src/main/java/com/gyee/table/service/impl/ObjectServiceImpl.java

@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 @Service
 public class ObjectServiceImpl implements IObjectService {
 
-    private final static String regex = "#|/\\*|\\*/|--|\\buse\\b|\\binsert\\b|\\bdelete\\b|\\bupdate\\b|\\bcreate\\b|\\bdrop\\b|\\btruncate\\b|\\balter\\b|\\bgrant\\b|\\bexecute\\b|\\bexec\\b|\\bxp_cmdshell\\b|\\bcall\\b|\\bdeclare\\b|\\bsource\\b|\\bsql\\b|\\bchr\\b|\\bmid\\b|\\bmaster\\b|\\bchar\\b|\\bsitename\\b|\\bnet user\\b|;|-|\\+|,|\\btable\\b|\\bgroup_concat\\b|\\bcolumn_name\\b|\\binformation_schema.columns\\b|\\btable_schema\\b|//|/";
+    private final static String regex = "#|/\\*|\\*/|--|\\buse\\b|\\binsert\\b|\\bdelete\\b|\\bupdate\\b|\\bcreate\\b|\\bdrop\\b|\\btruncate\\b|\\balter\\b|\\bgrant\\b|\\bexecute\\b|\\bexec\\b|\\bxp_cmdshell\\b|\\bcall\\b|\\bdeclare\\b|\\bsource\\b|\\bsql\\b|\\bchr\\b|\\bmid\\b|\\bmaster\\b|\\bchar\\b|\\bsitename\\b|\\bnet user\\b|;|-|\\+|\\btable\\b|\\bgroup_concat\\b|\\bcolumn_name\\b|\\binformation_schema.columns\\b|\\btable_schema\\b|//|/";
     private final Pattern compile;
     {
         compile = Pattern.compile(regex);
@@ -66,8 +66,8 @@ public class ObjectServiceImpl implements IObjectService {
 
         String tablename = (String) map.get("tablename");
         if(StringUtils.isBlank(tablename))
-            //tablename = StringUtils.substringBetween("from ", " ");
-            return Result.successData(ResultCode.SUCCESS,lms);
+            tablename = StringUtils.substringBetween("from ", " ");
+            //return Result.successData(ResultCode.SUCCESS,lms);
 
         QueryWrapper<TableColumnHeader> wrapper = new QueryWrapper<>();
         wrapper.eq("name", tablename);
@@ -82,6 +82,14 @@ public class ObjectServiceImpl implements IObjectService {
         Table table = new Table();
         table.setTableHeader(tableColumnHeader);
         table.setTableData(lms);
+        //截取sql
+        if (sql.contains("limit")){
+            String newSql = sql.split("limit")[0];
+            List<LinkedHashMap<String, Object>> linkedHashMaps = objectMapper.selectAll(newSql);
+            table.setCount(linkedHashMaps.size());
+        }else {
+            table.setCount(lms.size());
+        }
         return Result.successData(ResultCode.SUCCESS,table);
     }
 

+ 12 - 3
src/main/resources/application.yml

@@ -1,12 +1,21 @@
-
+server:
+  port: 8078
 spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER
+    http:
+      encoding:
+        force: true
+        charset: UTF-8
+        enabled: true
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #url: jdbc:mysql://49.234.50.218:3306/list
-    url: jdbc:mysql://124.70.18.168:3306/configuration_software?default-character-set=utf8
+    url: jdbc:mysql://123.60.219.66:3306/configuration_software?default-character-set=utf8
     #url: jdbc:mysql://192.168.1.69/wisdom_cs?useUnicode=true&characterEncoding=UTF-8
     username: root
-    password: 123456
+    password: gyeepd@123
     type: com.alibaba.druid.pool.DruidDataSource
 
 mybatis-plus: