Browse Source

后台初始化

suochencheng 7 years ago
parent
commit
3bd55e4428
86 changed files with 6 additions and 10126 deletions
  1. 0 70
      src/main/java/com/izouma/awesomeadmin/activiti/CustomAuthenticationProvider.java
  2. 0 31
      src/main/java/com/izouma/awesomeadmin/activiti/CustomGroupEntityManager.java
  3. 0 24
      src/main/java/com/izouma/awesomeadmin/activiti/CustomGroupEntityManagerFactory.java
  4. 0 48
      src/main/java/com/izouma/awesomeadmin/activiti/CustomUserEntityManager.java
  5. 0 23
      src/main/java/com/izouma/awesomeadmin/activiti/CustomUserEntityManagerFactory.java
  6. 0 45
      src/main/java/com/izouma/awesomeadmin/activiti/RestFilter.java
  7. 0 31
      src/main/java/com/izouma/awesomeadmin/dao/DataMapper.java
  8. 0 35
      src/main/java/com/izouma/awesomeadmin/dao/DataMapper.xml
  9. 0 34
      src/main/java/com/izouma/awesomeadmin/dao/TableShouyiYaopinxinxiMapper.java
  10. 0 376
      src/main/java/com/izouma/awesomeadmin/dao/TableShouyiYaopinxinxiMapper.xml
  11. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/TestAaaMapper.java
  12. 0 331
      src/main/java/com/izouma/awesomeadmin/dao/TestAaaMapper.xml
  13. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/TestBbbCopyMapper.java
  14. 0 237
      src/main/java/com/izouma/awesomeadmin/dao/TestBbbCopyMapper.xml
  15. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/TestBbbMapper.java
  16. 0 281
      src/main/java/com/izouma/awesomeadmin/dao/TestBbbMapper.xml
  17. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/TestDeployMapper.java
  18. 0 212
      src/main/java/com/izouma/awesomeadmin/dao/TestDeployMapper.xml
  19. 0 34
      src/main/java/com/izouma/awesomeadmin/dao/TestSqlserverAaaMapper.java
  20. 0 228
      src/main/java/com/izouma/awesomeadmin/dao/TestSqlserverAaaMapper.xml
  21. 0 33
      src/main/java/com/izouma/awesomeadmin/dao/TestaaaoneMapper.java
  22. 0 235
      src/main/java/com/izouma/awesomeadmin/dao/TestaaaoneMapper.xml
  23. 0 23
      src/main/java/com/izouma/awesomeadmin/datasource/DataService.java
  24. 0 44
      src/main/java/com/izouma/awesomeadmin/datasource/DataServiceImpl.java
  25. 0 126
      src/main/java/com/izouma/awesomeadmin/model/TableShouyiYaopinxinxi.java
  26. 0 106
      src/main/java/com/izouma/awesomeadmin/model/TestAaa.java
  27. 0 85
      src/main/java/com/izouma/awesomeadmin/model/TestBbb.java
  28. 0 69
      src/main/java/com/izouma/awesomeadmin/model/TestBbbCopy.java
  29. 0 61
      src/main/java/com/izouma/awesomeadmin/model/TestDeploy.java
  30. 0 69
      src/main/java/com/izouma/awesomeadmin/model/TestSqlserverAaa.java
  31. 0 69
      src/main/java/com/izouma/awesomeadmin/model/Testaaaone.java
  32. 0 66
      src/main/java/com/izouma/awesomeadmin/model/Zouma.java
  33. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TableShouyiYaopinxinxiService.java
  34. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TestAaaService.java
  35. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TestBbbCopyService.java
  36. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TestBbbService.java
  37. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TestDeployService.java
  38. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TestSqlserverAaaService.java
  39. 0 27
      src/main/java/com/izouma/awesomeadmin/service/TestaaaoneService.java
  40. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TableShouyiYaopinxinxiServiceImpl.java
  41. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TestAaaServiceImpl.java
  42. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TestBbbCopyServiceImpl.java
  43. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TestBbbServiceImpl.java
  44. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TestDeployServiceImpl.java
  45. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TestSqlserverAaaServiceImpl.java
  46. 0 137
      src/main/java/com/izouma/awesomeadmin/service/impl/TestaaaoneServiceImpl.java
  47. 0 3
      src/main/java/com/izouma/awesomeadmin/shiro/UserPasswordRealm.java
  48. 0 1
      src/main/java/com/izouma/awesomeadmin/web/CommonQueryController.java
  49. 0 183
      src/main/java/com/izouma/awesomeadmin/web/DemoDataInitConfig.java
  50. 0 162
      src/main/java/com/izouma/awesomeadmin/web/TableShouyiYaopinxinxiController.java
  51. 0 158
      src/main/java/com/izouma/awesomeadmin/web/TestAaaController.java
  52. 0 157
      src/main/java/com/izouma/awesomeadmin/web/TestBbbController.java
  53. 0 155
      src/main/java/com/izouma/awesomeadmin/web/TestBbbCopyController.java
  54. 0 154
      src/main/java/com/izouma/awesomeadmin/web/TestDeployController.java
  55. 0 155
      src/main/java/com/izouma/awesomeadmin/web/TestSqlserverAaaController.java
  56. 0 155
      src/main/java/com/izouma/awesomeadmin/web/TestaaaoneController.java
  57. 0 105
      src/main/java/com/izouma/awesomeadmin/web/activiti/ModelController.java
  58. 0 82
      src/main/java/com/izouma/awesomeadmin/web/activiti/ProcessController.java
  59. 0 36
      src/main/java/org/activiti/conf/SecurityConfiguration.java
  60. 0 75
      src/main/java/org/activiti/explorer/DispatcherServletConfiguration.java
  61. 0 39
      src/main/java/org/activiti/explorer/FilterServletOutputStream.java
  62. 0 48
      src/main/java/org/activiti/explorer/GenericResponseWrapper.java
  63. 0 63
      src/main/java/org/activiti/explorer/JsonpCallbackFilter.java
  64. 4 20
      src/main/resources/properties/jdbc.properties
  65. 1 1
      src/main/resources/spring/applicationContext.xml
  66. 0 76
      src/main/resources/spring/beans-activiti.xml
  67. 0 15
      src/main/resources/spring/spring-mvc-modeler.xml
  68. 0 15
      src/main/resources/spring/spring-mvc-rest.xml
  69. 0 96
      src/main/vue/src/pages/TableShouyiYaopinxinxi.vue
  70. 0 426
      src/main/vue/src/pages/TableShouyiYaopinxinxis.vue
  71. 0 188
      src/main/vue/src/pages/TestAaa.vue
  72. 0 270
      src/main/vue/src/pages/TestAaaLineChart.vue
  73. 0 494
      src/main/vue/src/pages/TestAaas.vue
  74. 0 126
      src/main/vue/src/pages/TestBbb.vue
  75. 0 93
      src/main/vue/src/pages/TestBbbCopy.vue
  76. 0 325
      src/main/vue/src/pages/TestBbbCopys.vue
  77. 0 408
      src/main/vue/src/pages/TestBbbs.vue
  78. 0 87
      src/main/vue/src/pages/TestDeploy.vue
  79. 0 301
      src/main/vue/src/pages/TestDeploys.vue
  80. 0 190
      src/main/vue/src/pages/TestGenList.vue
  81. 0 98
      src/main/vue/src/pages/TestSqlserverAaa.vue
  82. 0 316
      src/main/vue/src/pages/TestSqlserverAaas.vue
  83. 0 101
      src/main/vue/src/pages/Testaaaone.vue
  84. 0 321
      src/main/vue/src/pages/Testaaaones.vue
  85. 0 75
      src/main/vue/src/router/index.js
  86. 1 47
      src/main/webapp/WEB-INF/web.xml

+ 0 - 70
src/main/java/com/izouma/awesomeadmin/activiti/CustomAuthenticationProvider.java

@@ -1,70 +0,0 @@
-package com.izouma.awesomeadmin.activiti;
-
-import com.izouma.awesomeadmin.model.UserInfo;
-import org.activiti.engine.IdentityService;
-import org.activiti.engine.identity.Group;
-import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-public class CustomAuthenticationProvider implements AuthenticationProvider {
-    @Autowired
-    private IdentityService identityService;
-
-    public CustomAuthenticationProvider() {
-    }
-
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        String name = authentication.getName();
-        String password = authentication.getCredentials().toString();
-        boolean authenticated = this.identityService.checkPassword(name, password);
-
-        UserInfo userInfo = null;
-        try {
-            userInfo = (UserInfo) SecurityUtils.getSubject().getPrincipal();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (userInfo == null) {
-
-        }
-
-        if (userInfo == null) {
-            throw new BadCredentialsException("Authentication failed for this username and password");
-        } else {
-            this.identityService.setAuthenticatedUserId(userInfo.getId().toString());
-        }
-
-
-        if (!authenticated) {
-            throw new BadCredentialsException("Authentication failed for this username and password");
-        } else {
-            List<Group> groups = this.identityService.createGroupQuery().groupMember(name).list();
-            Collection<GrantedAuthority> grantedAuthorities = new ArrayList();
-            Iterator var7 = groups.iterator();
-
-            while (var7.hasNext()) {
-                Group group = (Group) var7.next();
-                grantedAuthorities.add(new SimpleGrantedAuthority(group.getId()));
-            }
-
-            this.identityService.setAuthenticatedUserId(name);
-            return new UsernamePasswordAuthenticationToken(name, password, grantedAuthorities);
-        }
-    }
-
-    public boolean supports(Class<?> authentication) {
-        return authentication.equals(UsernamePasswordAuthenticationToken.class);
-    }
-}

+ 0 - 31
src/main/java/com/izouma/awesomeadmin/activiti/CustomGroupEntityManager.java

@@ -1,31 +0,0 @@
-package com.izouma.awesomeadmin.activiti;
-
-import com.izouma.awesomeadmin.model.SysRole;
-import com.izouma.awesomeadmin.model.UserInfo;
-import com.izouma.awesomeadmin.service.SysRoleService;
-import com.izouma.awesomeadmin.service.UserInfoService;
-import org.activiti.engine.identity.Group;
-import org.activiti.engine.impl.persistence.entity.GroupEntity;
-import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CustomGroupEntityManager extends GroupEntityManager {
-    @Autowired
-    private SysRoleService  sysRoleService;
-
-    @Override
-    public List<Group> findGroupsByUser(String userId) {
-        List<Group> groupList = new ArrayList<>();
-        for (SysRole sysRole : sysRoleService.getUserRoles(Integer.valueOf(userId))) {
-            Group group = new GroupEntity();
-            group.setId(sysRole.getId().toString());
-            group.setName(sysRole.getName());
-            group.setType("assignment");
-            groupList.add(group);
-        }
-        return groupList;
-    }
-}

+ 0 - 24
src/main/java/com/izouma/awesomeadmin/activiti/CustomGroupEntityManagerFactory.java

@@ -1,24 +0,0 @@
-package com.izouma.awesomeadmin.activiti;
-
-import org.activiti.engine.impl.interceptor.Session;
-import org.activiti.engine.impl.interceptor.SessionFactory;
-import org.activiti.engine.impl.persistence.entity.GroupIdentityManager;
-
-public class CustomGroupEntityManagerFactory implements SessionFactory {
-
-    private CustomGroupEntityManager customGroupEntityManager;
-
-    @Override
-    public Class<?> getSessionType() {
-        return GroupIdentityManager.class;
-    }
-
-    @Override
-    public Session openSession() {
-        return customGroupEntityManager;
-    }
-
-    public void setCustomGroupEntityManager(CustomGroupEntityManager customGroupEntityManager) {
-        this.customGroupEntityManager = customGroupEntityManager;
-    }
-}

+ 0 - 48
src/main/java/com/izouma/awesomeadmin/activiti/CustomUserEntityManager.java

@@ -1,48 +0,0 @@
-package com.izouma.awesomeadmin.activiti;
-
-import com.izouma.awesomeadmin.model.SysRole;
-import com.izouma.awesomeadmin.model.UserInfo;
-import com.izouma.awesomeadmin.service.SysRoleService;
-import com.izouma.awesomeadmin.service.UserInfoService;
-import org.activiti.engine.identity.Group;
-import org.activiti.engine.identity.User;
-import org.activiti.engine.impl.persistence.entity.GroupEntity;
-import org.activiti.engine.impl.persistence.entity.UserEntity;
-import org.activiti.engine.impl.persistence.entity.UserEntityManager;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CustomUserEntityManager extends UserEntityManager {
-
-    @Autowired
-    private UserInfoService userInfoService;
-    @Autowired
-    private SysRoleService sysRoleService;
-
-    @Override
-    public User findUserById(String userId) {
-        UserInfo userInfo = userInfoService.getUserInfoById(userId);
-        if (userInfo != null) {
-            User user = new UserEntity();
-            user.setId(userInfo.getId().toString());
-            user.setFirstName(userInfo.getUsername());
-            user.setLastName(userInfo.getNickname());
-        }
-        return null;
-    }
-
-    @Override
-    public List<Group> findGroupsByUser(String userId) {
-        List<Group> groupList = new ArrayList<>();
-        for (SysRole sysRole : sysRoleService.getUserRoles(Integer.valueOf(userId))) {
-            Group group = new GroupEntity();
-            group.setId(sysRole.getId().toString());
-            group.setName(sysRole.getName());
-            group.setType("assignment");
-            groupList.add(group);
-        }
-        return groupList;
-    }
-}

+ 0 - 23
src/main/java/com/izouma/awesomeadmin/activiti/CustomUserEntityManagerFactory.java

@@ -1,23 +0,0 @@
-package com.izouma.awesomeadmin.activiti;
-
-import org.activiti.engine.impl.interceptor.Session;
-import org.activiti.engine.impl.interceptor.SessionFactory;
-import org.activiti.engine.impl.persistence.entity.UserIdentityManager;
-
-public class CustomUserEntityManagerFactory implements SessionFactory {
-    private CustomUserEntityManager customUserEntityManager;
-
-    @Override
-    public Class<?> getSessionType() {
-        return UserIdentityManager.class;
-    }
-
-    @Override
-    public Session openSession() {
-        return customUserEntityManager;
-    }
-
-    public void setCustomUserEntityManager(CustomUserEntityManager customUserEntityManager) {
-        this.customUserEntityManager = customUserEntityManager;
-    }
-}

+ 0 - 45
src/main/java/com/izouma/awesomeadmin/activiti/RestFilter.java

@@ -1,45 +0,0 @@
-package com.izouma.awesomeadmin.activiti;
-
-import com.izouma.awesomeadmin.model.UserInfo;
-import org.activiti.engine.IdentityService;
-import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.springframework.web.filter.GenericFilterBean;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebFilter
-public class RestFilter extends GenericFilterBean {
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        try {
-            UserInfo userInfo = (UserInfo) SecurityUtils.getSubject().getPrincipal();
-            ServletContext context = servletRequest.getServletContext();
-            ApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(context);
-            IdentityService identityService = ctx.getBean(IdentityService.class);
-            identityService.setAuthenticatedUserId(userInfo.getId().toString());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        try {
-            HttpServletRequest request = (HttpServletRequest) servletRequest;
-            HttpServletResponse response = (HttpServletResponse) servletResponse;
-            response.addHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
-            response.addHeader("Access-Control-Allow-Methods", "*");
-            response.addHeader("Access-Control-Max-Age", "100");
-            response.addHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-            response.addHeader("Access-Control-Allow-Credentials", "true");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        filterChain.doFilter(servletRequest, servletResponse);
-    }
-}

+ 0 - 31
src/main/java/com/izouma/awesomeadmin/dao/DataMapper.java

@@ -1,31 +0,0 @@
-package com.izouma.awesomeadmin.dao;
-
-import com.izouma.awesomeadmin.datasource.DataSource;
-import com.izouma.awesomeadmin.model.SqlServerTest;
-import com.izouma.awesomeadmin.model.SuperUser;
-import com.izouma.awesomeadmin.model.Zouma;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@DataSource("dataSource")
-@Repository("com.izouma.awesomeadmin.dao.DataMapper")
-public interface DataMapper {
-
-    /**
-     * <p>获取用户列表。</p>
-     *
-     * @return TblUser list
-     */
-    // 不指定,则默认使用数据源1
-    List<SuperUser> queryAllUsers();
-
-    // 覆盖类上指定的,使用数据源2
-    @DataSource("dataSourceSlaver")
-    List<Zouma> queryZouma();
-
-    // 覆盖类上指定的,使用数据源2
-    @DataSource("dataSourceSqlserver")
-    List<SqlServerTest> getSqlServerTestByPage(Map<String, Object> parameter);
-}

+ 0 - 35
src/main/java/com/izouma/awesomeadmin/dao/DataMapper.xml

@@ -1,35 +0,0 @@
-<?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.DataMapper">
-    <sql id="columns">
-        user_id, power, password, user_name, profile, del_flag
-  	</sql>
-
-    <select id="queryAllUsers" resultType="com.izouma.awesomeadmin.model.SuperUser">
-        SELECT
-        <include refid="columns"/>
-        FROM super_user
-        where del_flag = 'N'
-        order by user_id
-        <!-- 为了测试只取100个 -->
-        <!-- LIMIT 100  -->
-    </select>
-
-
-    <select id="queryZouma" resultType="com.izouma.awesomeadmin.model.Zouma">
-        SELECT
-        *
-        FROM zouma
-        where del_flag = 0
-        order by id
-        <!-- 为了测试只取100个 -->
-        <!-- LIMIT 100  -->
-    </select>
-
-    <select id="getSqlServerTestByPage" resultType="com.izouma.awesomeadmin.model.SqlServerTest">
-        SELECT * FROM T_SYS_Depts where  id > 2  ORDER BY id
-
-    </select>
-
-</mapper>

+ 0 - 34
src/main/java/com/izouma/awesomeadmin/dao/TableShouyiYaopinxinxiMapper.java

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

+ 0 - 376
src/main/java/com/izouma/awesomeadmin/dao/TableShouyiYaopinxinxiMapper.xml

@@ -1,376 +0,0 @@
-<?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.TableShouyiYaopinxinxiMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi">
-                                    <id column="id" property="id" jdbcType="INTEGER"/>
-                                                                        <result column="药品编号" property="药品编号" jdbcType="VARCHAR"/>
-                                                            <result column="药品名称" property="药品名称" jdbcType="VARCHAR"/>
-                                                            <result column="计量单位" property="计量单位" jdbcType="VARCHAR"/>
-                                                            <result column="规格" property="规格" jdbcType="VARCHAR"/>
-                                                            <result column="主要成分" property="主要成分" jdbcType="VARCHAR"/>
-                                                            <result column="有效成分" property="有效成分" jdbcType="VARCHAR"/>
-                                                            <result column="单价" property="单价" jdbcType="DECIMAL"/>
-                                                            <result column="生产厂家" property="生产厂家" jdbcType="VARCHAR"/>
-                                                            <result column="药品制定部门" property="药品制定部门" jdbcType="VARCHAR"/>
-                                                            <result column="FlagColumn" property="flagcolumn" jdbcType="INTEGER"/>
-                        </resultMap>
-    <sql id="Base_Column_List">
-                    ID,                    药品编号,                    药品名称,                    计量单位,                    规格,                    主要成分,                    有效成分,                    单价,                    生产厂家,                    药品制定部门,                    FlagColumn            </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from Table_兽医_药品信息
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from Table_兽医_药品信息
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi"
-            useGeneratedKeys="true" keyProperty="id">
-        insert into Table_兽医_药品信息
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-                                                                            <if test="药品编号!= null">
-                        药品编号,
-                    </if>
-                                                                <if test="药品名称!= null">
-                        药品名称,
-                    </if>
-                                                                <if test="计量单位!= null">
-                        计量单位,
-                    </if>
-                                                                <if test="规格!= null">
-                        规格,
-                    </if>
-                                                                <if test="主要成分!= null">
-                        主要成分,
-                    </if>
-                                                                <if test="有效成分!= null">
-                        有效成分,
-                    </if>
-                                                                <if test="单价!= null">
-                        单价,
-                    </if>
-                                                                <if test="生产厂家!= null">
-                        生产厂家,
-                    </if>
-                                                                <if test="药品制定部门!= null">
-                        药品制定部门,
-                    </if>
-                                                                <if test="flagcolumn!= null">
-                        FlagColumn,
-                    </if>
-                                    </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-                                                                            <if test="药品编号 != null">
-                        #{药品编号,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="药品名称 != null">
-                        #{药品名称,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="计量单位 != null">
-                        #{计量单位,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="规格 != null">
-                        #{规格,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="主要成分 != null">
-                        #{主要成分,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="有效成分 != null">
-                        #{有效成分,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="单价 != null">
-                        #{单价,jdbcType=DECIMAL},
-                    </if>
-                                                                <if test="生产厂家 != null">
-                        #{生产厂家,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="药品制定部门 != null">
-                        #{药品制定部门,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="flagcolumn != null">
-                        #{flagcolumn,jdbcType=INTEGER},
-                    </if>
-                                    </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi">
-        update Table_兽医_药品信息
-        <set>
-                                                                            <if test="药品编号 != null">
-                        药品编号= #{药品编号,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="药品名称 != null">
-                        药品名称= #{药品名称,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="计量单位 != null">
-                        计量单位= #{计量单位,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="规格 != null">
-                        规格= #{规格,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="主要成分 != null">
-                        主要成分= #{主要成分,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="有效成分 != null">
-                        有效成分= #{有效成分,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="单价 != null">
-                        单价= #{单价,jdbcType=DECIMAL},
-                    </if>
-                                                                <if test="生产厂家 != null">
-                        生产厂家= #{生产厂家,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="药品制定部门 != null">
-                        药品制定部门= #{药品制定部门,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="flagcolumn != null">
-                        FlagColumn= #{flagcolumn,jdbcType=INTEGER},
-                    </if>
-                                    </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTableShouyiYaopinxinxiByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi">
-        select
-        <include refid="Base_Column_List"/>
-        from Table_兽医_药品信息
-        <where>
-            and FlagColumn = 0
-                            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                    and  ID = #{record.id}
-                </if>
-                            <if test="record.药品编号 != null and !&quot;&quot;.equals(record.药品编号)">
-                    and  药品编号 = #{record.药品编号}
-                </if>
-                            <if test="record.药品名称 != null and !&quot;&quot;.equals(record.药品名称)">
-                    and  药品名称 = #{record.药品名称}
-                </if>
-                            <if test="record.计量单位 != null and !&quot;&quot;.equals(record.计量单位)">
-                    and  计量单位 = #{record.计量单位}
-                </if>
-                            <if test="record.规格 != null and !&quot;&quot;.equals(record.规格)">
-                    and  规格 = #{record.规格}
-                </if>
-                            <if test="record.主要成分 != null and !&quot;&quot;.equals(record.主要成分)">
-                    and  主要成分 = #{record.主要成分}
-                </if>
-                            <if test="record.有效成分 != null and !&quot;&quot;.equals(record.有效成分)">
-                    and  有效成分 = #{record.有效成分}
-                </if>
-                            <if test="record.单价 != null and !&quot;&quot;.equals(record.单价)">
-                    and  单价 = #{record.单价}
-                </if>
-                            <if test="record.生产厂家 != null and !&quot;&quot;.equals(record.生产厂家)">
-                    and  生产厂家 = #{record.生产厂家}
-                </if>
-                            <if test="record.药品制定部门 != null and !&quot;&quot;.equals(record.药品制定部门)">
-                    and  药品制定部门 = #{record.药品制定部门}
-                </if>
-                            <if test="record.flagcolumn != null and !&quot;&quot;.equals(record.flagcolumn)">
-                    and  FlagColumn = #{record.flagcolumn}
-                </if>
-            
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                    OR  药品编号 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  药品名称 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  计量单位 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  规格 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  主要成分 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  有效成分 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  单价 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  生产厂家 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  药品制定部门 LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  FlagColumn 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="queryAllTableShouyiYaopinxinxi" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi">
-        select
-        <include refid="Base_Column_List"/>
-        from Table_兽医_药品信息
-        <where>
-            and FlagColumn = 0
-                            <if test="id != null and !&quot;&quot;.equals(id)">
-                    and  ID = #{id}
-                </if>
-                            <if test="药品编号 != null and !&quot;&quot;.equals(药品编号)">
-                    and  药品编号 = #{药品编号}
-                </if>
-                            <if test="药品名称 != null and !&quot;&quot;.equals(药品名称)">
-                    and  药品名称 = #{药品名称}
-                </if>
-                            <if test="计量单位 != null and !&quot;&quot;.equals(计量单位)">
-                    and  计量单位 = #{计量单位}
-                </if>
-                            <if test="规格 != null and !&quot;&quot;.equals(规格)">
-                    and  规格 = #{规格}
-                </if>
-                            <if test="主要成分 != null and !&quot;&quot;.equals(主要成分)">
-                    and  主要成分 = #{主要成分}
-                </if>
-                            <if test="有效成分 != null and !&quot;&quot;.equals(有效成分)">
-                    and  有效成分 = #{有效成分}
-                </if>
-                            <if test="单价 != null and !&quot;&quot;.equals(单价)">
-                    and  单价 = #{单价}
-                </if>
-                            <if test="生产厂家 != null and !&quot;&quot;.equals(生产厂家)">
-                    and  生产厂家 = #{生产厂家}
-                </if>
-                            <if test="药品制定部门 != null and !&quot;&quot;.equals(药品制定部门)">
-                    and  药品制定部门 = #{药品制定部门}
-                </if>
-                            <if test="flagcolumn != null and !&quot;&quot;.equals(flagcolumn)">
-                    and  FlagColumn = #{flagcolumn}
-                </if>
-            
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                    OR  药品编号 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  药品名称 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  计量单位 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  规格 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  主要成分 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  有效成分 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  单价 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  生产厂家 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  药品制定部门 LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  FlagColumn 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="queryTableShouyiYaopinxinxi" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi">
-        select top 1
-        <include refid="Base_Column_List"/>
-        from Table_兽医_药品信息
-        <where>
-            and FlagColumn = 0
-                            <if test="id != null and !&quot;&quot;.equals(id)">
-                    and ID = #{id}
-                </if>
-                            <if test="药品编号 != null and !&quot;&quot;.equals(药品编号)">
-                    and 药品编号 = #{药品编号}
-                </if>
-                            <if test="药品名称 != null and !&quot;&quot;.equals(药品名称)">
-                    and 药品名称 = #{药品名称}
-                </if>
-                            <if test="计量单位 != null and !&quot;&quot;.equals(计量单位)">
-                    and 计量单位 = #{计量单位}
-                </if>
-                            <if test="规格 != null and !&quot;&quot;.equals(规格)">
-                    and 规格 = #{规格}
-                </if>
-                            <if test="主要成分 != null and !&quot;&quot;.equals(主要成分)">
-                    and 主要成分 = #{主要成分}
-                </if>
-                            <if test="有效成分 != null and !&quot;&quot;.equals(有效成分)">
-                    and 有效成分 = #{有效成分}
-                </if>
-                            <if test="单价 != null and !&quot;&quot;.equals(单价)">
-                    and 单价 = #{单价}
-                </if>
-                            <if test="生产厂家 != null and !&quot;&quot;.equals(生产厂家)">
-                    and 生产厂家 = #{生产厂家}
-                </if>
-                            <if test="药品制定部门 != null and !&quot;&quot;.equals(药品制定部门)">
-                    and 药品制定部门 = #{药品制定部门}
-                </if>
-                            <if test="flagcolumn != null and !&quot;&quot;.equals(flagcolumn)">
-                    and FlagColumn = #{flagcolumn}
-                </if>
-            
-        </where>
-    </select>
-    <update id="delete">
-        UPDATE Table_兽医_药品信息 SET FlagColumn = 1
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi">
-        select
-        <include refid="Base_Column_List"/>
-        from Table_兽医_药品信息
-        <where>
-            and FlagColumn = 0
-                                                                                                                                                                                                                                                                                                                                        </where>
-        order by id desc
-    </select>
-</mapper>
-

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

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

+ 0 - 331
src/main/java/com/izouma/awesomeadmin/dao/TestAaaMapper.xml

@@ -1,331 +0,0 @@
-<?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.TestAaaMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestAaa" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="test_name" property="testName" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
-                                <result column="test_time" property="testTime" jdbcType="TIMESTAMP" />
-                                <result column="multi_select" property="multiSelect" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            test_name,
-
-            remark,
-
-            image_url,
-
-            test_time,
-
-            multi_select,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from test_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from test_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestAaa" useGeneratedKeys="true" keyProperty="id">
-        insert into test_aaa
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="testName!= null" >
-                test_name,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </if>
-                <if test="imageUrl!= null" >
-                image_url,
-            </if>
-                <if test="testTime!= null" >
-                test_time,
-            </if>
-                <if test="multiSelect!= null" >
-                multi_select,
-            </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="testName != null" >
-                #{testName,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="imageUrl != null" >
-                #{imageUrl,jdbcType=VARCHAR},
-            </if>
-                    <if test="testTime != null" >
-                #{testTime,jdbcType=TIMESTAMP},
-            </if>
-                    <if test="multiSelect != null" >
-                #{multiSelect,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestAaa" >
-        update test_aaa
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="testName != null" >
-               test_name= #{testName,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="imageUrl != null" >
-               image_url= #{imageUrl,jdbcType=VARCHAR},
-            </if>
-                     <if test="testTime != null" >
-               test_time= #{testTime,jdbcType=TIMESTAMP},
-            </if>
-                     <if test="multiSelect != null" >
-               multi_select= #{multiSelect,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTestAaaByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <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.testName != null and !&quot;&quot;.equals(record.testName)">
-                and  test_name = #{record.testName}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                     <if test="record.imageUrl != null and !&quot;&quot;.equals(record.imageUrl)">
-                and  image_url = #{record.imageUrl}
-            </if>
-                     <if test="record.testTime != null and !&quot;&quot;.equals(record.testTime)">
-                and  test_time = #{record.testTime}
-            </if>
-                     <if test="record.multiSelect != null and !&quot;&quot;.equals(record.multiSelect)">
-                and  multi_select = #{record.multiSelect}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                OR  test_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image_url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                                                                     OR  multi_select 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
-
-        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
-            <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>
-        id desc
-    </select>
-    <select id="queryAllTestAaa" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <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="testName != null and !&quot;&quot;.equals(testName)">
-                and  test_name = #{testName}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and  image_url = #{imageUrl}
-            </if>
-                    <if test="testTime != null and !&quot;&quot;.equals(testTime)">
-                and  test_time = #{testTime}
-            </if>
-                    <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
-                and  multi_select = #{multiSelect}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                OR  test_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image_url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                                                                                        OR  multi_select 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
-
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
-            <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
-                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                        ${itemDetail}
-                    </foreach>
-                </foreach>
-            </trim>
-            ,
-        </if>
-
-        id desc
-    </select>
-    <select id="queryTestAaa" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <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="testName != null and !&quot;&quot;.equals(testName)">
-                and test_name = #{testName}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-                     <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and image_url = #{imageUrl}
-            </if>
-                     <if test="testTime != null and !&quot;&quot;.equals(testTime)">
-                and test_time = #{testTime}
-            </if>
-                     <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
-                and multi_select = #{multiSelect}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE test_aaa SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestAaa">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </where>
-        order by id desc
-    </select>
-</mapper>
-

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

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

+ 0 - 237
src/main/java/com/izouma/awesomeadmin/dao/TestBbbCopyMapper.xml

@@ -1,237 +0,0 @@
-<?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.TestBbbCopyMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestBbbCopy" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="name_aaa" property="nameAaa" jdbcType="VARCHAR" />
-                                <result column="name_bbb" property="nameBbb" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            name_aaa,
-
-            name_bbb,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from test_bbb_copy
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from test_bbb_copy
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestBbbCopy" useGeneratedKeys="true" keyProperty="id">
-        insert into test_bbb_copy
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="nameAaa!= null" >
-                name_aaa,
-            </if>
-                <if test="nameBbb!= null" >
-                name_bbb,
-            </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="nameAaa != null" >
-                #{nameAaa,jdbcType=VARCHAR},
-            </if>
-                    <if test="nameBbb != null" >
-                #{nameBbb,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestBbbCopy" >
-        update test_bbb_copy
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="nameAaa != null" >
-               name_aaa= #{nameAaa,jdbcType=VARCHAR},
-            </if>
-                     <if test="nameBbb != null" >
-               name_bbb= #{nameBbb,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTestBbbCopyByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbbCopy">
-        select <include refid="Base_Column_List"/> from test_bbb_copy
-        <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.nameAaa != null and !&quot;&quot;.equals(record.nameAaa)">
-                and  name_aaa = #{record.nameAaa}
-            </if>
-                     <if test="record.nameBbb != null and !&quot;&quot;.equals(record.nameBbb)">
-                and  name_bbb = #{record.nameBbb}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                               OR  del_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_aaa LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_bbb 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="queryAllTestBbbCopy" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbbCopy">
-        select <include refid="Base_Column_List"/> from test_bbb_copy
-        <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="nameAaa != null and !&quot;&quot;.equals(nameAaa)">
-                and  name_aaa = #{nameAaa}
-            </if>
-                    <if test="nameBbb != null and !&quot;&quot;.equals(nameBbb)">
-                and  name_bbb = #{nameBbb}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                OR  del_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_aaa LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_bbb 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="queryTestBbbCopy" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbbCopy">
-        select <include refid="Base_Column_List"/> from test_bbb_copy
-        <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="nameAaa != null and !&quot;&quot;.equals(nameAaa)">
-                and name_aaa = #{nameAaa}
-            </if>
-                     <if test="nameBbb != null and !&quot;&quot;.equals(nameBbb)">
-                and name_bbb = #{nameBbb}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE test_bbb_copy SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbbCopy">
-        select <include refid="Base_Column_List"/> from test_bbb_copy
-        <where>
-            and del_flag = 'N'
-                                                                                                                                    </where>
-        order by id desc
-    </select>
-</mapper>
-

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

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

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

@@ -1,281 +0,0 @@
-<?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.TestBbbMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestBbb" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="name_aaa" property="nameAaa" jdbcType="VARCHAR" />
-                                <result column="name_bbb" property="nameBbb" jdbcType="VARCHAR" />
-                                <result column="name_ccc" property="nameCcc" jdbcType="VARCHAR" />
-                                <result column="name_ddd" property="nameDdd" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            name_aaa,
-
-            name_bbb,
-
-            name_ccc,
-
-            name_ddd,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from test_bbb
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from test_bbb
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestBbb" useGeneratedKeys="true" keyProperty="id">
-        insert into test_bbb
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="nameAaa!= null" >
-                name_aaa,
-            </if>
-                <if test="nameBbb!= null" >
-                name_bbb,
-            </if>
-                <if test="nameCcc!= null" >
-                name_ccc,
-            </if>
-                <if test="nameDdd!= null" >
-                name_ddd,
-            </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="nameAaa != null" >
-                #{nameAaa,jdbcType=VARCHAR},
-            </if>
-                    <if test="nameBbb != null" >
-                #{nameBbb,jdbcType=VARCHAR},
-            </if>
-                    <if test="nameCcc != null" >
-                #{nameCcc,jdbcType=VARCHAR},
-            </if>
-                    <if test="nameDdd != null" >
-                #{nameDdd,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestBbb" >
-        update test_bbb
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="nameAaa != null" >
-               name_aaa= #{nameAaa,jdbcType=VARCHAR},
-            </if>
-                     <if test="nameBbb != null" >
-               name_bbb= #{nameBbb,jdbcType=VARCHAR},
-            </if>
-                     <if test="nameCcc != null" >
-               name_ccc= #{nameCcc,jdbcType=VARCHAR},
-            </if>
-                     <if test="nameDdd != null" >
-               name_ddd= #{nameDdd,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTestBbbByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
-        select <include refid="Base_Column_List"/> from test_bbb
-        <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.nameAaa != null and !&quot;&quot;.equals(record.nameAaa)">
-                and  name_aaa = #{record.nameAaa}
-            </if>
-                     <if test="record.nameBbb != null and !&quot;&quot;.equals(record.nameBbb)">
-                and  name_bbb = #{record.nameBbb}
-            </if>
-                     <if test="record.nameCcc != null and !&quot;&quot;.equals(record.nameCcc)">
-                and  name_ccc = #{record.nameCcc}
-            </if>
-                     <if test="record.nameDdd != null and !&quot;&quot;.equals(record.nameDdd)">
-                and  name_ddd = #{record.nameDdd}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                OR  name_aaa LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_bbb LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_ccc LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_ddd 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="queryAllTestBbb" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
-        select <include refid="Base_Column_List"/> from test_bbb
-        <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="nameAaa != null and !&quot;&quot;.equals(nameAaa)">
-                and  name_aaa = #{nameAaa}
-            </if>
-                    <if test="nameBbb != null and !&quot;&quot;.equals(nameBbb)">
-                and  name_bbb = #{nameBbb}
-            </if>
-                    <if test="nameCcc != null and !&quot;&quot;.equals(nameCcc)">
-                and  name_ccc = #{nameCcc}
-            </if>
-                    <if test="nameDdd != null and !&quot;&quot;.equals(nameDdd)">
-                and  name_ddd = #{nameDdd}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                OR  name_aaa LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_bbb LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_ccc LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_ddd 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="queryTestBbb" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
-        select <include refid="Base_Column_List"/> from test_bbb
-        <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="nameAaa != null and !&quot;&quot;.equals(nameAaa)">
-                and name_aaa = #{nameAaa}
-            </if>
-                     <if test="nameBbb != null and !&quot;&quot;.equals(nameBbb)">
-                and name_bbb = #{nameBbb}
-            </if>
-                     <if test="nameCcc != null and !&quot;&quot;.equals(nameCcc)">
-                and name_ccc = #{nameCcc}
-            </if>
-                     <if test="nameDdd != null and !&quot;&quot;.equals(nameDdd)">
-                and name_ddd = #{nameDdd}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE test_bbb SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
-        select <include refid="Base_Column_List"/> from test_bbb
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

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

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

+ 0 - 212
src/main/java/com/izouma/awesomeadmin/dao/TestDeployMapper.xml

@@ -1,212 +0,0 @@
-<?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.TestDeployMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestDeploy" >
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-        <result column="name" property="name" jdbcType="VARCHAR" />
-    </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-        id,
-
-        del_flag,
-
-        name,
-
-        </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from test_deploy
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from test_deploy
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestDeploy" useGeneratedKeys="true" keyProperty="id">
-        insert into test_deploy
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-            <if test="id!= null" >
-                id,
-            </if>
-            <if test="delFlag!= null" >
-                del_flag,
-            </if>
-            <if test="name!= null" >
-                name,
-            </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="name != null" >
-                #{name,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestDeploy" >
-        update test_deploy
-        <set >
-            <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-            <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="name != null" >
-               name= #{name,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTestDeployByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestDeploy">
-        select <include refid="Base_Column_List"/> from test_deploy
-        <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.name != null and !&quot;&quot;.equals(record.name)">
-                and  name = #{record.name}
-            </if>
-         <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                 OR  name 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="queryAllTestDeploy" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestDeploy">
-        select <include refid="Base_Column_List"/> from test_deploy
-        <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="name != null and !&quot;&quot;.equals(name)">
-                and  name = #{name}
-            </if>
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                            OR  name 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="queryTestDeploy" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestDeploy">
-        select <include refid="Base_Column_List"/> from test_deploy
-        <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="name != null and !&quot;&quot;.equals(name)">
-                and name = #{name}
-            </if>
-
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE test_deploy SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestDeploy">
-        select <include refid="Base_Column_List"/> from test_deploy
-        <where>
-            and del_flag = 'N'
-        </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 34
src/main/java/com/izouma/awesomeadmin/dao/TestSqlserverAaaMapper.java

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

+ 0 - 228
src/main/java/com/izouma/awesomeadmin/dao/TestSqlserverAaaMapper.xml

@@ -1,228 +0,0 @@
-<?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.TestSqlserverAaaMapper">
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.TestSqlserverAaa">
-                                    <id column="id" property="id" jdbcType="INTEGER"/>
-                                                                        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-                                                            <result column="name_aaa" property="nameAaa" jdbcType="VARCHAR"/>
-                                                            <result column="name_bbb" property="nameBbb" jdbcType="VARCHAR"/>
-                        </resultMap>
-    <sql id="Base_Column_List">
-                    id,                    del_flag,                    name_aaa,                    name_bbb            </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
-        select
-        <include refid="Base_Column_List"/>
-        from test_sqlserver_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from test_sqlserver_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.TestSqlserverAaa"
-            useGeneratedKeys="true" keyProperty="id">
-        insert into test_sqlserver_aaa
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-                                                                            <if test="delFlag!= null">
-                        del_flag,
-                    </if>
-                                                                <if test="nameAaa!= null">
-                        name_aaa,
-                    </if>
-                                                                <if test="nameBbb!= null">
-                        name_bbb,
-                    </if>
-                                    </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-                                                                            <if test="delFlag != null">
-                        #{delFlag,jdbcType=CHAR},
-                    </if>
-                                                                <if test="nameAaa != null">
-                        #{nameAaa,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="nameBbb != null">
-                        #{nameBbb,jdbcType=VARCHAR},
-                    </if>
-                                    </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.TestSqlserverAaa">
-        update test_sqlserver_aaa
-        <set>
-                                                                            <if test="delFlag != null">
-                        del_flag= #{delFlag,jdbcType=CHAR},
-                    </if>
-                                                                <if test="nameAaa != null">
-                        name_aaa= #{nameAaa,jdbcType=VARCHAR},
-                    </if>
-                                                                <if test="nameBbb != null">
-                        name_bbb= #{nameBbb,jdbcType=VARCHAR},
-                    </if>
-                                    </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTestSqlserverAaaByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.TestSqlserverAaa">
-        select
-        <include refid="Base_Column_List"/>
-        from test_sqlserver_aaa
-        <where>
-            and 1 = 1
-                            <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.nameAaa != null and !&quot;&quot;.equals(record.nameAaa)">
-                    and  name_aaa = #{record.nameAaa}
-                </if>
-                            <if test="record.nameBbb != null and !&quot;&quot;.equals(record.nameBbb)">
-                    and  name_bbb = #{record.nameBbb}
-                </if>
-            
-            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                    OR  del_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  name_aaa LIKE concat('%',#{record.searchKey},'%')
-                                                                                                OR  name_bbb 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="queryAllTestSqlserverAaa" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.TestSqlserverAaa">
-        select
-        <include refid="Base_Column_List"/>
-        from test_sqlserver_aaa
-        <where>
-            and 1 = 1
-                            <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="nameAaa != null and !&quot;&quot;.equals(nameAaa)">
-                    and  name_aaa = #{nameAaa}
-                </if>
-                            <if test="nameBbb != null and !&quot;&quot;.equals(nameBbb)">
-                    and  name_bbb = #{nameBbb}
-                </if>
-            
-            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                    OR  del_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  name_aaa LIKE concat('%',#{searchKey},'%')
-                                                                                                OR  name_bbb 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="queryTestSqlserverAaa" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.TestSqlserverAaa">
-        select top 1
-        <include refid="Base_Column_List"/>
-        from test_sqlserver_aaa
-        <where>
-            and 1 = 1
-                            <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="nameAaa != null and !&quot;&quot;.equals(nameAaa)">
-                    and name_aaa = #{nameAaa}
-                </if>
-                            <if test="nameBbb != null and !&quot;&quot;.equals(nameBbb)">
-                    and name_bbb = #{nameBbb}
-                </if>
-            
-        </where>
-    </select>
-    <delete id="delete" >
-        delete from test_sqlserver_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestSqlserverAaa">
-        select
-        <include refid="Base_Column_List"/>
-        from test_sqlserver_aaa
-        <where>
-            and 1 = 1
-                                                                                                                                    </where>
-        order by id desc
-    </select>
-</mapper>
-

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

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

+ 0 - 235
src/main/java/com/izouma/awesomeadmin/dao/TestaaaoneMapper.xml

@@ -1,235 +0,0 @@
-<?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.TestaaaoneMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.Testaaaone" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="test_name" property="testName" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            test_name,
-
-            remark,
-
-            </trim>
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-        select
-        <include refid="Base_Column_List" />
-        from test_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-        delete from test_aaa
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.Testaaaone" useGeneratedKeys="true" keyProperty="id">
-        insert into test_aaa
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
-                id,
-            </if>
-                <if test="delFlag!= null" >
-                del_flag,
-            </if>
-                <if test="testName!= null" >
-                test_name,
-            </if>
-                <if test="remark!= null" >
-                remark,
-            </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="testName != null" >
-                #{testName,jdbcType=VARCHAR},
-            </if>
-                    <if test="remark != null" >
-                #{remark,jdbcType=VARCHAR},
-            </if>
-                </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.Testaaaone" >
-        update test_aaa
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
-            </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
-            </if>
-                     <if test="testName != null" >
-               test_name= #{testName,jdbcType=VARCHAR},
-            </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                 </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <select id="queryTestaaaoneByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Testaaaone">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <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.testName != null and !&quot;&quot;.equals(record.testName)">
-                and  test_name = #{record.testName}
-            </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
-            </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                OR  test_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark 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="queryAllTestaaaone" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Testaaaone">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <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="testName != null and !&quot;&quot;.equals(testName)">
-                and  test_name = #{testName}
-            </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
-            </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                OR  test_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark 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="queryTestaaaone" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Testaaaone">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <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="testName != null and !&quot;&quot;.equals(testName)">
-                and test_name = #{testName}
-            </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and remark = #{remark}
-            </if>
-         
-        </where>
-        LIMIT 1
-    </select>
-    <update id="delete">
-        UPDATE test_aaa SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
-    </update>
-    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Testaaaone">
-        select <include refid="Base_Column_List"/> from test_aaa
-        <where>
-            and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
-        order by id desc
-    </select>
-</mapper>
-

+ 0 - 23
src/main/java/com/izouma/awesomeadmin/datasource/DataService.java

@@ -1,23 +0,0 @@
-package com.izouma.awesomeadmin.datasource;
-
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.SqlServerTest;
-import com.izouma.awesomeadmin.model.SuperUser;
-import com.izouma.awesomeadmin.model.Zouma;
-
-import java.util.List;
-
-public interface DataService {
-
-    /**
-     * <p>获取所有用户记录。</p>
-     *
-     * @return tblUser list
-     */
-    List<SuperUser> getSuperUserList();
-
-    List<Zouma> getZoumaList();
-
-    List<SqlServerTest> getSqlServerTestByPage(Page page);
-
-}

+ 0 - 44
src/main/java/com/izouma/awesomeadmin/datasource/DataServiceImpl.java

@@ -1,44 +0,0 @@
-package com.izouma.awesomeadmin.datasource;
-
-import com.izouma.awesomeadmin.constant.AppConstant;
-import com.izouma.awesomeadmin.dao.DataMapper;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.SqlServerTest;
-import com.izouma.awesomeadmin.model.SuperUser;
-import com.izouma.awesomeadmin.model.Zouma;
-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
-// 默认DataServiceImpl下的所有方法均访问数据源1
-
-public class DataServiceImpl implements DataService {
-
-    @Autowired
-    private DataMapper dataMapper;
-
-    @Override
-    public List<SuperUser> getSuperUserList() {
-
-        return dataMapper.queryAllUsers();
-    }
-
-    @Override
-    public List<Zouma> getZoumaList() {
-        return dataMapper.queryZouma();
-    }
-
-    @Override
-
-    public List<SqlServerTest> getSqlServerTestByPage(Page page) {
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put(AppConstant.PAGE, page);
-
-        return dataMapper.getSqlServerTestByPage(parameter);
-    }
-
-}

+ 0 - 126
src/main/java/com/izouma/awesomeadmin/model/TableShouyiYaopinxinxi.java

@@ -1,126 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.math.BigDecimal;
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TableShouyiYaopinxinxi{
-    private Integer id;
-    private String 药品编号;
-    private String 药品名称;
-    private String 计量单位;
-    private String 规格;
-    private String 主要成分;
-    private String 有效成分;
-    private BigDecimal 单价;
-    private String 生产厂家;
-    private String 药品制定部门;
-    private Integer flagcolumn;
-
-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 get药品编号(){
-        return this.药品编号;
-    }
-
-    public void set药品编号(String 药品编号){
-        this.药品编号 = 药品编号;
-    }
-    public String get药品名称(){
-        return this.药品名称;
-    }
-
-    public void set药品名称(String 药品名称){
-        this.药品名称 = 药品名称;
-    }
-    public String get计量单位(){
-        return this.计量单位;
-    }
-
-    public void set计量单位(String 计量单位){
-        this.计量单位 = 计量单位;
-    }
-    public String get规格(){
-        return this.规格;
-    }
-
-    public void set规格(String 规格){
-        this.规格 = 规格;
-    }
-    public String get主要成分(){
-        return this.主要成分;
-    }
-
-    public void set主要成分(String 主要成分){
-        this.主要成分 = 主要成分;
-    }
-    public String get有效成分(){
-        return this.有效成分;
-    }
-
-    public void set有效成分(String 有效成分){
-        this.有效成分 = 有效成分;
-    }
-    public BigDecimal get单价(){
-        return this.单价;
-    }
-
-    public void set单价(BigDecimal 单价){
-        this.单价 = 单价;
-    }
-    public String get生产厂家(){
-        return this.生产厂家;
-    }
-
-    public void set生产厂家(String 生产厂家){
-        this.生产厂家 = 生产厂家;
-    }
-    public String get药品制定部门(){
-        return this.药品制定部门;
-    }
-
-    public void set药品制定部门(String 药品制定部门){
-        this.药品制定部门 = 药品制定部门;
-    }
-    public Integer getFlagcolumn(){
-        return this.flagcolumn;
-    }
-
-    public void setFlagcolumn(Integer flagcolumn){
-        this.flagcolumn = flagcolumn;
-    }
-
-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;
-}
-
-}
-

+ 0 - 106
src/main/java/com/izouma/awesomeadmin/model/TestAaa.java

@@ -1,106 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TestAaa{
-    private Integer id;
-    private String delFlag;
-    private String testName;
-    private String remark;
-    private String imageUrl;
-    private Date testTime;
-    private String multiSelect;
-
-private String searchKey;
-
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
-
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
-
-    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 getTestName(){
-        return this.testName;
-    }
-
-    public void setTestName(String testName){
-        this.testName = testName;
-    }
-    public String getRemark(){
-        return this.remark;
-    }
-
-    public void setRemark(String remark){
-        this.remark = remark;
-    }
-    public String getImageUrl(){
-        return this.imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl){
-        this.imageUrl = imageUrl;
-    }
-    public Date getTestTime(){
-        return this.testTime;
-    }
-
-    public void setTestTime(Date testTime){
-        this.testTime = testTime;
-    }
-    public String getMultiSelect(){
-        return this.multiSelect;
-    }
-
-    public void setMultiSelect(String multiSelect){
-        this.multiSelect = multiSelect;
-    }
-
-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;
-}
-
-public String getOrderByStr() {
-    return orderByStr;
-}
-
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
-
-}
-

+ 0 - 85
src/main/java/com/izouma/awesomeadmin/model/TestBbb.java

@@ -1,85 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TestBbb{
-    private Integer id;
-    private String delFlag;
-    private String nameAaa;
-    private String nameBbb;
-    private String nameCcc;
-    private String nameDdd;
-
-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 getNameAaa(){
-        return this.nameAaa;
-    }
-
-    public void setNameAaa(String nameAaa){
-        this.nameAaa = nameAaa;
-    }
-    public String getNameBbb(){
-        return this.nameBbb;
-    }
-
-    public void setNameBbb(String nameBbb){
-        this.nameBbb = nameBbb;
-    }
-    public String getNameCcc(){
-        return this.nameCcc;
-    }
-
-    public void setNameCcc(String nameCcc){
-        this.nameCcc = nameCcc;
-    }
-    public String getNameDdd(){
-        return this.nameDdd;
-    }
-
-    public void setNameDdd(String nameDdd){
-        this.nameDdd = nameDdd;
-    }
-
-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;
-}
-
-}
-

+ 0 - 69
src/main/java/com/izouma/awesomeadmin/model/TestBbbCopy.java

@@ -1,69 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TestBbbCopy{
-    private String id;
-    private String delFlag;
-    private String nameAaa;
-    private String nameBbb;
-
-private String searchKey;
-
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
-
-    public String getId(){
-        return this.id;
-    }
-
-    public void setId(String id){
-        this.id = id;
-    }
-    public String getDelFlag(){
-        return this.delFlag;
-    }
-
-    public void setDelFlag(String delFlag){
-        this.delFlag = delFlag;
-    }
-    public String getNameAaa(){
-        return this.nameAaa;
-    }
-
-    public void setNameAaa(String nameAaa){
-        this.nameAaa = nameAaa;
-    }
-    public String getNameBbb(){
-        return this.nameBbb;
-    }
-
-    public void setNameBbb(String nameBbb){
-        this.nameBbb = nameBbb;
-    }
-
-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;
-}
-
-}
-

+ 0 - 61
src/main/java/com/izouma/awesomeadmin/model/TestDeploy.java

@@ -1,61 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TestDeploy{
-    private Integer id;
-    private String delFlag;
-    private String name;
-
-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 getName(){
-        return this.name;
-    }
-
-    public void setName(String name){
-        this.name = name;
-    }
-
-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;
-}
-
-}
-

+ 0 - 69
src/main/java/com/izouma/awesomeadmin/model/TestSqlserverAaa.java

@@ -1,69 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TestSqlserverAaa{
-    private Integer id;
-    private String delFlag;
-    private String nameAaa;
-    private String nameBbb;
-
-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 getNameAaa(){
-        return this.nameAaa;
-    }
-
-    public void setNameAaa(String nameAaa){
-        this.nameAaa = nameAaa;
-    }
-    public String getNameBbb(){
-        return this.nameBbb;
-    }
-
-    public void setNameBbb(String nameBbb){
-        this.nameBbb = nameBbb;
-    }
-
-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;
-}
-
-}
-

+ 0 - 69
src/main/java/com/izouma/awesomeadmin/model/Testaaaone.java

@@ -1,69 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import java.util.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class Testaaaone{
-    private Integer id;
-    private String delFlag;
-    private String testName;
-    private String remark;
-
-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 getTestName(){
-        return this.testName;
-    }
-
-    public void setTestName(String testName){
-        this.testName = testName;
-    }
-    public String getRemark(){
-        return this.remark;
-    }
-
-    public void setRemark(String remark){
-        this.remark = remark;
-    }
-
-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;
-}
-
-}
-

+ 0 - 66
src/main/java/com/izouma/awesomeadmin/model/Zouma.java

@@ -1,66 +0,0 @@
-package com.izouma.awesomeadmin.model;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * user_info 实体类
- * Tue Apr 17 10:32:49 CST 2018  Suo Chen Cheng
- */
-@JsonAutoDetect
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class Zouma {
-
-    private String id;
-
-    private String userName;
-
-    private String position;
-
-
-    private String workType;
-
-
-    private String remarks;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public String getWorkType() {
-        return workType;
-    }
-
-    public void setWorkType(String workType) {
-        this.workType = workType;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.TableShouyiYaopinxinxi;
-
-
-/**
-*  service接口类
-*/
-public interface TableShouyiYaopinxinxiService{
-
-    List<TableShouyiYaopinxinxi> getTableShouyiYaopinxinxiList(TableShouyiYaopinxinxi record);
-
-    List<TableShouyiYaopinxinxi> getTableShouyiYaopinxinxiByPage(Page page, TableShouyiYaopinxinxi record);
-
-    TableShouyiYaopinxinxi getTableShouyiYaopinxinxiById(String id);
-
-    TableShouyiYaopinxinxi getTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record);
-
-    boolean createTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record);
-
-    boolean deleteTableShouyiYaopinxinxi(String id);
-
-    boolean updateTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record);
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.TestAaa;
-
-
-/**
-*  service接口类
-*/
-public interface TestAaaService{
-
-    List<TestAaa> getTestAaaList(TestAaa record);
-
-    List<TestAaa> getTestAaaByPage(Page page, TestAaa record);
-
-    TestAaa getTestAaaById(String id);
-
-    TestAaa getTestAaa(TestAaa record);
-
-    boolean createTestAaa(TestAaa record);
-
-    boolean deleteTestAaa(String id);
-
-    boolean updateTestAaa(TestAaa record);
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.TestBbbCopy;
-
-
-/**
-*  service接口类
-*/
-public interface TestBbbCopyService{
-
-    List<TestBbbCopy> getTestBbbCopyList(TestBbbCopy record);
-
-    List<TestBbbCopy> getTestBbbCopyByPage(Page page, TestBbbCopy record);
-
-    TestBbbCopy getTestBbbCopyById(String id);
-
-    TestBbbCopy getTestBbbCopy(TestBbbCopy record);
-
-    boolean createTestBbbCopy(TestBbbCopy record);
-
-    boolean deleteTestBbbCopy(String id);
-
-    boolean updateTestBbbCopy(TestBbbCopy record);
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.TestBbb;
-
-
-/**
-*  service接口类
-*/
-public interface TestBbbService{
-
-    List<TestBbb> getTestBbbList(TestBbb record);
-
-    List<TestBbb> getTestBbbByPage(Page page, TestBbb record);
-
-    TestBbb getTestBbbById(String id);
-
-    TestBbb getTestBbb(TestBbb record);
-
-    boolean createTestBbb(TestBbb record);
-
-    boolean deleteTestBbb(String id);
-
-    boolean updateTestBbb(TestBbb record);
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.TestDeploy;
-
-
-/**
-*  service接口类
-*/
-public interface TestDeployService{
-
-    List<TestDeploy> getTestDeployList(TestDeploy record);
-
-    List<TestDeploy> getTestDeployByPage(Page page, TestDeploy record);
-
-    TestDeploy getTestDeployById(String id);
-
-    TestDeploy getTestDeploy(TestDeploy record);
-
-    boolean createTestDeploy(TestDeploy record);
-
-    boolean deleteTestDeploy(String id);
-
-    boolean updateTestDeploy(TestDeploy record);
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.TestSqlserverAaa;
-
-
-/**
-*  service接口类
-*/
-public interface TestSqlserverAaaService{
-
-    List<TestSqlserverAaa> getTestSqlserverAaaList(TestSqlserverAaa record);
-
-    List<TestSqlserverAaa> getTestSqlserverAaaByPage(Page page, TestSqlserverAaa record);
-
-    TestSqlserverAaa getTestSqlserverAaaById(String id);
-
-    TestSqlserverAaa getTestSqlserverAaa(TestSqlserverAaa record);
-
-    boolean createTestSqlserverAaa(TestSqlserverAaa record);
-
-    boolean deleteTestSqlserverAaa(String id);
-
-    boolean updateTestSqlserverAaa(TestSqlserverAaa record);
-}
-

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

@@ -1,27 +0,0 @@
-package com.izouma.awesomeadmin.service;
-
-import java.util.*;
-import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.Testaaaone;
-
-
-/**
-*  service接口类
-*/
-public interface TestaaaoneService{
-
-    List<Testaaaone> getTestaaaoneList(Testaaaone record);
-
-    List<Testaaaone> getTestaaaoneByPage(Page page, Testaaaone record);
-
-    Testaaaone getTestaaaoneById(String id);
-
-    Testaaaone getTestaaaone(Testaaaone record);
-
-    boolean createTestaaaone(Testaaaone record);
-
-    boolean deleteTestaaaone(String id);
-
-    boolean updateTestaaaone(Testaaaone record);
-}
-

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

@@ -1,137 +0,0 @@
-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.TableShouyiYaopinxinxi;
-import com.izouma.awesomeadmin.service.TableShouyiYaopinxinxiService;
-import com.izouma.awesomeadmin.dao.TableShouyiYaopinxinxiMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TableShouyiYaopinxinxiServiceImpl implements TableShouyiYaopinxinxiService{
-
-    private static Logger logger = Logger.getLogger(TableShouyiYaopinxinxiServiceImpl.class);
-
-    @Autowired
-    private TableShouyiYaopinxinxiMapper tableShouyiYaopinxinxiMapper;
-
-    @Override
-    public List<TableShouyiYaopinxinxi> getTableShouyiYaopinxinxiList(TableShouyiYaopinxinxi record) {
-
-        logger.info("getTableShouyiYaopinxinxiList");
-        try {
-
-        return tableShouyiYaopinxinxiMapper.queryAllTableShouyiYaopinxinxi(record);
-        } catch (Exception e) {
-        logger.error("getTableShouyiYaopinxinxiList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<TableShouyiYaopinxinxi> getTableShouyiYaopinxinxiByPage(Page page, TableShouyiYaopinxinxi record) {
-
-        logger.info("getTableShouyiYaopinxinxiByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return tableShouyiYaopinxinxiMapper.queryTableShouyiYaopinxinxiByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTableShouyiYaopinxinxiByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TableShouyiYaopinxinxi getTableShouyiYaopinxinxiById(String id) {
-
-        logger.info("getTableShouyiYaopinxinxiyId");
-        try {
-
-            return tableShouyiYaopinxinxiMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTableShouyiYaopinxinxiById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TableShouyiYaopinxinxi getTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record) {
-
-        logger.info("getTableShouyiYaopinxinxi");
-        try {
-
-            return tableShouyiYaopinxinxiMapper.queryTableShouyiYaopinxinxi(record);
-        } catch (Exception e) {
-        logger.error("getTableShouyiYaopinxinxi", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record) {
-
-        logger.info("createTableShouyiYaopinxinxi");
-        try {
-
-            int updates = tableShouyiYaopinxinxiMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTableShouyiYaopinxinxi", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTableShouyiYaopinxinxi(String id) {
-
-        logger.info("deleteTableShouyiYaopinxinxi");
-        try {
-
-             int updates = tableShouyiYaopinxinxiMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTableShouyiYaopinxinxi", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record) {
-
-        logger.info("updateTableShouyiYaopinxinxi");
-        try {
-
-            int updates = tableShouyiYaopinxinxiMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTableShouyiYaopinxinxi", e);
-        }
-
-        return false;
-    }
-}
-

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

@@ -1,137 +0,0 @@
-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.TestAaa;
-import com.izouma.awesomeadmin.service.TestAaaService;
-import com.izouma.awesomeadmin.dao.TestAaaMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TestAaaServiceImpl implements TestAaaService{
-
-    private static Logger logger = Logger.getLogger(TestAaaServiceImpl.class);
-
-    @Autowired
-    private TestAaaMapper testAaaMapper;
-
-    @Override
-    public List<TestAaa> getTestAaaList(TestAaa record) {
-
-        logger.info("getTestAaaList");
-        try {
-
-        return testAaaMapper.queryAllTestAaa(record);
-        } catch (Exception e) {
-        logger.error("getTestAaaList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<TestAaa> getTestAaaByPage(Page page, TestAaa record) {
-
-        logger.info("getTestAaaByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return testAaaMapper.queryTestAaaByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTestAaaByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestAaa getTestAaaById(String id) {
-
-        logger.info("getTestAaayId");
-        try {
-
-            return testAaaMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTestAaaById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestAaa getTestAaa(TestAaa record) {
-
-        logger.info("getTestAaa");
-        try {
-
-            return testAaaMapper.queryTestAaa(record);
-        } catch (Exception e) {
-        logger.error("getTestAaa", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTestAaa(TestAaa record) {
-
-        logger.info("createTestAaa");
-        try {
-
-            int updates = testAaaMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTestAaa", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTestAaa(String id) {
-
-        logger.info("deleteTestAaa");
-        try {
-
-             int updates = testAaaMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTestAaa", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTestAaa(TestAaa record) {
-
-        logger.info("updateTestAaa");
-        try {
-
-            int updates = testAaaMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTestAaa", e);
-        }
-
-        return false;
-    }
-}
-

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

@@ -1,137 +0,0 @@
-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.TestBbbCopy;
-import com.izouma.awesomeadmin.service.TestBbbCopyService;
-import com.izouma.awesomeadmin.dao.TestBbbCopyMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TestBbbCopyServiceImpl implements TestBbbCopyService{
-
-    private static Logger logger = Logger.getLogger(TestBbbCopyServiceImpl.class);
-
-    @Autowired
-    private TestBbbCopyMapper testBbbCopyMapper;
-
-    @Override
-    public List<TestBbbCopy> getTestBbbCopyList(TestBbbCopy record) {
-
-        logger.info("getTestBbbCopyList");
-        try {
-
-        return testBbbCopyMapper.queryAllTestBbbCopy(record);
-        } catch (Exception e) {
-        logger.error("getTestBbbCopyList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<TestBbbCopy> getTestBbbCopyByPage(Page page, TestBbbCopy record) {
-
-        logger.info("getTestBbbCopyByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return testBbbCopyMapper.queryTestBbbCopyByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTestBbbCopyByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestBbbCopy getTestBbbCopyById(String id) {
-
-        logger.info("getTestBbbCopyyId");
-        try {
-
-            return testBbbCopyMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTestBbbCopyById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestBbbCopy getTestBbbCopy(TestBbbCopy record) {
-
-        logger.info("getTestBbbCopy");
-        try {
-
-            return testBbbCopyMapper.queryTestBbbCopy(record);
-        } catch (Exception e) {
-        logger.error("getTestBbbCopy", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTestBbbCopy(TestBbbCopy record) {
-
-        logger.info("createTestBbbCopy");
-        try {
-
-            int updates = testBbbCopyMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTestBbbCopy", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTestBbbCopy(String id) {
-
-        logger.info("deleteTestBbbCopy");
-        try {
-
-             int updates = testBbbCopyMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTestBbbCopy", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTestBbbCopy(TestBbbCopy record) {
-
-        logger.info("updateTestBbbCopy");
-        try {
-
-            int updates = testBbbCopyMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTestBbbCopy", e);
-        }
-
-        return false;
-    }
-}
-

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

@@ -1,137 +0,0 @@
-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.TestBbb;
-import com.izouma.awesomeadmin.service.TestBbbService;
-import com.izouma.awesomeadmin.dao.TestBbbMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TestBbbServiceImpl implements TestBbbService{
-
-    private static Logger logger = Logger.getLogger(TestBbbServiceImpl.class);
-
-    @Autowired
-    private TestBbbMapper testBbbMapper;
-
-    @Override
-    public List<TestBbb> getTestBbbList(TestBbb record) {
-
-        logger.info("getTestBbbList");
-        try {
-
-        return testBbbMapper.queryAllTestBbb(record);
-        } catch (Exception e) {
-        logger.error("getTestBbbList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<TestBbb> getTestBbbByPage(Page page, TestBbb record) {
-
-        logger.info("getTestBbbByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return testBbbMapper.queryTestBbbByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTestBbbByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestBbb getTestBbbById(String id) {
-
-        logger.info("getTestBbbyId");
-        try {
-
-            return testBbbMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTestBbbById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestBbb getTestBbb(TestBbb record) {
-
-        logger.info("getTestBbb");
-        try {
-
-            return testBbbMapper.queryTestBbb(record);
-        } catch (Exception e) {
-        logger.error("getTestBbb", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTestBbb(TestBbb record) {
-
-        logger.info("createTestBbb");
-        try {
-
-            int updates = testBbbMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTestBbb", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTestBbb(String id) {
-
-        logger.info("deleteTestBbb");
-        try {
-
-             int updates = testBbbMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTestBbb", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTestBbb(TestBbb record) {
-
-        logger.info("updateTestBbb");
-        try {
-
-            int updates = testBbbMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTestBbb", e);
-        }
-
-        return false;
-    }
-}
-

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

@@ -1,137 +0,0 @@
-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.TestDeploy;
-import com.izouma.awesomeadmin.service.TestDeployService;
-import com.izouma.awesomeadmin.dao.TestDeployMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TestDeployServiceImpl implements TestDeployService{
-
-    private static Logger logger = Logger.getLogger(TestDeployServiceImpl.class);
-
-    @Autowired
-    private TestDeployMapper testDeployMapper;
-
-    @Override
-    public List<TestDeploy> getTestDeployList(TestDeploy record) {
-
-        logger.info("getTestDeployList");
-        try {
-
-        return testDeployMapper.queryAllTestDeploy(record);
-        } catch (Exception e) {
-        logger.error("getTestDeployList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<TestDeploy> getTestDeployByPage(Page page, TestDeploy record) {
-
-        logger.info("getTestDeployByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return testDeployMapper.queryTestDeployByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTestDeployByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestDeploy getTestDeployById(String id) {
-
-        logger.info("getTestDeployyId");
-        try {
-
-            return testDeployMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTestDeployById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestDeploy getTestDeploy(TestDeploy record) {
-
-        logger.info("getTestDeploy");
-        try {
-
-            return testDeployMapper.queryTestDeploy(record);
-        } catch (Exception e) {
-        logger.error("getTestDeploy", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTestDeploy(TestDeploy record) {
-
-        logger.info("createTestDeploy");
-        try {
-
-            int updates = testDeployMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTestDeploy", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTestDeploy(String id) {
-
-        logger.info("deleteTestDeploy");
-        try {
-
-             int updates = testDeployMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTestDeploy", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTestDeploy(TestDeploy record) {
-
-        logger.info("updateTestDeploy");
-        try {
-
-            int updates = testDeployMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTestDeploy", e);
-        }
-
-        return false;
-    }
-}
-

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

@@ -1,137 +0,0 @@
-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.TestSqlserverAaa;
-import com.izouma.awesomeadmin.service.TestSqlserverAaaService;
-import com.izouma.awesomeadmin.dao.TestSqlserverAaaMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TestSqlserverAaaServiceImpl implements TestSqlserverAaaService{
-
-    private static Logger logger = Logger.getLogger(TestSqlserverAaaServiceImpl.class);
-
-    @Autowired
-    private TestSqlserverAaaMapper testSqlserverAaaMapper;
-
-    @Override
-    public List<TestSqlserverAaa> getTestSqlserverAaaList(TestSqlserverAaa record) {
-
-        logger.info("getTestSqlserverAaaList");
-        try {
-
-        return testSqlserverAaaMapper.queryAllTestSqlserverAaa(record);
-        } catch (Exception e) {
-        logger.error("getTestSqlserverAaaList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<TestSqlserverAaa> getTestSqlserverAaaByPage(Page page, TestSqlserverAaa record) {
-
-        logger.info("getTestSqlserverAaaByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return testSqlserverAaaMapper.queryTestSqlserverAaaByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTestSqlserverAaaByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestSqlserverAaa getTestSqlserverAaaById(String id) {
-
-        logger.info("getTestSqlserverAaayId");
-        try {
-
-            return testSqlserverAaaMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTestSqlserverAaaById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public TestSqlserverAaa getTestSqlserverAaa(TestSqlserverAaa record) {
-
-        logger.info("getTestSqlserverAaa");
-        try {
-
-            return testSqlserverAaaMapper.queryTestSqlserverAaa(record);
-        } catch (Exception e) {
-        logger.error("getTestSqlserverAaa", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTestSqlserverAaa(TestSqlserverAaa record) {
-
-        logger.info("createTestSqlserverAaa");
-        try {
-
-            int updates = testSqlserverAaaMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTestSqlserverAaa", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTestSqlserverAaa(String id) {
-
-        logger.info("deleteTestSqlserverAaa");
-        try {
-
-             int updates = testSqlserverAaaMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTestSqlserverAaa", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTestSqlserverAaa(TestSqlserverAaa record) {
-
-        logger.info("updateTestSqlserverAaa");
-        try {
-
-            int updates = testSqlserverAaaMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTestSqlserverAaa", e);
-        }
-
-        return false;
-    }
-}
-

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

@@ -1,137 +0,0 @@
-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.Testaaaone;
-import com.izouma.awesomeadmin.service.TestaaaoneService;
-import com.izouma.awesomeadmin.dao.TestaaaoneMapper;
-
-/**
-*  service接口实现类
-*/
-@Service
-public class TestaaaoneServiceImpl implements TestaaaoneService{
-
-    private static Logger logger = Logger.getLogger(TestaaaoneServiceImpl.class);
-
-    @Autowired
-    private TestaaaoneMapper testaaaoneMapper;
-
-    @Override
-    public List<Testaaaone> getTestaaaoneList(Testaaaone record) {
-
-        logger.info("getTestaaaoneList");
-        try {
-
-        return testaaaoneMapper.queryAllTestaaaone(record);
-        } catch (Exception e) {
-        logger.error("getTestaaaoneList", e);
-        }
-
-        return null;
-    }
-    @Override
-    public List<Testaaaone> getTestaaaoneByPage(Page page, Testaaaone record) {
-
-        logger.info("getTestaaaoneByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return testaaaoneMapper.queryTestaaaoneByPage(parameter);
-        } catch (Exception e) {
-        logger.error("getTestaaaoneByPage", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public Testaaaone getTestaaaoneById(String id) {
-
-        logger.info("getTestaaaoneyId");
-        try {
-
-            return testaaaoneMapper.selectByPrimaryKey(Integer.valueOf(id));
-        } catch (Exception e) {
-        logger.error("getTestaaaoneById", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public Testaaaone getTestaaaone(Testaaaone record) {
-
-        logger.info("getTestaaaone");
-        try {
-
-            return testaaaoneMapper.queryTestaaaone(record);
-        } catch (Exception e) {
-        logger.error("getTestaaaone", e);
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean createTestaaaone(Testaaaone record) {
-
-        logger.info("createTestaaaone");
-        try {
-
-            int updates = testaaaoneMapper.insertSelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-            logger.error("createTestaaaone", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean deleteTestaaaone(String id) {
-
-        logger.info("deleteTestaaaone");
-        try {
-
-             int updates = testaaaoneMapper.delete(id);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("deleteTestaaaone", e);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean updateTestaaaone(Testaaaone record) {
-
-        logger.info("updateTestaaaone");
-        try {
-
-            int updates = testaaaoneMapper.updateByPrimaryKeySelective(record);
-
-            if (updates > 0) {
-                 return true;
-            }
-        } catch (Exception e) {
-             logger.error("updateTestaaaone", e);
-        }
-
-        return false;
-    }
-}
-

+ 0 - 3
src/main/java/com/izouma/awesomeadmin/shiro/UserPasswordRealm.java

@@ -6,8 +6,6 @@ import org.apache.shiro.authc.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class UserPasswordRealm extends BaseRealm {
-    @Autowired
-    private IdentityService identityService;
 
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
@@ -17,7 +15,6 @@ public class UserPasswordRealm extends BaseRealm {
         if (userInfo == null) {
             throw new AuthenticationException("用户名或密码错误");
         }
-        identityService.setAuthenticatedUserId(userInfo.getId().toString());
         return new SimpleAuthenticationInfo(userInfo, token.getCredentials(), this.getName());
     }
 }

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

@@ -4,7 +4,6 @@ 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.model.TestAaa;
 import com.izouma.awesomeadmin.service.CommonQueryService;
 import net.sf.json.JSONObject;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;

+ 0 - 183
src/main/java/com/izouma/awesomeadmin/web/DemoDataInitConfig.java

@@ -1,183 +0,0 @@
-package com.izouma.awesomeadmin.web;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.activiti.engine.*;
-import org.activiti.engine.identity.Group;
-import org.activiti.engine.identity.Picture;
-import org.activiti.engine.identity.User;
-import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.activiti.engine.impl.util.IoUtil;
-import org.activiti.engine.repository.Deployment;
-import org.activiti.engine.repository.Model;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 自动初始化演示数据
- *
- * @author Henry Yan
- */
-@Component
-public class DemoDataInitConfig {
-
-    protected static final Logger LOGGER = LoggerFactory.getLogger(DemoDataInitConfig.class);
-
-    @Autowired
-    protected IdentityService identityService;
-
-    @Autowired
-    protected RepositoryService repositoryService;
-
-    @Autowired
-    protected RuntimeService runtimeService;
-
-    @Autowired
-    protected TaskService taskService;
-
-    @Autowired
-    protected ManagementService managementService;
-
-    @Autowired
-    protected ProcessEngineConfigurationImpl processEngineConfiguration;
-
-    @PostConstruct
-    public void init() {
-
-        // initDemoGroups();
-        // initDemoUsers();
-//        initProcessDefinitions();
-//        initModelData();
-
-    }
-
-    protected void initDemoGroups() {
-        String[] assignmentGroups = new String[]{"deptLeader", "hr"};
-        for (String groupId : assignmentGroups) {
-            createGroup(groupId, "assignment");
-        }
-
-        String[] securityGroups = new String[]{"user", "admin"};
-        for (String groupId : securityGroups) {
-            createGroup(groupId, "security-role");
-        }
-    }
-
-    protected void createGroup(String groupId, String type) {
-        if (identityService.createGroupQuery().groupId(groupId).count() == 0) {
-            Group newGroup = identityService.newGroup(groupId);
-            newGroup.setName(groupId.substring(0, 1).toUpperCase() + groupId.substring(1));
-            newGroup.setType(type);
-            identityService.saveGroup(newGroup);
-        }
-    }
-
-    protected void initDemoUsers() {
-        createUser("admin", "Henry", "Yan", "000000", "henry.yan@kafeitu.me",
-                "", Arrays.asList("user", "admin"), null);
-
-        createUser("hruser", "Lili", "Zhang", "000000", "lili.zhang@kafeitu.me",
-                "", Arrays.asList("hr", "user"), null);
-
-        createUser("leaderuser", "Jhon", "Li", "000000", "jhon.li@kafeitu.me",
-                "", Arrays.asList("deptLeader", "user"), null);
-
-        createUser("kafeitu", "Coffee", "Rabbit", "000000", "coffee.rabbit@kafeitu.me",
-                "", Arrays.asList("user", "admin"), null);
-    }
-
-    protected void createUser(String userId, String firstName, String lastName, String password,
-                              String email, String imageResource, List<String> groups, List<String> userInfo) {
-
-        if (identityService.createUserQuery().userId(userId).count() == 0) {
-
-            // Following data can already be set by demo setup script
-
-            User user = identityService.newUser(userId);
-            user.setFirstName(firstName);
-            user.setLastName(lastName);
-            user.setPassword(password);
-            user.setEmail(email);
-            identityService.saveUser(user);
-
-            if (groups != null) {
-                for (String group : groups) {
-                    identityService.createMembership(userId, group);
-                }
-            }
-        }
-
-        // Following data is not set by demo setup script
-
-        // image
-        if (imageResource != null) {
-            byte[] pictureBytes = IoUtil.readInputStream(this.getClass().getClassLoader().getResourceAsStream(imageResource), null);
-            Picture picture = new Picture(pictureBytes, "image/jpeg");
-            identityService.setUserPicture(userId, picture);
-        }
-
-        // user info
-        if (userInfo != null) {
-            for (int i = 0; i < userInfo.size(); i += 2) {
-                identityService.setUserInfo(userId, userInfo.get(i), userInfo.get(i + 1));
-            }
-        }
-
-    }
-
-    protected void initProcessDefinitions() {
-
-        String deploymentName = "Demo processes";
-        List<Deployment> deploymentList = repositoryService.createDeploymentQuery().deploymentName(deploymentName).list();
-
-        if (deploymentList == null || deploymentList.isEmpty()) {
-            repositoryService.createDeployment()
-                    .name(deploymentName)
-                    .addClasspathResource("diagrams/leave/leave.bpmn")
-                    .addClasspathResource("diagrams/leave/leave.png")
-                    .deploy();
-        }
-    }
-
-    protected void initModelData() {
-        createModelData("Demo model", "This is a demo model", "models/leave.model.json");
-    }
-
-    protected void createModelData(String name, String description, String jsonFile) {
-        List<Model> modelList = repositoryService.createModelQuery().modelName("Demo model").list();
-        if (modelList == null || modelList.isEmpty()) {
-
-            Model model = repositoryService.newModel();
-            model.setName(name);
-
-            ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
-            modelObjectNode.put("name", name);
-            modelObjectNode.put("description", description);
-            model.setMetaInfo(modelObjectNode.toString());
-
-            repositoryService.saveModel(model);
-
-            try {
-                InputStream svgStream = this.getClass().getClassLoader().getResourceAsStream("models/leave.model.svg");
-                repositoryService.addModelEditorSourceExtra(model.getId(), IOUtils.toByteArray(svgStream));
-            } catch (Exception e) {
-                LOGGER.warn("Failed to read SVG", e);
-            }
-
-            try {
-                InputStream editorJsonStream = this.getClass().getClassLoader().getResourceAsStream(jsonFile);
-                repositoryService.addModelEditorSource(model.getId(), IOUtils.toByteArray(editorJsonStream));
-            } catch (Exception e) {
-                LOGGER.warn("Failed to read editor JSON", e);
-            }
-        }
-    }
-}

+ 0 - 162
src/main/java/com/izouma/awesomeadmin/web/TableShouyiYaopinxinxiController.java

@@ -1,162 +0,0 @@
-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.TableShouyiYaopinxinxi;
-import com.izouma.awesomeadmin.service.TableShouyiYaopinxinxiService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/tableShouyiYaopinxinxi")
-public class TableShouyiYaopinxinxiController {
-
-    @Autowired
-    private TableShouyiYaopinxinxiService tableShouyiYaopinxinxiService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(TableShouyiYaopinxinxi record) {
-        List<TableShouyiYaopinxinxi> pp = tableShouyiYaopinxinxiService.getTableShouyiYaopinxinxiList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTableShouyiYaopinxinxi", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTableShouyiYaopinxinxi(@RequestParam(required = false, value = "id") String id) {
-        TableShouyiYaopinxinxi data = tableShouyiYaopinxinxiService.getTableShouyiYaopinxinxiById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(TableShouyiYaopinxinxi record) {
-        TableShouyiYaopinxinxi data = tableShouyiYaopinxinxiService.getTableShouyiYaopinxinxi(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, TableShouyiYaopinxinxi record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<TableShouyiYaopinxinxi> pp =tableShouyiYaopinxinxiService.getTableShouyiYaopinxinxiByPage(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(TableShouyiYaopinxinxi record) {
-        boolean num = tableShouyiYaopinxinxiService.createTableShouyiYaopinxinxi(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTableShouyiYaopinxinxi(TableShouyiYaopinxinxi record) {
-        boolean num = tableShouyiYaopinxinxiService.updateTableShouyiYaopinxinxi(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTableShouyiYaopinxinxi(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = tableShouyiYaopinxinxiService.deleteTableShouyiYaopinxinxi(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, TableShouyiYaopinxinxi record) throws Exception {
-
-    List<TableShouyiYaopinxinxi> tableShouyiYaopinxinxis = tableShouyiYaopinxinxiService.getTableShouyiYaopinxinxiList(record);
-
-
-        String sheetName = "Table_兽医_药品信息";
-        String titleName = "Table_兽医_药品信息数据表";
-        String fileName = "Table_兽医_药品信息表";
-        int columnNumber = 11;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "药品编号" ,   "药品名称" ,   "计量单位" ,   "规格" ,   "主要成分" ,   "有效成分" ,   "单价" ,   "生产厂家" ,   "药品制定部门" ,   "FlagColumn"  };
-        String[][] dataList = new String[tableShouyiYaopinxinxis.size()][11];
-
-        for (int i = 0; i < tableShouyiYaopinxinxis.size(); i++) {
-
-                        dataList[i][0] = String.valueOf(tableShouyiYaopinxinxis.get(i).getId());
-                        dataList[i][1] = String.valueOf(tableShouyiYaopinxinxis.get(i).get药品编号());
-                        dataList[i][2] = String.valueOf(tableShouyiYaopinxinxis.get(i).get药品名称());
-                        dataList[i][3] = String.valueOf(tableShouyiYaopinxinxis.get(i).get计量单位());
-                        dataList[i][4] = String.valueOf(tableShouyiYaopinxinxis.get(i).get规格());
-                        dataList[i][5] = String.valueOf(tableShouyiYaopinxinxis.get(i).get主要成分());
-                        dataList[i][6] = String.valueOf(tableShouyiYaopinxinxis.get(i).get有效成分());
-                        dataList[i][7] = String.valueOf(tableShouyiYaopinxinxis.get(i).get单价());
-                        dataList[i][8] = String.valueOf(tableShouyiYaopinxinxis.get(i).get生产厂家());
-                        dataList[i][9] = String.valueOf(tableShouyiYaopinxinxis.get(i).get药品制定部门());
-                        dataList[i][10] = String.valueOf(tableShouyiYaopinxinxis.get(i).getFlagcolumn());
-                    }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

+ 0 - 158
src/main/java/com/izouma/awesomeadmin/web/TestAaaController.java

@@ -1,158 +0,0 @@
-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.TestAaa;
-import com.izouma.awesomeadmin.service.TestAaaService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/testAaa")
-public class TestAaaController {
-
-    @Autowired
-    private TestAaaService testAaaService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(TestAaa record) {
-        List<TestAaa> pp = testAaaService.getTestAaaList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTestAaa", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTestAaa(@RequestParam(required = false, value = "id") String id) {
-        TestAaa data = testAaaService.getTestAaaById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(TestAaa record) {
-        TestAaa data = testAaaService.getTestAaa(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, TestAaa record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<TestAaa> pp =testAaaService.getTestAaaByPage(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(TestAaa record) {
-        boolean num = testAaaService.createTestAaa(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTestAaa(TestAaa record) {
-        boolean num = testAaaService.updateTestAaa(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTestAaa(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = testAaaService.deleteTestAaa(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, TestAaa record) throws Exception {
-
-    List<TestAaa> testAaas = testAaaService.getTestAaaList(record);
-
-
-        String sheetName = "test_aaa";
-        String titleName = "test_aaa数据表";
-        String fileName = "test_aaa表";
-        int columnNumber = 7;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "id" ,   "删除标识" ,   "名字" ,   "备注" ,   "图片" ,   "时间" ,   "多选"  };
-        String[][] dataList = new String[testAaas.size()][7];
-
-        for (int i = 0; i < testAaas.size(); i++) {
-
-                        dataList[i][0] = String.valueOf(testAaas.get(i).getId());
-                        dataList[i][1] = String.valueOf(testAaas.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(testAaas.get(i).getTestName());
-                        dataList[i][3] = String.valueOf(testAaas.get(i).getRemark());
-                        dataList[i][4] = String.valueOf(testAaas.get(i).getImageUrl());
-                        dataList[i][5] = String.valueOf(testAaas.get(i).getTestTime());
-                        dataList[i][6] = String.valueOf(testAaas.get(i).getMultiSelect());
-                    }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

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

@@ -1,157 +0,0 @@
-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.TestBbb;
-import com.izouma.awesomeadmin.service.TestBbbService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/testBbb")
-public class TestBbbController {
-
-    @Autowired
-    private TestBbbService testBbbService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(TestBbb record) {
-        List<TestBbb> pp = testBbbService.getTestBbbList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTestBbb", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTestBbb(@RequestParam(required = false, value = "id") String id) {
-        TestBbb data = testBbbService.getTestBbbById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(TestBbb record) {
-        TestBbb data = testBbbService.getTestBbb(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, TestBbb record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<TestBbb> pp =testBbbService.getTestBbbByPage(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(TestBbb record) {
-        boolean num = testBbbService.createTestBbb(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTestBbb(TestBbb record) {
-        boolean num = testBbbService.updateTestBbb(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTestBbb(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = testBbbService.deleteTestBbb(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, TestBbb record) throws Exception {
-
-    List<TestBbb> testBbbs = testBbbService.getTestBbbList(record);
-
-
-        String sheetName = "test_bbb";
-        String titleName = "测试表BBB数据表";
-        String fileName = "测试表BBB表";
-        int columnNumber = 6;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "名称1" ,   "名称2" ,   "名称3" ,   "名称4"  };
-        String[][] dataList = new String[testBbbs.size()][6];
-
-        for (int i = 0; i < testBbbs.size(); i++) {
-
-                        dataList[i][0] = String.valueOf(testBbbs.get(i).getId());
-                        dataList[i][1] = String.valueOf(testBbbs.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(testBbbs.get(i).getNameAaa());
-                        dataList[i][3] = String.valueOf(testBbbs.get(i).getNameBbb());
-                        dataList[i][4] = String.valueOf(testBbbs.get(i).getNameCcc());
-                        dataList[i][5] = String.valueOf(testBbbs.get(i).getNameDdd());
-                    }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

+ 0 - 155
src/main/java/com/izouma/awesomeadmin/web/TestBbbCopyController.java

@@ -1,155 +0,0 @@
-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.TestBbbCopy;
-import com.izouma.awesomeadmin.service.TestBbbCopyService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/testBbbCopy")
-public class TestBbbCopyController {
-
-    @Autowired
-    private TestBbbCopyService testBbbCopyService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(TestBbbCopy record) {
-        List<TestBbbCopy> pp = testBbbCopyService.getTestBbbCopyList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTestBbbCopy", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTestBbbCopy(@RequestParam(required = false, value = "id") String id) {
-        TestBbbCopy data = testBbbCopyService.getTestBbbCopyById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(TestBbbCopy record) {
-        TestBbbCopy data = testBbbCopyService.getTestBbbCopy(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, TestBbbCopy record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<TestBbbCopy> pp =testBbbCopyService.getTestBbbCopyByPage(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(TestBbbCopy record) {
-        boolean num = testBbbCopyService.createTestBbbCopy(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTestBbbCopy(TestBbbCopy record) {
-        boolean num = testBbbCopyService.updateTestBbbCopy(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTestBbbCopy(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = testBbbCopyService.deleteTestBbbCopy(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, TestBbbCopy record) throws Exception {
-
-    List<TestBbbCopy> testBbbCopys = testBbbCopyService.getTestBbbCopyList(record);
-
-
-        String sheetName = "test_bbb_copy";
-        String titleName = "test_bbb_copy数据表";
-        String fileName = "test_bbb_copy表";
-        int columnNumber = 4;
-        int[] columnWidth = { 20,  20,  20,  20 };
-        String[] columnName = {  "id" ,   "删除标识" ,   "名称1" ,   "名称2"  };
-        String[][] dataList = new String[testBbbCopys.size()][4];
-
-        for (int i = 0; i < testBbbCopys.size(); i++) {
-
-                        dataList[i][0] = String.valueOf(testBbbCopys.get(i).getId());
-                        dataList[i][1] = String.valueOf(testBbbCopys.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(testBbbCopys.get(i).getNameAaa());
-                        dataList[i][3] = String.valueOf(testBbbCopys.get(i).getNameBbb());
-                    }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

+ 0 - 154
src/main/java/com/izouma/awesomeadmin/web/TestDeployController.java

@@ -1,154 +0,0 @@
-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.TestDeploy;
-import com.izouma.awesomeadmin.service.TestDeployService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/testDeploy")
-public class TestDeployController {
-
-    @Autowired
-    private TestDeployService testDeployService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(TestDeploy record) {
-        List<TestDeploy> pp = testDeployService.getTestDeployList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTestDeploy", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTestDeploy(@RequestParam(required = false, value = "id") String id) {
-        TestDeploy data = testDeployService.getTestDeployById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(TestDeploy record) {
-        TestDeploy data = testDeployService.getTestDeploy(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, TestDeploy record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<TestDeploy> pp =testDeployService.getTestDeployByPage(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(TestDeploy record) {
-        boolean num = testDeployService.createTestDeploy(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTestDeploy(TestDeploy record) {
-        boolean num = testDeployService.updateTestDeploy(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTestDeploy(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = testDeployService.deleteTestDeploy(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, TestDeploy record) throws Exception {
-
-    List<TestDeploy> testDeploys = testDeployService.getTestDeployList(record);
-
-
-        String sheetName = "test_deploy";
-        String titleName = "test_deploy数据表";
-        String fileName = "test_deploy表";
-        int columnNumber = 3;
-        int[] columnWidth = { 20,  20,  20 };
-        String[] columnName = {  "id",   "删除标识" ,   "名称"  };
-        String[][] dataList = new String[testDeploys.size()][3];
-
-        for (int i = 0; i < testDeploys.size(); i++) {
-
-            dataList[i][0] = String.valueOf(testDeploys.get(i).getId());
-            dataList[i][1] = String.valueOf(testDeploys.get(i).getDelFlag());
-            dataList[i][2] = String.valueOf(testDeploys.get(i).getName());
-        }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

+ 0 - 155
src/main/java/com/izouma/awesomeadmin/web/TestSqlserverAaaController.java

@@ -1,155 +0,0 @@
-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.TestSqlserverAaa;
-import com.izouma.awesomeadmin.service.TestSqlserverAaaService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/testSqlserverAaa")
-public class TestSqlserverAaaController {
-
-    @Autowired
-    private TestSqlserverAaaService testSqlserverAaaService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(TestSqlserverAaa record) {
-        List<TestSqlserverAaa> pp = testSqlserverAaaService.getTestSqlserverAaaList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTestSqlserverAaa", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTestSqlserverAaa(@RequestParam(required = false, value = "id") String id) {
-        TestSqlserverAaa data = testSqlserverAaaService.getTestSqlserverAaaById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(TestSqlserverAaa record) {
-        TestSqlserverAaa data = testSqlserverAaaService.getTestSqlserverAaa(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, TestSqlserverAaa record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<TestSqlserverAaa> pp =testSqlserverAaaService.getTestSqlserverAaaByPage(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(TestSqlserverAaa record) {
-        boolean num = testSqlserverAaaService.createTestSqlserverAaa(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTestSqlserverAaa(TestSqlserverAaa record) {
-        boolean num = testSqlserverAaaService.updateTestSqlserverAaa(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTestSqlserverAaa(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = testSqlserverAaaService.deleteTestSqlserverAaa(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, TestSqlserverAaa record) throws Exception {
-
-    List<TestSqlserverAaa> testSqlserverAaas = testSqlserverAaaService.getTestSqlserverAaaList(record);
-
-
-        String sheetName = "test_sqlserver_aaa";
-        String titleName = "测试sqlserver aaa数据表";
-        String fileName = "测试sqlserver aaa表";
-        int columnNumber = 4;
-        int[] columnWidth = { 20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "测试" ,   "bbb"  };
-        String[][] dataList = new String[testSqlserverAaas.size()][4];
-
-        for (int i = 0; i < testSqlserverAaas.size(); i++) {
-
-                        dataList[i][0] = String.valueOf(testSqlserverAaas.get(i).getId());
-                        dataList[i][1] = String.valueOf(testSqlserverAaas.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(testSqlserverAaas.get(i).getNameAaa());
-                        dataList[i][3] = String.valueOf(testSqlserverAaas.get(i).getNameBbb());
-                    }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

+ 0 - 155
src/main/java/com/izouma/awesomeadmin/web/TestaaaoneController.java

@@ -1,155 +0,0 @@
-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.Testaaaone;
-import com.izouma.awesomeadmin.service.TestaaaoneService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
-*  controller类
-*/
-@Controller
-@RequestMapping("/testaaaone")
-public class TestaaaoneController {
-
-    @Autowired
-    private TestaaaoneService testaaaoneService;
-
-    /**
-    * <p>获取全部记录。</p>
-    */
-    @RequiresAuthentication
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    @ResponseBody
-    public Result all(Testaaaone record) {
-        List<Testaaaone> pp = testaaaoneService.getTestaaaoneList(record);
-        return new Result(true, pp);
-    }
-
-    /**
-    * <p>根据Id。</p>
-    */
-    @RequestMapping(value = "/getTestaaaone", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getTestaaaone(@RequestParam(required = false, value = "id") String id) {
-        Testaaaone data = testaaaoneService.getTestaaaoneById(id);
-        return new Result(true, data);
-    }
-
-    /**
-    * <p>根据条件获取。</p>
-    */
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getOne(Testaaaone record) {
-        Testaaaone data = testaaaoneService.getTestaaaone(record);
-        return new Result(true, data);
-    }
-
-
-    /**
-    * <p>分页查询。</p>
-    */
-    @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ResponseBody
-    public Result page(Page page, Testaaaone record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<Testaaaone> pp =testaaaoneService.getTestaaaoneByPage(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(Testaaaone record) {
-        boolean num = testaaaoneService.createTestaaaone(record);
-        if (num) {
-        return new Result(true, record.getId());
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>更新信息。</p>
-    */
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ResponseBody
-    public Result updateTestaaaone(Testaaaone record) {
-        boolean num = testaaaoneService.updateTestaaaone(record);
-        if (num) {
-        return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
-    }
-
-    /**
-    * <p>删除。</p>
-    */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    @ResponseBody
-    public Result deleteTestaaaone(@RequestParam(required = true, value = "id") String id) {
-
-        boolean num = testaaaoneService.deleteTestaaaone(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, Testaaaone record) throws Exception {
-
-    List<Testaaaone> testaaaones = testaaaoneService.getTestaaaoneList(record);
-
-
-        String sheetName = "test_aaa";
-        String titleName = "Testaaaone数据表";
-        String fileName = "Testaaaone表";
-        int columnNumber = 4;
-        int[] columnWidth = { 20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "名字" ,   "备注"  };
-        String[][] dataList = new String[testaaaones.size()][4];
-
-        for (int i = 0; i < testaaaones.size(); i++) {
-
-                        dataList[i][0] = String.valueOf(testaaaones.get(i).getId());
-                        dataList[i][1] = String.valueOf(testaaaones.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(testaaaones.get(i).getTestName());
-                        dataList[i][3] = String.valueOf(testaaaones.get(i).getRemark());
-                    }
-
-
-        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
-
-
-        }
-    }
-

+ 0 - 105
src/main/java/com/izouma/awesomeadmin/web/activiti/ModelController.java

@@ -1,105 +0,0 @@
-package com.izouma.awesomeadmin.web.activiti;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.izouma.awesomeadmin.dto.Result;
-import org.activiti.bpmn.converter.BpmnXMLConverter;
-import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.editor.constants.ModelDataJsonConstants;
-import org.activiti.editor.language.json.converter.BpmnJsonConverter;
-import org.activiti.engine.*;
-import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.activiti.engine.repository.Deployment;
-import org.activiti.engine.repository.Model;
-import org.activiti.engine.repository.ModelQuery;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresAuthentication;
-import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Controller
-@RequestMapping("/activiti/model")
-@RequiresAuthentication
-@RequiresRoles("admin")
-public class ModelController  {
-    @Autowired
-    private IdentityService                identityService;
-    @Autowired
-    private RepositoryService              repositoryService;
-    @Autowired
-    private RuntimeService                 runtimeService;
-    @Autowired
-    private TaskService                    taskService;
-    @Autowired
-    private ManagementService              managementService;
-    @Autowired
-    private FormService                    formService;
-    @Autowired
-    private ProcessEngineConfigurationImpl processEngineConfiguration;
-
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
-    public Result processList(String name) {
-        ModelQuery query = repositoryService.createModelQuery();
-        if (StringUtils.isNotEmpty(name)) {
-            query = query.modelNameLike(name);
-        }
-        List<Model> models = query.list();
-        return new Result(true, models);
-    }
-
-    @RequestMapping(value = "/create", method = RequestMethod.GET)
-    @ResponseBody
-    public Result createModel(String name, String description) {
-        Model newModel = repositoryService.newModel();
-        try {
-
-            ObjectMapper objectMapper = new ObjectMapper();
-            ObjectNode modelObjectNode = objectMapper.createObjectNode();
-            modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, name);
-            modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
-            modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
-            newModel.setMetaInfo(modelObjectNode.toString());
-            newModel.setName(name);
-            repositoryService.saveModel(newModel);
-            ObjectNode editorNode = objectMapper.createObjectNode();
-            editorNode.put("id", "canvas");
-            editorNode.put("resourceId", "canvas");
-            ObjectNode stencilSetNode = objectMapper.createObjectNode();
-            stencilSetNode.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
-            editorNode.set("stencilset", stencilSetNode);
-            repositoryService.addModelEditorSource(newModel.getId(),
-                    editorNode.toString().getBytes("utf-8"));
-            return new Result(true, newModel.getId());
-        } catch (Exception e) {
-            e.getStackTrace();
-        }
-        return new Result(false, "创建失败");
-    }
-
-    @RequestMapping(value = "/publish", method = RequestMethod.GET)
-    @ResponseBody
-    public Result publishModel(@RequestParam("id") String id) {
-        try {
-            Model modelData = repositoryService.getModel(id);
-            ObjectNode modelNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
-            byte[] bpmnBytes = null;
-
-            BpmnModel model = new BpmnJsonConverter().convertToBpmnModel(modelNode);
-            bpmnBytes = new BpmnXMLConverter().convertToXML(model);
-
-            String processName = modelData.getName() + ".bpmn20.xml";
-            Deployment deployment = repositoryService.createDeployment().name(modelData.getName()).addString(processName, new String(bpmnBytes)).deploy();
-            return new Result(true, deployment);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return new Result(false, "失败");
-    }
-
-
-}

+ 0 - 82
src/main/java/com/izouma/awesomeadmin/web/activiti/ProcessController.java

@@ -1,82 +0,0 @@
-package com.izouma.awesomeadmin.web.activiti;
-
-import com.izouma.awesomeadmin.dto.Result;
-import com.izouma.awesomeadmin.model.UserInfo;
-import org.activiti.engine.*;
-import org.activiti.engine.history.HistoricProcessInstanceQuery;
-import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.apache.shiro.SecurityUtils;
-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 java.util.*;
-
-@Controller
-@RequestMapping("/activiti/process")
-@RequiresAuthentication
-public class ProcessController  {
-    @Autowired
-    private IdentityService                identityService;
-    @Autowired
-    private RepositoryService              repositoryService;
-    @Autowired
-    private RuntimeService                 runtimeService;
-    @Autowired
-    private TaskService                    taskService;
-    @Autowired
-    private ManagementService              managementService;
-    @Autowired
-    private FormService                    formService;
-    @Autowired
-    private HistoryService                 historyService;
-    @Autowired
-    private ProcessEngineConfigurationImpl processEngineConfiguration;
-
-    @RequestMapping(value = "/start", method = RequestMethod.POST)
-    @ResponseBody
-    public Result startProcess(@RequestParam("processDefinitionId") String processDefinitionId, List<Map<String, String>> properties, String businessKey) {
-        Map<String, String> formProperties = new HashMap<>();
-
-        for (Map<String, String> map : properties) {
-            formProperties.put(map.get("id"), map.get("value"));
-        }
-        try {
-            identityService.setAuthenticatedUserId(((UserInfo) SecurityUtils.getSubject().getPrincipal()).getId().toString());
-            ProcessInstance processInstance = formService.submitStartFormData(processDefinitionId, formProperties);
-            return new Result(true, (Object) processInstance.getBusinessKey());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return new Result(false, "失败");
-    }
-
-
-    @RequestMapping(value = "/history", method = RequestMethod.GET)
-    @ResponseBody
-    public Result list(Date start, Date end) {
-        String userId = ((UserInfo) SecurityUtils.getSubject().getPrincipal()).getId().toString();
-        HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().startedBy(userId);
-        if (start != null) {
-            query.startedAfter(start);
-        }
-        if (end != null) {
-            query.startedBefore(end);
-        }
-        return new Result(true, query.list());
-    }
-
-    @RequestMapping(value = "/deleteDeployment", method = RequestMethod.POST)
-    @ResponseBody
-    public Result delete(@RequestParam("deploymentId") String deploymentId) {
-        try {
-            repositoryService.deleteDeployment(deploymentId, true);
-            return new Result(true, null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return new Result(false, "删除失败");
-    }
-}

+ 0 - 36
src/main/java/org/activiti/conf/SecurityConfiguration.java

@@ -1,36 +0,0 @@
-package org.activiti.conf;
-
-import com.izouma.awesomeadmin.activiti.CustomAuthenticationProvider;
-import com.izouma.awesomeadmin.activiti.RestFilter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-
-@Configuration
-@EnableWebSecurity
-@EnableWebMvcSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
-
-    @Bean
-    public AuthenticationProvider authenticationProvider() {
-        return new CustomAuthenticationProvider();
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.authenticationProvider(authenticationProvider())
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
-                .csrf().disable()
-                .addFilterBefore(new RestFilter(), UsernamePasswordAuthenticationFilter.class)
-                .authorizeRequests()
-                .anyRequest().permitAll();
-    }
-}

+ 0 - 75
src/main/java/org/activiti/explorer/DispatcherServletConfiguration.java

@@ -1,75 +0,0 @@
-package org.activiti.explorer;
-
-import java.util.List;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-
-@Configuration
-@ComponentScan({"org.activiti.rest","org.activiti.conf"})
-@EnableAsync
-public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
-
-    private final Logger log = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Autowired
-    private Environment environment;
-
-    @Bean
-    public SessionLocaleResolver localeResolver() {
-        return new SessionLocaleResolver();
-    }
-
-    @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor() {
-        log.debug("Configuring localeChangeInterceptor");
-        LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor();
-        localeChangeInterceptor.setParamName("language");
-        return localeChangeInterceptor;
-    }
-
-    @Bean
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
-        log.debug("Creating requestMappingHandlerMapping");
-        RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
-        requestMappingHandlerMapping.setUseSuffixPatternMatch(false);
-        Object[] interceptors = {localeChangeInterceptor()};
-        requestMappingHandlerMapping.setInterceptors(interceptors);
-        return requestMappingHandlerMapping;
-    }
-
-    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        addDefaultHttpMessageConverters(converters);
-        for (HttpMessageConverter<?> converter : converters) {
-            if (converter instanceof MappingJackson2HttpMessageConverter) {
-                MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = (MappingJackson2HttpMessageConverter) converter;
-                jackson2HttpMessageConverter.setObjectMapper(objectMapper);
-                break;
-            }
-        }
-    }
-
-    @Override
-    protected void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-        configurer.favorPathExtension(false);
-    }
-
-}

+ 0 - 39
src/main/java/org/activiti/explorer/FilterServletOutputStream.java

@@ -1,39 +0,0 @@
-package org.activiti.explorer;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-
-public class FilterServletOutputStream extends ServletOutputStream {
-
-    private DataOutputStream stream;
-    private WriteListener writeListener;
-
-    public FilterServletOutputStream(OutputStream output) {
-        stream = new DataOutputStream(output);
-    }
-
-    public void write(int b) throws IOException {
-        stream.write(b);
-    }
-
-    public void write(byte[] b) throws IOException {
-        stream.write(b);
-    }
-
-    public void write(byte[] b, int off, int len) throws IOException {
-        stream.write(b, off, len);
-    }
-
-    @Override
-    public void setWriteListener(WriteListener writeListener) {
-        this.writeListener = writeListener;
-    }
-
-    @Override
-    public boolean isReady() {
-        return true;
-    }
-}

+ 0 - 48
src/main/java/org/activiti/explorer/GenericResponseWrapper.java

@@ -1,48 +0,0 @@
-package org.activiti.explorer;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-public class GenericResponseWrapper extends HttpServletResponseWrapper {
-    private ByteArrayOutputStream output;
-    private int contentLength;
-    private String contentType;
-
-    public GenericResponseWrapper(HttpServletResponse response) {
-        super(response);
-        output = new ByteArrayOutputStream();
-    }
-
-    public byte[] getData() {
-        return output.toByteArray();
-    }
-
-    public ServletOutputStream getOutputStream() {
-        return new FilterServletOutputStream(output);
-    }
-
-    public PrintWriter getWriter() {
-        return new PrintWriter(getOutputStream(), true);
-    }
-
-    public void setContentLength(int length) {
-        this.contentLength = length;
-        super.setContentLength(length);
-    }
-
-    public int getContentLength() {
-        return contentLength;
-    }
-
-    public void setContentType(String type) {
-        this.contentType = type;
-        super.setContentType(type);
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
-} 

+ 0 - 63
src/main/java/org/activiti/explorer/JsonpCallbackFilter.java

@@ -1,63 +0,0 @@
-package org.activiti.explorer;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class JsonpCallbackFilter implements Filter {
-
-    private static Logger log = LoggerFactory.getLogger(JsonpCallbackFilter.class);
-
-    public void init(FilterConfig fConfig) throws ServletException {
-    }
-
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        HttpServletResponse httpResponse = (HttpServletResponse) response;
-
-        Map<String, String[]> parms = httpRequest.getParameterMap();
-
-        if (parms.containsKey("callback")) {
-            if (log.isDebugEnabled())
-                log.debug("Wrapping response with JSONP callback '" + parms.get("callback")[0] + "'");
-
-            OutputStream out = httpResponse.getOutputStream();
-
-            GenericResponseWrapper wrapper = new GenericResponseWrapper(httpResponse);
-
-            chain.doFilter(request, wrapper);
-
-            //handles the content-size truncation
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            outputStream.write(new String(parms.get("callback")[0] + "(").getBytes());
-            outputStream.write(wrapper.getData());
-            outputStream.write(new String(");").getBytes());
-            byte jsonpResponse[] = outputStream.toByteArray();
-
-            wrapper.setContentType("text/javascript;charset=UTF-8");
-            wrapper.setContentLength(jsonpResponse.length);
-
-            out.write(jsonpResponse);
-
-            out.close();
-
-        } else {
-            chain.doFilter(request, response);
-        }
-    }
-
-    public void destroy() {
-    }
-}

+ 4 - 20
src/main/resources/properties/jdbc.properties

@@ -1,25 +1,9 @@
 jdbc.driverClassName=org.gjt.mm.mysql.Driver
 
 
-jdbc.url=jdbc:mysql://120.55.131.232:3306/jee_zouma
-jdbc.username=microball
-jdbc.password=2wsx@WSX#EDC
-jdbc.databaseName=jee_zouma
+jdbc.url=jdbc:mysql://120.55.131.232:3306/tutuxiang
+jdbc.username=tutuxiang
+jdbc.password=1qaz!QAZ
+jdbc.databaseName=tutuxiang
 
-#jdbc.url=jdbc:mysql://121.43.171.110:3306/xin_mu
-#jdbc.username=root
-#jdbc.password=2wsx@WSX#EDC
-#jdbc.databaseName=xin_mu
 
-DRIVER="com.mysql.jdbc.Driver";
-
-#从数据库
-jdbc.slaver.url=jdbc:mysql://120.55.131.232:3306/jeeplus
-jdbc.slaver.username=microball
-jdbc.slaver.password=2wsx@WSX#EDC
-
-#SqlServer
-sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-sqlserver.url=jdbc:sqlserver://172.16.86.59:1433;DatabaseName=muye
-sqlserver.user=mis
-sqlserver.password=radmin@123

+ 1 - 1
src/main/resources/spring/applicationContext.xml

@@ -23,6 +23,6 @@
     <import resource="classpath:spring/appDataSource.xml"/>
     <import resource="classpath:spring/appWebService.xml"/>
     <import resource="classpath:spring/beans-shiro.xml"/>
-    <import resource="classpath:spring/beans-activiti.xml"/>
+    <!--<import resource="classpath:spring/beans-activiti.xml"/>-->
 
 </beans>

+ 0 - 76
src/main/resources/spring/beans-activiti.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-       http://www.springframework.org/schema/tx
-       http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-       http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-4.0.xsd
-       http://www.springframework.org/schema/aop
-       http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-       http://www.springframework.org/schema/task
-       http://www.springframework.org/schema/task/spring-task-4.0.xsd
-       http://www.springframework.org/schema/util
-       http://www.springframework.org/schema/util/spring-util.xsd">
-
-    <!--ACTIVITI-->
-    <context:component-scan base-package="org.activiti.conf,org.activiti.rest.editor,org.activiti.rest.service">
-        <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
-    </context:component-scan>
-
-    <!-- 单例json对象 -->
-    <bean id="objectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
-
-    <!-- 引擎内部提供的UUID生成器,依赖fastxml的java-uuid-generator模块 -->
-    <bean id="uuidGenerator" class="org.activiti.engine.impl.persistence.StrongUuidGenerator"/>
-
-    <!-- Activiti begin -->
-    <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
-        <property name="dataSource" ref="dataSource"/>
-        <property name="transactionManager" ref="transactionManager"/>
-        <property name="databaseSchemaUpdate" value="true"/>
-        <property name="jobExecutorActivate" value="true"/>
-        <property name="customSessionFactories">
-            <list>
-                <bean class="com.izouma.awesomeadmin.activiti.CustomUserEntityManagerFactory">
-                    <property name="customUserEntityManager" ref="customUserEntityManager">
-                    </property>
-                </bean>
-                <bean class="com.izouma.awesomeadmin.activiti.CustomGroupEntityManagerFactory">
-                    <property name="customGroupEntityManager" ref="customGroupEntityManager">
-                    </property>
-                </bean>
-            </list>
-        </property>
-        <property name="beans">
-            <map>
-                <entry key="userService" value-ref="userInfoService"/>
-            </map>
-        </property>
-    </bean>
-
-    <bean id="customUserEntityManager" class="com.izouma.awesomeadmin.activiti.CustomUserEntityManager">
-    </bean>
-    <bean id="customGroupEntityManager" class="com.izouma.awesomeadmin.activiti.CustomGroupEntityManager">
-    </bean>
-    <bean id="userInfoService" class="com.izouma.awesomeadmin.service.impl.UserInfoServiceImpl">
-    </bean>
-
-    <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
-        <property name="processEngineConfiguration" ref="processEngineConfiguration"/>
-    </bean>
-    <!-- 7大接口 -->
-    <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService"/>
-    <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService"/>
-    <bean id="formService" factory-bean="processEngine" factory-method="getFormService"/>
-    <bean id="identityService" factory-bean="processEngine" factory-method="getIdentityService"/>
-    <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService"/>
-    <bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService"/>
-    <bean id="managementService" factory-bean="processEngine" factory-method="getManagementService"/>
-
-    <!-- 集成REST服务需要的bean -->
-    <bean id="restResponseFactory" class="org.activiti.rest.service.api.RestResponseFactory"/>
-    <bean id="contentTypeResolver" class="org.activiti.rest.common.application.DefaultContentTypeResolver"/>
-</beans>

+ 0 - 15
src/main/resources/spring/spring-mvc-modeler.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
-
-    <!-- 自动扫描且只扫描@Controller -->
-    <context:component-scan base-package="org.activiti.rest.editor,org.activiti.rest.diagram">
-        <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
-    </context:component-scan>
-
-    <mvc:annotation-driven/>
-</beans>

+ 0 - 15
src/main/resources/spring/spring-mvc-rest.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
-
-    <!-- 自动扫描且只扫描@Controller -->
-    <context:component-scan base-package="org.activiti.rest">
-        <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller" />
-    </context:component-scan>
-
-    <mvc:annotation-driven />
-</beans>

+ 0 - 96
src/main/vue/src/pages/TableShouyiYaopinxinxi.vue

@@ -1,96 +0,0 @@
-<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="药品编号" label="药品编号">
-                <el-input v-model="formData.药品编号"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="药品名称" label="药品名称">
-                <el-input v-model="formData.药品名称"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="计量单位" label="计量单位">
-                <el-input v-model="formData.计量单位"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="规格" label="规格">
-                <el-input v-model="formData.规格"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="主要成分" label="主要成分">
-                <el-input v-model="formData.主要成分"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="有效成分" label="有效成分">
-                <el-input v-model="formData.有效成分"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="单价" label="单价">
-                <el-input v-model="formData.单价"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="生产厂家" label="生产厂家">
-                <el-input v-model="formData.生产厂家"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="药品制定部门" label="药品制定部门">
-                <el-input v-model="formData.药品制定部门"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="flagcolumn" label="FlagColumn">
-                <el-input v-model="formData.flagcolumn"></el-input>
-            </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: '/tableShouyiYaopinxinxi/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.formData = res.data;
-                    }
-                })
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                        },
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/tableShouyiYaopinxinxi/update' : '/tableShouyiYaopinxinxi/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        }
-    }
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 426
src/main/vue/src/pages/TableShouyiYaopinxinxis.vue

@@ -1,426 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-          
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-              <!--<el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                        label="女"
-                        value="item1">
-                </el-option>
-                <el-option
-                        label="男"
-                        value="item2">
-                </el-option>
-            </el-select>-->
-            <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('/tableShouyiYaopinxinxi')" 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('id')"
-                    prop="id"
-                    label="ID"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('药品编号')"
-                    prop="药品编号"
-                    label="药品编号"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('药品名称')"
-                    prop="药品名称"
-                    label="药品名称"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('计量单位')"
-                    prop="计量单位"
-                    label="计量单位"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('规格')"
-                    prop="规格"
-                    label="规格"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('主要成分')"
-                    prop="主要成分"
-                    label="主要成分"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('有效成分')"
-                    prop="有效成分"
-                    label="有效成分"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('单价')"
-                    prop="单价"
-                    label="单价"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('生产厂家')"
-                    prop="生产厂家"
-                    label="生产厂家"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('药品制定部门')"
-                    prop="药品制定部门"
-                    label="药品制定部门"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('flagcolumn')"
-                    prop="flagcolumn"
-                    label="FlagColumn"
-                    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: 'ID',
-                        value: 'id',
-                        show: true
-                    },
-                                                    {
-                        label: '药品编号',
-                        value: '药品编号',
-                        show: true
-                    },
-                                                    {
-                        label: '药品名称',
-                        value: '药品名称',
-                        show: true
-                    },
-                                                    {
-                        label: '计量单位',
-                        value: '计量单位',
-                        show: true
-                    },
-                                                    {
-                        label: '规格',
-                        value: '规格',
-                        show: true
-                    },
-                                                    {
-                        label: '主要成分',
-                        value: '主要成分',
-                        show: true
-                    },
-                                                    {
-                        label: '有效成分',
-                        value: '有效成分',
-                        show: true
-                    },
-                                                    {
-                        label: '单价',
-                        value: '单价',
-                        show: true
-                    },
-                                                    {
-                        label: '生产厂家',
-                        value: '生产厂家',
-                        show: true
-                    },
-                                                    {
-                        label: '药品制定部门',
-                        value: '药品制定部门',
-                        show: true
-                    },
-                                                    {
-                        label: 'FlagColumn',
-                        value: 'flagcolumn',
-                        show: true
-                    },
-                                    ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'ID'
-                            },
-                                                                                                {
-                                label: '药品编号',
-                                value: '药品编号'
-                            },
-                                                                                                {
-                                label: '药品名称',
-                                value: '药品名称'
-                            },
-                                                                                                {
-                                label: '计量单位',
-                                value: '计量单位'
-                            },
-                                                                                                {
-                                label: '规格',
-                                value: '规格'
-                            },
-                                                                                                {
-                                label: '主要成分',
-                                value: '主要成分'
-                            },
-                                                                                                {
-                                label: '有效成分',
-                                value: '有效成分'
-                            },
-                                                                                                {
-                                label: '单价',
-                                value: '单价'
-                            },
-                                                                                                {
-                                label: '生产厂家',
-                                value: '生产厂家'
-                            },
-                                                                                                {
-                                label: '药品制定部门',
-                                value: '药品制定部门'
-                            },
-                                                                                                {
-                                label: 'FlagColumn',
-                                value: 'FlagColumn'
-                            },
-                                                            ],
-                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: '/tableShouyiYaopinxinxi/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: '/tableShouyiYaopinxinxi',
-                    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 + "/tableShouyiYaopinxinxi/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
-            },
-
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

+ 0 - 188
src/main/vue/src/pages/TestAaa.vue

@@ -1,188 +0,0 @@
-<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="testName" label="名称">
-                <template>
-                    <el-select v-model="formData.testName" clearable placeholder="请选择" :disabled="'testName'==subColumn">
-                        <el-option v-for="item in testNameOptions" :key="item.value" :label="item.label" :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-            <el-form-item prop="remark" label="嗯嗯">
-                <template>
-                    <el-select v-model="formData.remark" clearable placeholder="请选择" :disabled="'remark'==subColumn">
-                        <el-option v-for="item in remarkOptions" :key="item.value" :label="item.label" :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-            <el-form-item prop="imageUrl" label="图片">
-                <single-upload v-model="formData.imageUrl" :disabled="'imageUrl'==subColumn"></single-upload>
-            </el-form-item>
-            <el-form-item prop="testTime" label="时间">
-                <template>
-                    <div class="block">
-                        <el-date-picker v-model="formData.testTime" type="date" value-format="timestamp" placeholder="选择日期" :disabled="'testTime'==subColumn">
-                        </el-date-picker>
-                    </div>
-                </template>
-            </el-form-item>
-            <el-form-item prop="multiSelect" label="多选">
-                <template>
-                    <el-select v-model="formData.multiSelect" multiple clearable placeholder="请选择" :disabled="'multiSelect'==subColumn">
-                        <el-option v-for="item in multiSelectOptions" :key="item.value" :label="item.label" :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</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.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
-        }
-
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/testAaa/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
-
-
-                    if (res.data.multiSelect) {
-                        res.data.multiSelect = res.data.multiSelect.split(',');
-                    } else {
-                        res.data.multiSelect = [];
-                    }
-
-
-                    this.formData = res.data;
-
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
-                }
-            })
-        } else {
-            if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
-            }
-        }
-
-
-
-
-        this.$http.get({
-            url: '/testBbb/all'
-        }).then(res => {
-            if (res.success) {
-
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.remarkOptions.push({ label: item.nameAaa, value: item.nameAaa });
-                    })
-                }
-            }
-        });
-
-
-
-        this.$http.get({
-            url: '/testBbb/all'
-        }).then(res => {
-            if (res.success) {
-
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.multiSelectOptions.push({ label: item.nameCcc, value: item.nameCcc });
-                    })
-                }
-            }
-        });
-    },
-    data() {
-        return {
-            saving: false,
-            formData: {},
-            rules: {
-                testName:
-                    [
-                        { required: true, message: '请输入 名称', trigger: 'blur' },
-                    ],
-                remark:
-                    [
-                        { required: true, message: '请输入 嗯嗯', trigger: 'blur' },
-                    ],
-                multiSelect:
-                    [
-                        { required: true, message: '请输入 多选', trigger: 'blur' },
-                    ],
-            },
-            testNameOptions: [{ label: '??', value: '??' }, { label: '??', value: '??' }, { label: '??', value: '??' }],
-            remarkOptions: [],
-            multiSelectOptions: [],
-            subColumn: '',
-            subValue: '',
-        }
-    },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-            this.$http.post({
-                url: this.formData.id ? '/testAaa/update' : '/testAaa/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/testAaa/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-    }
-}
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 270
src/main/vue/src/pages/TestAaaLineChart.vue

@@ -1,270 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-        </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>
-
-        <line-chart ref="line" :height='200' :chartData='lineData' :options='lineOptions' style="max-width:1000px;margin:auto"></line-chart>
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
-import lineChart from '../components/Line'
-
-export default {
-    created() {
-    },
-    data() {
-        return {
-            filter1: '',
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: 'id',
-                    value: 'id'
-                },
-                {
-                    label: '名字',
-                    value: 'test_name'
-                },
-                {
-                    label: '备注',
-                    value: 'remark'
-                },
-                {
-                    label: '图片',
-                    value: 'image_url'
-                },
-                {
-                    label: '时间',
-                    value: 'test_time'
-                },
-                {
-                    label: '多选',
-                    value: 'multi_select'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            lineData: null,
-            lineOptions: {
-                responsive: true,
-                title: {
-                    display: true,
-                    text: '折线图'
-                },
-                tooltips: {
-                    mode: 'index',
-                    intersect: false,
-                },
-                // hover: {
-                //     mode: 'nearest',
-                //     intersect: true
-                // },
-                scales: {
-                    xAxes: [{
-                        display: true,
-                        scaleLabel: {
-                            display: true,
-                            labelString: 'Month'
-                        }
-                    }],
-                    yAxes: [{
-                        display: true,
-                        scaleLabel: {
-                            display: true,
-                            labelString: 'Value'
-                        }
-                    }]
-                }
-            },
-            chartColors: {
-                red: 'rgb(255, 99, 132)',
-                orange: 'rgb(255, 159, 64)',
-                yellow: 'rgb(255, 205, 86)',
-                green: 'rgb(75, 192, 192)',
-                blue: 'rgb(54, 162, 235)',
-                purple: 'rgb(153, 102, 255)',
-                grey: 'rgb(201, 203, 207)'
-            },
-        }
-    },
-    mounted() {
-        this.getData()
-    },
-    methods: {
-        getData() {
-            this.type = this.$route.query.type
-            this.$http.get({
-                url: '/testAaa/all',
-                data: {
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                }
-            }).then(res => {
-                if (res.success) {
-                    var tempLables = [];
-                    var tempDatasetsLabels = [];
-
-                    res.data.forEach(item => {
-                        tempLables.push(item.testName);
-                        tempDatasetsLabels.push(item.remark);
-                    })
-
-                    tempLables = Array.from(new Set(tempLables));
-
-                    tempDatasetsLabels = Array.from(new Set(tempDatasetsLabels))
-
-                    var tempDatasets = []
-
-                    tempDatasetsLabels.forEach((item, index) => {
-
-                        var colorNames = Object.keys(this.chartColors);
-                        var colorName = colorNames[(index + 1) % colorNames.length];
-
-                        var tempData = [];
-
-                        tempLables.forEach(item2 => {
-                            var datavalue = null;
-                            res.data.forEach(item3 => {
-                                if (item2 == item3.testName && item == item3.remark) {
-                                    datavalue = item3.multiSelect;
-                                }
-                            })
-
-                            tempData.push(datavalue)
-                        })
-
-                        var newDataset = {
-                            label: item,
-                            backgroundColor: this.chartColors[colorName],
-                            borderColor: this.chartColors[colorName],
-                            data: tempData,
-                            fill: false
-                        }
-
-                        tempDatasets.push(newDataset);
-
-                    })
-
-                    this.lineData = {
-                        datasets: tempDatasets,
-                        labels: tempLables,
-
-                    }
-
-
-                    this.$refs.line.updateChart()
-
-
-
-
-                }
-            })
-        },
-        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.$refs.line.updateChart()
-            this.showAdvancedQueryDialog = false;
-        },
-        searchData() {
-            this.getData();
-            setTimeout(() => {
-
-            }, 1000)
-        },
-
-    },
-    components: { lineChart }
-}
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 494
src/main/vue/src/pages/TestAaas.vue

@@ -1,494 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-        
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/testAaa',query:{column:$route.query.column}})" 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('id')"
-                                prop="id"
-                                label="id"
-                                min-width="100">
-                        </el-table-column>
-                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('testName')"
-                                prop="testName"
-                                label="名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="嗯嗯"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('imageUrl')"
-                                prop="imageUrl"
-                                label="图片"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.imageUrl" @click="showImg(row.imageUrl)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('testTime')"
-                                prop="testTime"
-                                label="时间"
-                                :formatter="DateFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('multiSelect')"
-                                prop="multiSelect"
-                                label="多选"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
-                <template slot-scope="scope">
-                    <el-button @click="$router.push({path:'/TestBbbs',query:{column:scope.row.testName+',nameAaa'}})" type="primary" size="small" plain>子表bbb
-            </el-button>
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper" v-if="0">
-                <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>
-
-        <el-dialog title="排序" :visible.sync="showTableSortDialog">
-            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
-            <el-table :data="tableSortFields">
-
-                <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="order" label="排序" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.order">
-                            <el-option label="降序" value="desc">
-                            </el-option>
-                            <el-option label="升序" value="asc">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column width="60" align="center">
-                    <template slot-scope="{ row, column, $index }">
-                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <span slot="footer" class="dialog-footer">
-
-                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
-            <img width="100%" :src="imgSrc" alt="">
-        </el-dialog>
-
-    </div>
-</template>
-<script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'id',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                            {
-                                label: '名称',
-                                value: 'testName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '嗯嗯',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'imageUrl',
-                                show: true
-                            },
-                                                                                                {
-                                label: '时间',
-                                value: 'testTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '多选',
-                                value: 'multiSelect',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'id',
-                                value: 'id'
-                            },
-                                                                                                                                            {
-                                label: '名称',
-                                value: 'test_name'
-                            },
-                                                                                                {
-                                label: '嗯嗯',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'image_url'
-                            },
-                                                                                                {
-                                label: '时间',
-                                value: 'test_time'
-                            },
-                                                                                                {
-                                label: '多选',
-                                value: 'multi_select'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
-        },
-        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() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
-
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
-
-                this.$http.get({
-                    url: '/testAaa/page',
-                    data: data
-                }).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: '/testAaa',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            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;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
-
-                this.orderByStr = '';
-
-                if (this.tableSortFields.length > 0) {
-
-                    var templist = [];
-
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.orderByStr = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/testAaa/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/testAaa/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
-                }
-
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
-
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
-
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

+ 0 - 126
src/main/vue/src/pages/TestBbb.vue

@@ -1,126 +0,0 @@
-<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="nameAaa" label="名称1">
-                <el-input v-model="formData.nameAaa" :disabled="'nameAaa'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="nameBbb" label="名称2">
-                <el-input v-model="formData.nameBbb" :disabled="'nameBbb'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="nameCcc" label="名称3">
-                <el-input v-model="formData.nameCcc" :disabled="'nameCcc'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="nameDdd" label="名称4">
-                <el-input v-model="formData.nameDdd" :disabled="'nameDdd'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</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.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
-
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/testBbb/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-
-                                                                                                                                                                                                                                                                                                                                                
-                        this.formData = res.data;
-
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
-            }
-
-                                                                                                                                                                                            },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                        nameAaa:
-                    [
-                                                {required: true, message: '请输入 名称1', trigger: 'blur'},
-                                                                    ],
-                                                                nameBbb:
-                    [
-                                                {required: true, message: '请输入 名称2', trigger: 'blur'},
-                                                                    ],
-                                                                nameCcc:
-                    [
-                                                {required: true, message: '请输入 名称3', trigger: 'blur'},
-                                                                    ],
-                                                                },
-                                                            subColumn: '',
-            subValue: '',
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/testBbb/update' : '/testBbb/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testBbb/del',
-                    data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-        }
-    }
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 93
src/main/vue/src/pages/TestBbbCopy.vue

@@ -1,93 +0,0 @@
-<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="delFlag" label="删除标识">
-                <el-input v-model="formData.delFlag"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="nameAaa" label="名称1">
-                <el-input v-model="formData.nameAaa"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="nameBbb" label="名称2">
-                <el-input v-model="formData.nameBbb"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                    <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</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: '/testBbbCopy/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.formData = res.data;
-                    }
-                })
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                    },
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/testBbbCopy/update' : '/testBbbCopy/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testBbbCopy/del',
-                    data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-        }
-    }
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 325
src/main/vue/src/pages/TestBbbCopys.vue

@@ -1,325 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-          
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-              <!--<el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                        label="女"
-                        value="item1">
-                </el-option>
-                <el-option
-                        label="男"
-                        value="item2">
-                </el-option>
-            </el-select>-->
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="$router.push('/testBbbCopy')" 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('id')"
-                    prop="id"
-                    label="id"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('delFlag')"
-                    prop="delFlag"
-                    label="删除标识"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('nameAaa')"
-                    prop="nameAaa"
-                    label="名称1"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('nameBbb')"
-                    prop="nameBbb"
-                    label="名称2"
-                    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: 'id',
-                        value: 'id',
-                        show: true
-                    },
-                                                    {
-                        label: '删除标识',
-                        value: 'delFlag',
-                        show: true
-                    },
-                                                    {
-                        label: '名称1',
-                        value: 'nameAaa',
-                        show: true
-                    },
-                                                    {
-                        label: '名称2',
-                        value: 'nameBbb',
-                        show: true
-                    },
-                                    ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'id',
-                                value: 'id'
-                            },
-                                                                                                {
-                                label: '删除标识',
-                                value: 'del_flag'
-                            },
-                                                                                                {
-                                label: '名称1',
-                                value: 'name_aaa'
-                            },
-                                                                                                {
-                                label: '名称2',
-                                value: 'name_bbb'
-                            },
-                                                            ],
-                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: '/testBbbCopy/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: '/testBbbCopy',
-                    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 + "/testBbbCopy/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            }
-
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

+ 0 - 408
src/main/vue/src/pages/TestBbbs.vue

@@ -1,408 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
-            </el-button>
-            <el-button @click="$router.push({path:'/testBbb',query:{column:$route.query.column}})" 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('nameAaa')" prop="nameAaa" label="名称1" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('nameBbb')" prop="nameBbb" label="名称2" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('nameCcc')" prop="nameCcc" label="名称3" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('nameDdd')" prop="nameDdd" label="名称4" min-width="100">
-            </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
-                <template slot-scope="scope">
-                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper" v-if="0">
-                <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>
-
-        <el-dialog title="排序" :visible.sync="showTableSortDialog">
-            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
-            <el-table :data="tableSortFields">
-
-                <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="order" label="排序" align="center">
-                    <template slot-scope="{row}">
-                        <el-select v-model="row.order">
-                            <el-option label="降序" value="desc">
-                            </el-option>
-                            <el-option label="升序" value="asc">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column width="60" align="center">
-                    <template slot-scope="{ row, column, $index }">
-                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <span slot="footer" class="dialog-footer">
-
-                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
-            <img width="100%" :src="imgSrc" alt="">
-        </el-dialog>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
-
-export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 20,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '名称1',
-                    value: 'nameAaa',
-                    show: true
-                },
-                {
-                    label: '名称2',
-                    value: 'nameBbb',
-                    show: true
-                },
-                {
-                    label: '名称3',
-                    value: 'nameCcc',
-                    show: true
-                },
-                {
-                    label: '名称4',
-                    value: 'nameDdd',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '名称1',
-                    value: 'name_aaa'
-                },
-                {
-                    label: '名称2',
-                    value: 'name_bbb'
-                },
-                {
-                    label: '名称3',
-                    value: 'name_ccc'
-                },
-                {
-                    label: '名称4',
-                    value: 'name_ddd'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-        }
-    },
-    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() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                searchKey: this.filter1,
-                advancedQuery: this.advancedQuerySearchKey,
-                orderByStr: this.orderByStr,
-            }
-
-            if (this.$route.query.column) {
-                var tempColumn = this.$route.query.column;
-                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-            }
-
-            this.$http.get({
-                url: '/testBbb/page',
-                data: data
-            }).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: '/testBbb',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
-                }
-            })
-        },
-        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;
-        },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
-        },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
-        },
-        tableSortQuery() {
-
-            this.orderByStr = '';
-
-            if (this.tableSortFields.length > 0) {
-
-                var templist = [];
-
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.orderByStr = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showTableSortDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/testBbb/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/testBbb/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
-
-        },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
-
-        },
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
-        },
-
-    }
-}
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 87
src/main/vue/src/pages/TestDeploy.vue

@@ -1,87 +0,0 @@
-<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="name" label="名称">
-                <el-input v-model="formData.name"></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</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: '/testDeploy/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.formData = res.data;
-                    }
-                })
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-        },
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/testDeploy/update' : '/testDeploy/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testDeploy/del',
-                    data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-        }
-    }
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 301
src/main/vue/src/pages/TestDeploys.vue

@@ -1,301 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-          
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-              <!--<el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                        label="女"
-                        value="item1">
-                </el-option>
-                <el-option
-                        label="男"
-                        value="item2">
-                </el-option>
-            </el-select>-->
-              <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-              </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-
-            <el-button @click="$router.push('/testDeploy')" 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('name')"
-                    prop="name"
-                    label="名称"
-                    min-width="100">
-            </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
-                <template slot-scope="scope">
-                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" 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: '名称',
-                        value: 'name',
-                        show: true
-                    },
-                ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                            {
-                                label: '名称',
-                                value: 'name'
-                            },
-                ],
-                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: '/testDeploy/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: '/testDeploy',
-                    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 + "/testDeploy/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testDeploy/del',
-                    data: { id: row.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

+ 0 - 190
src/main/vue/src/pages/TestGenList.vue

@@ -1,190 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-            <el-input placeholder="用户名" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                        label="女"
-                        value="item1">
-                </el-option>
-                <el-option
-                        label="男"
-                        value="item2">
-                </el-option>
-            </el-select>
-            <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-            </el-button>
-            <el-button @click="$router.push('/user')" type="primary" size="small" icon="el-icon-edit"
-                       class="filter-item">添加
-            </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('aaaBbbb')"
-                            prop="aaaBbbb"
-                            label="aaaBbbb"
-                            min-width="300">
-                    </el-table-column>
-                    <el-table-column
-                            v-if="isColumnShow('cccDdd')"
-                            prop="cccDdd"
-                            label="cccDdd"
-                            min-width="300">
-                    </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>
-    </div>
-</template>
-<script>
-    import {mapState} from 'vuex'
-
-    export default {
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 0,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [{
-                    label: '用户名',
-                    value: 'username',
-                    show: true
-                }, {
-                    label: '昵称',
-                    value: 'nickname',
-                    show: true
-                }, {
-                    label: '头像',
-                    value: 'icon',
-                    show: true
-                }, {
-                    label: '性别',
-                    value: 'sex',
-                    show: true
-                }, {
-                    label: 'openId',
-                    value: 'openId',
-                    show: true
-                }],
-                multipleMode: false
-            }
-        },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
-            }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-                this.$http.get({
-                    url: '/userInfo/page',
-                    data: {
-                        currentPage: this.currentPage,
-                        pageNumber: this.pageSize
-                    }
-                }).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: '/user',
-                    query: {
-                        id: row.id
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            }
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

+ 0 - 98
src/main/vue/src/pages/TestSqlserverAaa.vue

@@ -1,98 +0,0 @@
-<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="nameAaa" label="测试">
-                <el-input v-model="formData.nameAaa"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="nameBbb" label="bbb">
-                <el-input v-model="formData.nameBbb"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                    <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</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: '/testSqlserverAaa/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.formData = res.data;
-                    }
-                })
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                        nameAaa:
-                    [
-                        {required: true, message: '请输入 测试', trigger: 'blur'},
-                                            ],
-                                                                nameBbb:
-                    [
-                        {required: true, message: '请输入 bbb', trigger: 'blur'},
-                                            ],
-                                    },
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/testSqlserverAaa/update' : '/testSqlserverAaa/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testSqlserverAaa/del',
-                    data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-        }
-    }
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 316
src/main/vue/src/pages/TestSqlserverAaas.vue

@@ -1,316 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-          
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-              <!--<el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                        label="女"
-                        value="item1">
-                </el-option>
-                <el-option
-                        label="男"
-                        value="item2">
-                </el-option>
-            </el-select>-->
-              <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-              </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-
-            <el-button @click="$router.push('/testSqlserverAaa')" 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('nameAaa')"
-                    prop="nameAaa"
-                    label="测试"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('nameBbb')"
-                    prop="nameBbb"
-                    label="bbb"
-                    min-width="100">
-            </el-table-column>
-                                        <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
-                <template slot-scope="scope">
-                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" 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: '测试',
-                        value: 'nameAaa',
-                        show: true
-                    },
-                                                    {
-                        label: 'bbb',
-                        value: 'nameBbb',
-                        show: true
-                    },
-                                    ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                {
-                                label: '测试',
-                                value: 'name_aaa'
-                            },
-                                                                                                {
-                                label: 'bbb',
-                                value: 'name_bbb'
-                            },
-                                                            ],
-                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: '/testSqlserverAaa/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: '/testSqlserverAaa',
-                    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 + "/testSqlserverAaa/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testSqlserverAaa/del',
-                    data: { id: row.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

+ 0 - 101
src/main/vue/src/pages/Testaaaone.vue

@@ -1,101 +0,0 @@
-<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="delFlag" label="删除标识">
-                <el-input v-model="formData.delFlag"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="testName" label="名字">
-                <el-input v-model="formData.testName"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="remark" label="备注">
-                <el-input v-model="formData.remark"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                    <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</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: '/testaaaone/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.formData = res.data;
-                    }
-                })
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                        testName:
-                    [
-                        {required: true, message: '请输入 名字', trigger: 'blur'},
-                                            ],
-                                                                remark:
-                    [
-                        {required: true, message: '请输入 备注', trigger: 'blur'},
-                                            ],
-                                    },
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/testaaaone/update' : '/testaaaone/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testaaaone/del',
-                    data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-        }
-    }
-</script>
-<style lang="less" scoped>
-</style>

+ 0 - 321
src/main/vue/src/pages/Testaaaones.vue

@@ -1,321 +0,0 @@
-<template>
-    <div>
-        <div class="filters-container">
-          
-            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-              <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
-              </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
-            </el-button>
-
-            <el-button @click="$router.push('/testaaaone')" 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('delFlag')"
-                    prop="delFlag"
-                    label="删除标识"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('testName')"
-                    prop="testName"
-                    label="名字"
-                    min-width="100">
-            </el-table-column>
-                                                        <el-table-column
-                    v-if="isColumnShow('remark')"
-                    prop="remark"
-                    label="备注"
-                    min-width="100">
-            </el-table-column>
-                                        <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
-                <template slot-scope="scope">
-                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(scope.row)" type="danger" 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: '删除标识',
-                        value: 'delFlag',
-                        show: true
-                    },
-                                                    {
-                        label: '名字',
-                        value: 'testName',
-                        show: true
-                    },
-                                                    {
-                        label: '备注',
-                        value: 'remark',
-                        show: true
-                    },
-                                    ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                    {
-                                label: '删除标识',
-                                value: 'del_flag'
-                            },
-                                                                                                {
-                                label: '名字',
-                                value: 'test_name'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                            ],
-                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: '/testaaaone/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: '/testaaaone',
-                    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 + "/testaaaone/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/testaaaone/del',
-                    data: { id: row.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-
-        }
-    }
-</script>
-<style lang="less" scoped>
-
-</style>

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

@@ -135,31 +135,6 @@ const router = new Router({
                     name: 'CompleteTaskDynamic',
                     component: () => import('../pages/CompleteTaskDynamic')
                 },
-                {
-                    path: '/tableShouyiYaopinxinxis',
-                    name: 'tableShouyiYaopinxinxis',
-                    component: () => import('../pages/TableShouyiYaopinxinxis')
-                },
-                {
-                    path: '/tableShouyiYaopinxinxi',
-                    name: 'tableShouyiYaopinxinxi',
-                    component: () => import('../pages/TableShouyiYaopinxinxi')
-                },
-                {
-                    path: '/testAaas',
-                    name: 'testAaas',
-                    component: () => import('../pages/TestAaas')
-                },
-                {
-                    path: '/testAaa',
-                    name: 'testAaa',
-                    component: () => import('../pages/TestAaa')
-                },
-                {
-                    path: '/testAaaLineChart',
-                    name: 'testAaaLineChart',
-                    component: () => import('../pages/TestAaaLineChart')
-                },
                 {
                     path: '/commonQuerys',
                     name: 'commonQuerys',
@@ -185,26 +160,6 @@ const router = new Router({
                     name: 'queryConfig',
                     component: () => import('../pages/QueryConfig')
                 },
-                {
-                    path: '/testBbbs',
-                    name: 'testBbbs',
-                    component: () => import('../pages/TestBbbs')
-                },
-                {
-                    path: '/testBbb',
-                    name: 'testBbb',
-                    component: () => import('../pages/TestBbb')
-                },
-                {
-                    path: '/testBbbCopys',
-                    name: 'testBbbCopys',
-                    component: () => import('../pages/TestBbbCopys')
-                },
-                {
-                    path: '/testBbbCopy',
-                    name: 'testBbbCopy',
-                    component: () => import('../pages/TestBbbCopy')
-                },
                 {
                     path: '/dataSourceInfos',
                     name: 'dataSourceInfos',
@@ -215,40 +170,10 @@ const router = new Router({
                     name: 'dataSourceInfo',
                     component: () => import('../pages/DataSourceInfo')
                 },
-                {
-                    path: '/testSqlserverAaas',
-                    name: 'testSqlserverAaas',
-                    component: () => import('../pages/TestSqlserverAaas')
-                },
-                {
-                    path: '/TestSqlserverAaa',
-                    name: 'TestSqlserverAaa',
-                    component: () => import('../pages/TestSqlserverAaa')
-                },
                 {
                     path: '/deploySystem',
                     name: 'DeploySystem',
                     component: () => import('../pages/DeploySystem')
-                },
-                {
-                    path: '/testDeploy',
-                    name: 'TestDeploy',
-                    component: () => import('../pages/TestDeploy')
-                },
-                {
-                    path: '/testDeploys',
-                    name: 'TestDeploys',
-                    component: () => import('../pages/TestDeploys')
-                },
-                {
-                    path: '/testaaaone',
-                    name: 'Testaaaone',
-                    component: () => import('../pages/Testaaaone')
-                },
-                {
-                    path: '/testaaaones',
-                    name: 'Testaaaones',
-                    component: () => import('../pages/Testaaaones')
                 }
                 /**INSERT_LOCATION**/
             ]

+ 1 - 47
src/main/webapp/WEB-INF/web.xml

@@ -68,32 +68,6 @@
         <servlet-name>my-dispatcher</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
-    <servlet>
-        <servlet-name>ModelRestServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:spring/spring-mvc-modeler.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ModelRestServlet</servlet-name>
-        <url-pattern>/service/*</url-pattern>
-    </servlet-mapping>
-    <servlet>
-        <servlet-name>RestServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:spring/spring-mvc-rest.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>RestServlet</servlet-name>
-        <url-pattern>/rest/*</url-pattern>
-    </servlet-mapping>
 
     <!-- 配置spring提供的用于整合shiro框架的过滤器 -->
     <filter>
@@ -105,26 +79,6 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>
-            org.springframework.web.filter.DelegatingFilterProxy
-        </filter-class>
-    </filter>
 
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/rest/*</url-pattern>
-        <dispatcher>ERROR</dispatcher>
-        <dispatcher>REQUEST</dispatcher>
-    </filter-mapping>
-    <!-- JSONP -->
-    <filter>
-        <filter-name>JSONPFilter</filter-name>
-        <filter-class>org.activiti.explorer.JsonpCallbackFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>JSONPFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+
 </web-app>