Pārlūkot izejas kodu

读表显示页面

suochencheng 7 gadi atpakaļ
vecāks
revīzija
0b767a5ba4
23 mainītis faili ar 1857 papildinājumiem un 12 dzēšanām
  1. 4 4
      awesome-admin.iml
  2. 14 2
      pom.xml
  3. 19 0
      src/main/java/com/izouma/awesomeadmin/dao/CommonQueryMapper.java
  4. 119 0
      src/main/java/com/izouma/awesomeadmin/dao/CommonQueryMapper.xml
  5. 18 0
      src/main/java/com/izouma/awesomeadmin/dao/CommonQuerySqlServerMapper.java
  6. 120 0
      src/main/java/com/izouma/awesomeadmin/dao/CommonQuerySqlServerMapper.xml
  7. 33 0
      src/main/java/com/izouma/awesomeadmin/dao/QueryConfigMapper.java
  8. 281 0
      src/main/java/com/izouma/awesomeadmin/dao/QueryConfigMapper.xml
  9. 8 2
      src/main/java/com/izouma/awesomeadmin/interceptor/PageInterceptor.java
  10. 56 0
      src/main/java/com/izouma/awesomeadmin/model/CommonQuery.java
  11. 84 0
      src/main/java/com/izouma/awesomeadmin/model/QueryConfig.java
  12. 21 0
      src/main/java/com/izouma/awesomeadmin/service/CommonQueryService.java
  13. 27 0
      src/main/java/com/izouma/awesomeadmin/service/QueryConfigService.java
  14. 77 0
      src/main/java/com/izouma/awesomeadmin/service/impl/CommonQueryServiceImpl.java
  15. 137 0
      src/main/java/com/izouma/awesomeadmin/service/impl/QueryConfigServiceImpl.java
  16. 2 0
      src/main/java/com/izouma/awesomeadmin/shiro/MyExceptionResolver.java
  17. 58 0
      src/main/java/com/izouma/awesomeadmin/web/CommonQueryController.java
  18. 157 0
      src/main/java/com/izouma/awesomeadmin/web/QueryConfigController.java
  19. 53 4
      src/main/java/test/com/izouma/admintemplate/datasource/SQLServiceTest.java
  20. 137 0
      src/main/vue/src/pages/CommonQuerys.vue
  21. 145 0
      src/main/vue/src/pages/QueryConfig.vue
  22. 272 0
      src/main/vue/src/pages/QueryConfigs.vue
  23. 15 0
      src/main/vue/src/router/index.js

+ 4 - 4
awesome-admin.iml

@@ -30,7 +30,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.5.RELEASE" level="project" />
@@ -56,7 +55,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home/lib/jconsole.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_141/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -65,7 +64,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home/lib/tools.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_141/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -73,7 +72,8 @@
     </orderEntry>
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
     <orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.11" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.5.RELEASE" level="project" />

+ 14 - 2
pom.xml

@@ -213,6 +213,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
             <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>c3p0</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- spring websocket-->
@@ -294,9 +300,9 @@
         </dependency>
 
         <dependency>
-            <groupId>c3p0</groupId>
+            <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>0.9.1.1</version>
+            <version>0.9.5.2</version>
         </dependency>
 
         <!-- WEB begin -->
@@ -706,6 +712,12 @@
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
             <version>${quartz.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>c3p0</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>

+ 19 - 0
src/main/java/com/izouma/awesomeadmin/dao/CommonQueryMapper.java

@@ -0,0 +1,19 @@
+package com.izouma.awesomeadmin.dao;
+
+import com.izouma.awesomeadmin.datasource.DataSource;
+import com.izouma.awesomeadmin.model.CommonQuery;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@DataSource("dataSource")
+@Repository("com.izouma.awesomeadmin.dao.CommonQueryMapper")
+public interface CommonQueryMapper {
+
+
+    List<Map> getTableListByPage(Map<String, Object> parameter);
+
+    List<Map> getTableListAll(CommonQuery record);
+
+}

+ 119 - 0
src/main/java/com/izouma/awesomeadmin/dao/CommonQueryMapper.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.izouma.awesomeadmin.dao.CommonQueryMapper">
+
+
+    <select id="getTableListByPage" resultType="java.util.Map">
+
+        SELECT * FROM ${record.tableName}
+        <where>
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+            order by
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+
+        </if>
+
+    </select>
+
+    <select id="getTableListAll" resultType="java.util.Map">
+
+        SELECT * FROM ${tableName}
+        <where>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+            order by
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+
+        </if>
+
+    </select>
+
+</mapper>

+ 18 - 0
src/main/java/com/izouma/awesomeadmin/dao/CommonQuerySqlServerMapper.java

@@ -0,0 +1,18 @@
+package com.izouma.awesomeadmin.dao;
+
+import com.izouma.awesomeadmin.datasource.DataSource;
+import com.izouma.awesomeadmin.model.CommonQuery;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@DataSource("dataSourceSqlserver")
+@Repository("com.izouma.awesomeadmin.dao.CommonQuerySqlServerMapper")
+public interface CommonQuerySqlServerMapper {
+
+    List<Map> getTableListByPage(Map<String, Object> parameter);
+
+    List<Map> getTableListAll(CommonQuery record);
+
+}

+ 120 - 0
src/main/java/com/izouma/awesomeadmin/dao/CommonQuerySqlServerMapper.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.izouma.awesomeadmin.dao.CommonQuerySqlServerMapper">
+
+
+    <select id="getTableListByPage" resultType="java.util.Map">
+
+        SELECT * FROM ${record.tableName}
+        <where>
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+            order by
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+
+        </if>
+
+    </select>
+
+    <select id="getTableListAll" resultType="java.util.Map">
+
+        SELECT * FROM ${tableName}
+        <where>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+            order by
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+
+        </if>
+
+    </select>
+
+
+</mapper>

+ 33 - 0
src/main/java/com/izouma/awesomeadmin/dao/QueryConfigMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.QueryConfig;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.QueryConfigMapper")
+public interface QueryConfigMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(QueryConfig record);
+
+    QueryConfig selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(QueryConfig record);
+
+    List<QueryConfig> queryAllQueryConfig(QueryConfig record);
+
+    List<QueryConfig> queryQueryConfigByPage(Map<String, Object> parameter);
+
+    int delete(String id);
+
+    QueryConfig queryQueryConfig(QueryConfig record);
+
+    List<QueryConfig> query(QueryConfig record);
+}
+

+ 281 - 0
src/main/java/com/izouma/awesomeadmin/dao/QueryConfigMapper.xml

@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.izouma.awesomeadmin.dao.QueryConfigMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.QueryConfig" >
+                <id column="id" property="id" jdbcType="INTEGER" />
+                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
+                                <result column="code" property="code" jdbcType="VARCHAR" />
+                                <result column="table_name" property="tableName" jdbcType="VARCHAR" />
+                                <result column="tableColumns" property="tablecolumns" jdbcType="VARCHAR" />
+                                <result column="dataBaseType" property="databasetype" jdbcType="VARCHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            code,
+
+            table_name,
+
+            tableColumns,
+
+            dataBaseType,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from query_config
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from query_config
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.QueryConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into query_config
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id!= null" >
+                id,
+            </if>
+                <if test="delFlag!= null" >
+                del_flag,
+            </if>
+                <if test="code!= null" >
+                code,
+            </if>
+                <if test="tableName!= null" >
+                table_name,
+            </if>
+                <if test="tablecolumns!= null" >
+                tableColumns,
+            </if>
+                <if test="databasetype!= null" >
+                dataBaseType,
+            </if>
+            </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+                    <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+                    <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </if>
+                    <if test="code != null" >
+                #{code,jdbcType=VARCHAR},
+            </if>
+                    <if test="tableName != null" >
+                #{tableName,jdbcType=VARCHAR},
+            </if>
+                    <if test="tablecolumns != null" >
+                #{tablecolumns,jdbcType=VARCHAR},
+            </if>
+                    <if test="databasetype != null" >
+                #{databasetype,jdbcType=VARCHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.QueryConfig" >
+        update query_config
+        <set >
+                    <if test="id != null" >
+               id= #{id,jdbcType=INTEGER},
+            </if>
+                     <if test="delFlag != null" >
+               del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+                     <if test="code != null" >
+               code= #{code,jdbcType=VARCHAR},
+            </if>
+                     <if test="tableName != null" >
+               table_name= #{tableName,jdbcType=VARCHAR},
+            </if>
+                     <if test="tablecolumns != null" >
+               tableColumns= #{tablecolumns,jdbcType=VARCHAR},
+            </if>
+                     <if test="databasetype != null" >
+               dataBaseType= #{databasetype,jdbcType=VARCHAR},
+            </if>
+                 </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <select id="queryQueryConfigByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QueryConfig">
+        select <include refid="Base_Column_List"/> from query_config
+        <where>
+            and del_flag = 'N'
+                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and  id = #{record.id}
+            </if>
+                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and  del_flag = #{record.delFlag}
+            </if>
+                     <if test="record.code != null and !&quot;&quot;.equals(record.code)">
+                and  code = #{record.code}
+            </if>
+                     <if test="record.tableName != null and !&quot;&quot;.equals(record.tableName)">
+                and  table_name = #{record.tableName}
+            </if>
+                     <if test="record.tablecolumns != null and !&quot;&quot;.equals(record.tablecolumns)">
+                and  tableColumns = #{record.tablecolumns}
+            </if>
+                     <if test="record.databasetype != null and !&quot;&quot;.equals(record.databasetype)">
+                and  dataBaseType = #{record.databasetype}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                OR  code LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  table_name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  tableColumns LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  dataBaseType LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by id desc
+    </select>
+    <select id="queryAllQueryConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QueryConfig">
+        select <include refid="Base_Column_List"/> from query_config
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and  id = #{id}
+            </if>
+                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and  del_flag = #{delFlag}
+            </if>
+                    <if test="code != null and !&quot;&quot;.equals(code)">
+                and  code = #{code}
+            </if>
+                    <if test="tableName != null and !&quot;&quot;.equals(tableName)">
+                and  table_name = #{tableName}
+            </if>
+                    <if test="tablecolumns != null and !&quot;&quot;.equals(tablecolumns)">
+                and  tableColumns = #{tablecolumns}
+            </if>
+                    <if test="databasetype != null and !&quot;&quot;.equals(databasetype)">
+                and  dataBaseType = #{databasetype}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                OR  code LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  table_name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  tableColumns LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  dataBaseType LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by id desc
+    </select>
+    <select id="queryQueryConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QueryConfig">
+        select <include refid="Base_Column_List"/> from query_config
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+                     <if test="code != null and !&quot;&quot;.equals(code)">
+                and code = #{code}
+            </if>
+                     <if test="tableName != null and !&quot;&quot;.equals(tableName)">
+                and table_name = #{tableName}
+            </if>
+                     <if test="tablecolumns != null and !&quot;&quot;.equals(tablecolumns)">
+                and tableColumns = #{tablecolumns}
+            </if>
+                     <if test="databasetype != null and !&quot;&quot;.equals(databasetype)">
+                and dataBaseType = #{databasetype}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE query_config SET del_flag = 'Y'
+        <where>
+            AND id = #{id}
+        </where>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QueryConfig">
+        select <include refid="Base_Column_List"/> from query_config
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
+</mapper>
+

+ 8 - 2
src/main/java/com/izouma/awesomeadmin/interceptor/PageInterceptor.java

@@ -65,7 +65,11 @@ public class PageInterceptor implements Interceptor {
 
             if ("SqlServer".equals(getDataBaseType(connection))) {
 
-                String baseSql = sql.substring(0, sql.toUpperCase().lastIndexOf("ORDER"));
+                String baseSql = sql;
+                if (sql.toUpperCase().lastIndexOf("ORDER") > 0) {
+
+                    baseSql = sql.substring(0, sql.toUpperCase().lastIndexOf("ORDER"));
+                }
 
                 countSql = "select count(1) from (" + baseSql + ") aliasForPage";
 
@@ -84,7 +88,9 @@ public class PageInterceptor implements Interceptor {
             String pageSql = sql + " limit " + page.getDbIndex() + "," + page.getDbNumber();
 
             if ("SqlServer".equals(getDataBaseType(connection))) {
-
+                if (sql.toUpperCase().lastIndexOf("ORDER") < 0) {
+                    sql += " ORDER BY id ";
+                }
                 //改造后带分页查询的SQL语句
                 pageSql = sql + " offset " + page.getDbIndex() + " row fetch next " + page.getDbNumber() + " row only ";
 

+ 56 - 0
src/main/java/com/izouma/awesomeadmin/model/CommonQuery.java

@@ -0,0 +1,56 @@
+package com.izouma.awesomeadmin.model;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CommonQuery {
+
+    private String tableName;
+    /**
+     * and_,test_name_,like_,value_;or_,remark_,=_,123
+     */
+    private String advancedQuery;
+
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
+
+    private String databasetype;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
+
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
+
+    public String getOrderByStr() {
+        return orderByStr;
+    }
+
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
+
+    public String getDatabasetype() {
+        return databasetype;
+    }
+
+    public void setDatabasetype(String databasetype) {
+        this.databasetype = databasetype;
+    }
+}
+

+ 84 - 0
src/main/java/com/izouma/awesomeadmin/model/QueryConfig.java

@@ -0,0 +1,84 @@
+package com.izouma.awesomeadmin.model;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class QueryConfig{
+    private Integer id;
+    private String delFlag;
+    private String code;
+    private String tableName;
+    private String tablecolumns;
+    private String databasetype;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public String getCode(){
+        return this.code;
+    }
+
+    public void setCode(String code){
+        this.code = code;
+    }
+    public String getTableName(){
+        return this.tableName;
+    }
+
+    public void setTableName(String tableName){
+        this.tableName = tableName;
+    }
+    public String getTablecolumns(){
+        return this.tablecolumns;
+    }
+
+    public void setTablecolumns(String tablecolumns){
+        this.tablecolumns = tablecolumns;
+    }
+    public String getDatabasetype(){
+        return this.databasetype;
+    }
+
+    public void setDatabasetype(String databasetype){
+        this.databasetype = databasetype;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+}
+

+ 21 - 0
src/main/java/com/izouma/awesomeadmin/service/CommonQueryService.java

@@ -0,0 +1,21 @@
+package com.izouma.awesomeadmin.service;
+
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.CommonQuery;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * service接口类
+ */
+public interface CommonQueryService {
+
+
+    List<Map> getTableListByPage(Page page, CommonQuery record);
+
+    List<Map> getTableListAll(CommonQuery record);
+
+}
+

+ 27 - 0
src/main/java/com/izouma/awesomeadmin/service/QueryConfigService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.QueryConfig;
+
+
+/**
+*  service接口类
+*/
+public interface QueryConfigService{
+
+    List<QueryConfig> getQueryConfigList(QueryConfig record);
+
+    List<QueryConfig> getQueryConfigByPage(Page page, QueryConfig record);
+
+    QueryConfig getQueryConfigById(String id);
+
+    QueryConfig getQueryConfig(QueryConfig record);
+
+    boolean createQueryConfig(QueryConfig record);
+
+    boolean deleteQueryConfig(String id);
+
+    boolean updateQueryConfig(QueryConfig record);
+}
+

+ 77 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/CommonQueryServiceImpl.java

@@ -0,0 +1,77 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dao.CommonQueryMapper;
+import com.izouma.awesomeadmin.dao.CommonQuerySqlServerMapper;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.CommonQuery;
+import com.izouma.awesomeadmin.service.CommonQueryService;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * service接口实现类
+ */
+@Service
+public class CommonQueryServiceImpl implements CommonQueryService {
+
+    private static Logger logger = Logger.getLogger(CommonQueryServiceImpl.class);
+
+    @Autowired
+    private CommonQueryMapper commonQueryMapper;
+
+    @Autowired
+    private CommonQuerySqlServerMapper cmmonQuerySqlServerMapper;
+
+    @Override
+    public List<Map> getTableListByPage(Page page, CommonQuery record) {
+
+        logger.info("getTableListByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            if ("Mysql".equals(record.getDatabasetype())) {
+                return commonQueryMapper.getTableListByPage(parameter);
+            } else if ("SqlServer".equals(record.getDatabasetype())) {
+                return cmmonQuerySqlServerMapper.getTableListByPage(parameter);
+            }
+
+
+        } catch (Exception e) {
+            logger.error("getTableListByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<Map> getTableListAll(CommonQuery record) {
+
+        logger.info("getTableListAll");
+        try {
+
+            if ("Mysql".equals(record.getDatabasetype())) {
+
+                return commonQueryMapper.getTableListAll(record);
+            } else if ("SqlServer".equals(record.getDatabasetype())) {
+                return cmmonQuerySqlServerMapper.getTableListAll(record);
+            }
+
+
+        } catch (Exception e) {
+            logger.error("getTableListAll", e);
+        }
+
+        return null;
+    }
+
+}
+

+ 137 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/QueryConfigServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.QueryConfig;
+import com.izouma.awesomeadmin.service.QueryConfigService;
+import com.izouma.awesomeadmin.dao.QueryConfigMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class QueryConfigServiceImpl implements QueryConfigService{
+
+    private static Logger logger = Logger.getLogger(QueryConfigServiceImpl.class);
+
+    @Autowired
+    private QueryConfigMapper queryConfigMapper;
+
+    @Override
+    public List<QueryConfig> getQueryConfigList(QueryConfig record) {
+
+        logger.info("getQueryConfigList");
+        try {
+
+        return queryConfigMapper.queryAllQueryConfig(record);
+        } catch (Exception e) {
+        logger.error("getQueryConfigList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<QueryConfig> getQueryConfigByPage(Page page, QueryConfig record) {
+
+        logger.info("getQueryConfigByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return queryConfigMapper.queryQueryConfigByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getQueryConfigByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public QueryConfig getQueryConfigById(String id) {
+
+        logger.info("getQueryConfigyId");
+        try {
+
+            return queryConfigMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getQueryConfigById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public QueryConfig getQueryConfig(QueryConfig record) {
+
+        logger.info("getQueryConfig");
+        try {
+
+            return queryConfigMapper.queryQueryConfig(record);
+        } catch (Exception e) {
+        logger.error("getQueryConfig", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createQueryConfig(QueryConfig record) {
+
+        logger.info("createQueryConfig");
+        try {
+
+            int updates = queryConfigMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createQueryConfig", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteQueryConfig(String id) {
+
+        logger.info("deleteQueryConfig");
+        try {
+
+             int updates = queryConfigMapper.delete(id);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteQueryConfig", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateQueryConfig(QueryConfig record) {
+
+        logger.info("updateQueryConfig");
+        try {
+
+            int updates = queryConfigMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateQueryConfig", e);
+        }
+
+        return false;
+    }
+}
+

+ 2 - 0
src/main/java/com/izouma/awesomeadmin/shiro/MyExceptionResolver.java

@@ -19,6 +19,8 @@ public class MyExceptionResolver implements HandlerExceptionResolver {
         } else if (e instanceof UnauthenticatedException) {
             mav.addObject("error", "未登录");
             mav.addObject("code", 10001);
+        }else {
+            e.printStackTrace();
         }
         mav.addObject("success", false);
         return mav;

+ 58 - 0
src/main/java/com/izouma/awesomeadmin/web/CommonQueryController.java

@@ -0,0 +1,58 @@
+package com.izouma.awesomeadmin.web;
+
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.CommonQuery;
+import com.izouma.awesomeadmin.service.CommonQueryService;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * controller类
+ */
+@Controller
+@RequestMapping("/commonQuery")
+public class CommonQueryController extends BaseController {
+
+    @Autowired
+    private CommonQueryService commonQueryService;
+
+    /**
+     * <p>获取全部记录。</p>
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(CommonQuery record) {
+        List<Map> pp = commonQueryService.getTableListAll(record);
+        return new Result(true, pp);
+    }
+
+
+    /**
+     * <p>分页查询。</p>
+     */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, CommonQuery record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<Map> pp = commonQueryService.getTableListByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+}
+

+ 157 - 0
src/main/java/com/izouma/awesomeadmin/web/QueryConfigController.java

@@ -0,0 +1,157 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.QueryConfig;
+import com.izouma.awesomeadmin.service.QueryConfigService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/queryConfig")
+public class QueryConfigController extends BaseController{
+
+    @Autowired
+    private QueryConfigService queryConfigService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(QueryConfig record) {
+        List<QueryConfig> pp = queryConfigService.getQueryConfigList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getQueryConfig", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getQueryConfig(@RequestParam(required = false, value = "id") String id) {
+        QueryConfig data = queryConfigService.getQueryConfigById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(QueryConfig record) {
+        QueryConfig data = queryConfigService.getQueryConfig(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, QueryConfig record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<QueryConfig> pp =queryConfigService.getQueryConfigByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(QueryConfig record) {
+        boolean num = queryConfigService.createQueryConfig(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateQueryConfig(QueryConfig record) {
+        boolean num = queryConfigService.updateQueryConfig(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteQueryConfig(@RequestParam(required = true, value = "id") String id) {
+
+        boolean num = queryConfigService.deleteQueryConfig(id);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, QueryConfig record) throws Exception {
+
+    List<QueryConfig> queryConfigs = queryConfigService.getQueryConfigList(record);
+
+
+        String sheetName = "query_config";
+        String titleName = "通用查询配置数据表";
+        String fileName = "通用查询配置表";
+        int columnNumber = 6;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "code" ,   "表名" ,   "字段" ,   "数据库类型"  };
+        String[][] dataList = new String[queryConfigs.size()][6];
+
+        for (int i = 0; i < queryConfigs.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(queryConfigs.get(i).getId());
+                        dataList[i][1] = String.valueOf(queryConfigs.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(queryConfigs.get(i).getCode());
+                        dataList[i][3] = String.valueOf(queryConfigs.get(i).getTableName());
+                        dataList[i][4] = String.valueOf(queryConfigs.get(i).getTablecolumns());
+                        dataList[i][5] = String.valueOf(queryConfigs.get(i).getDatabasetype());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

+ 53 - 4
src/main/java/test/com/izouma/admintemplate/datasource/SQLServiceTest.java

@@ -3,19 +3,23 @@ package test.com.izouma.admintemplate.datasource;
 
 import com.izouma.awesomeadmin.datasource.DataService;
 import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.SqlServerTest;
-import com.izouma.awesomeadmin.model.SuperUser;
-import com.izouma.awesomeadmin.model.TestAaa;
-import com.izouma.awesomeadmin.model.Zouma;
+import com.izouma.awesomeadmin.model.*;
+import com.izouma.awesomeadmin.service.CommonQueryService;
 import com.izouma.awesomeadmin.service.SuperUserService;
 import com.izouma.awesomeadmin.service.TestAaaService;
+import com.izouma.awesomeadmin.util.PropertiesFileLoader;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配置spring和junit整合,junit启动时加载springIOC容器
@@ -27,6 +31,8 @@ public class SQLServiceTest {
 
     @Autowired
     TestAaaService testAaaService;
+    @Autowired
+    CommonQueryService commonQueryService;
 
 
     @Test
@@ -42,6 +48,49 @@ public class SQLServiceTest {
     }
 
 
+    @Test
+    public void QueryTableTest() {
+        Page page = new Page();
+
+        page.setPageNumber(2);
+
+        CommonQuery commonQuery = new CommonQuery();
+
+        commonQuery.setTableName("test_aaa");
+        //commonQuery.setAdvancedQuery("and_,test_name_,like_,张");
+        commonQuery.setOrderByStr("test_name_,asc_;id_,desc");
+        commonQuery.setDatabasetype("Mysql");
+
+        List<Map> tablePage = commonQueryService.getTableListByPage(page, commonQuery);
+        List<Map> tableList = commonQueryService.getTableListAll(commonQuery);
+
+        System.out.println(tablePage);
+        System.out.println(tableList);
+
+    }
+
+    @Test
+    public void QuerySqlServerTableTest() {
+        Page page = new Page();
+
+        page.setPageNumber(2);
+
+        CommonQuery commonQuery = new CommonQuery();
+
+        commonQuery.setTableName("Table_兽医_药品信息");
+        //commonQuery.setAdvancedQuery("and_,test_name_,like_,张");
+        //commonQuery.setOrderByStr("test_name_,asc_;id_,desc");
+        commonQuery.setDatabasetype("SqlServer");
+
+        List<Map> tablePage = commonQueryService.getTableListByPage(page, commonQuery);
+        List<Map> tableList = commonQueryService.getTableListAll(commonQuery);
+
+        System.out.println(tablePage);
+        System.out.println(tableList);
+
+    }
+
+
 }
 
 

+ 137 - 0
src/main/vue/src/pages/CommonQuerys.vue

@@ -0,0 +1,137 @@
+<template>
+    <div>
+        <div class="filters-container">
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+            <el-table-column v-for="item in tableColumns" v-if="isColumnShow(item.value)" :prop="item.value" :label="item.label" min-width="100">
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+
+export default {
+    created() {
+        this.getTableBase();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            advancedQuerySearchKey: '',
+            tableColumns: [],
+            databasetype: 'Mysql',
+            tableName: ''
+
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        getTableBase() {
+
+            this.$http.get({
+                url: '/queryConfig/getOne',
+                data: {
+                    code: this.$route.query.code,
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    if (res.data) {
+
+                        this.tableName = res.data.tableName;
+                        this.databasetype = res.data.databasetype;
+
+                        this.tableColumns = [];
+                        var tableColumnsStr = res.data.tablecolumns;
+
+                        var columns = tableColumnsStr.split('_;');
+
+                        columns.forEach(element => {
+                            var items = element.split('_,');
+                            var temp = {
+                                label: items[0],
+                                value: items[1],
+                                show: true
+                            }
+
+                            this.tableColumns.push(temp);
+                        });
+
+                        this.getData();
+                    }
+
+                }
+            })
+        },
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+            this.$http.get({
+                url: '/commonQuery/page',
+                data: {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    tableName: this.tableName,
+                    databasetype: this.databasetype
+                }
+            }).then(res => {
+                if (res.success) {
+
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+
+    },
+    watch: {
+        $route() {
+            this.getTableBase()
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

+ 145 - 0
src/main/vue/src/pages/QueryConfig.vue

@@ -0,0 +1,145 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="databasetype" label="数据库">
+                <el-select placeholder="数据库" size="small" v-model="formData.databasetype" class="filter-item">
+                    <el-option label="Mysql" value="Mysql">
+                    </el-option>
+                    <el-option label="SqlServer" value="SqlServer">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="code" label="code">
+                <el-input v-model="formData.code"></el-input>
+            </el-form-item>
+            <el-form-item prop="tableName" label="表名">
+                <el-input v-model="formData.tableName"></el-input>
+            </el-form-item>
+            <el-form-item prop="tablecolumns" label="字段">
+                <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+                <el-table :data="tablecolumnsFields">
+
+                    <el-table-column prop="name" label="显示" align="center">
+                        <template slot-scope="{row}">
+                            <el-input v-model="row.label"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="value" label="字段" align="center">
+                        <template slot-scope="{row}">
+                            <el-input v-model="row.value"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column width="60" align="center">
+                        <template slot-scope="{ row, column, $index }">
+                            <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/queryConfig/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+                    this.formData = res.data;
+                }
+            })
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                databasetype: 'Mysql'
+            },
+            rules: {
+            },
+
+            tablecolumnsFields: [
+            ],
+            tablecoumnsStr: ''
+
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+
+            this.tablecoumnsStr = '';
+
+            if (this.tablecolumnsFields.length > 0) {
+
+                var templist = [];
+
+                this.tablecolumnsFields.forEach(item => {
+                    if (item.label && item.value) {
+                        var tempItem = item.label + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.tablecoumnsStr = templist.join('_;');
+
+                    this.formData.tablecolumns = this.tablecoumnsStr;
+
+                    var data = JSON.parse(JSON.stringify(this.formData));
+                    this.$http.post({
+                        url: this.formData.id ? '/queryConfig/update' : '/queryConfig/save',
+                        data: data
+                    }).then(res => {
+                        if (res.success) {
+                            this.$message.success('成功');
+                            this.$router.go(-1);
+                        } else {
+                            this.$message.warning('失败')
+                        }
+                    });
+                } else {
+                    this.$message.warning('请添加至少一个完整字段')
+                }
+            } else {
+                this.$message.warning('请添加字段')
+            }
+        },
+        addField() {
+            this.tablecolumnsFields.push({
+                label: '',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.tablecolumnsFields.length > 0) {
+                this.tablecolumnsFields.splice(i, 1);
+            }
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

+ 272 - 0
src/main/vue/src/pages/QueryConfigs.vue

@@ -0,0 +1,272 @@
+<template>
+    <div>
+        <div class="filters-container">
+
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="$router.push('/queryConfig')" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('code')" prop="code" label="code" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('tableName')" prop="tableName" label="表名" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('tablecolumns')" prop="tablecolumns" label="字段" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('databasetype')" prop="databasetype" label="数据库类型" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right">
+                <template slot-scope="scope">
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'code',
+                    value: 'code',
+                    show: true
+                },
+                {
+                    label: '表名',
+                    value: 'tableName',
+                    show: true
+                },
+                {
+                    label: '字段',
+                    value: 'tablecolumns',
+                    show: true
+                },
+                {
+                    label: '数据库类型',
+                    value: 'databasetype',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'code',
+                    value: 'code'
+                },
+                {
+                    label: '表名',
+                    value: 'table_name'
+                },
+                {
+                    label: '字段',
+                    value: 'tableColumns'
+                },
+                {
+                    label: '数据库类型',
+                    value: 'dataBaseType'
+                },
+            ],
+            advancedQuerySearchKey: '',
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+            this.$http.get({
+                url: '/queryConfig/page',
+                data: {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                }
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/queryConfig',
+                query: {
+                    id: row.id
+                }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/queryConfig/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

+ 15 - 0
src/main/vue/src/router/index.js

@@ -150,6 +150,21 @@ const router = new Router({
                     name: 'testAaa',
                     component: () => import('../pages/TestAaa')
                 },
+                {
+                    path: '/commonQuerys',
+                    name: 'commonQuerys',
+                    component: () => import('../pages/CommonQuerys')
+                },
+                {
+                    path: '/queryConfigs',
+                    name: 'queryConfigs',
+                    component: () => import('../pages/QueryConfigs')
+                },
+                {
+                    path: '/queryConfig',
+                    name: 'queryConfig',
+                    component: () => import('../pages/QueryConfig')
+                },
             ]
         },
         {