AUTO COMMITTED BY SERVER

src/main/java/com/izouma/awesomeadmin/dao/TestDeployMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.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);
+}
+

src/main/java/com/izouma/awesomeadmin/dao/TestDeployMapper.xml

@@ -0,0 +1,189 @@
+<?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" />
+    </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+        id,
+
+        del_flag,
+
+        </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>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </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>
+        </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.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+             </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="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                </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>
+
+        </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>
+

src/main/java/com/izouma/awesomeadmin/model/TestDeploy.java

@@ -0,0 +1,53 @@
+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 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 getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+}
+

src/main/java/com/izouma/awesomeadmin/service/TestDeployService.java

@@ -0,0 +1,27 @@
+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);
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/TestDeployServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.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;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/web/TestDeployController.java

@@ -0,0 +1,153 @@
+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 extends BaseController{
+
+    @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 = 2;
+        int[] columnWidth = { 20,  20 };
+        String[] columnName = {  "id",   "删除标识"  };
+        String[][] dataList = new String[testDeploys.size()][2];
+
+        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());
+        }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/pages/TestDeploy.vue

@@ -0,0 +1,84 @@
+<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>
+                <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>

src/main/vue/src/pages/TestDeploys.vue

@@ -0,0 +1,286 @@
+<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
+                    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: [
+                ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                ],
+                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>

src/main/vue/src/router/index.js

@@ -219,6 +219,16 @@ const router = new Router({
                     path: '/deploySystem',
                     name: 'DeploySystem',
                     component: () => import('../pages/DeploySystem')
+                },
+                {
+                    path: '/testDeploy',
+                    name: 'TestDeploy',
+                    component: () => import('../pages/TestDeploy')
+                },
+                {
+                    path: '/testDeploys',
+                    name: 'TestDeploys',
+                    component: () => import('../pages/TestDeploys')
                 }
                 /**INSERT_LOCATION**/
             ]
@@ -304,4 +314,4 @@ router.afterEach((to, from) => {
     window.onresize();
 });
 
-export default router;
+export default router;

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.088b4c7451f9da1efa0fce216e8a420c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.0aa8bc9b6ddaf29afc1d.js></script><script type=text/javascript src=/static/js/vendor.0cc822bc4c1bee3013ac.js></script><script type=text/javascript src=/static/js/app.78a637dc787e718dced1.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.8003fad4721bfa982e668ff4dd70d6c6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.c510c55a036ed807d2ab.js></script><script type=text/javascript src=/static/js/vendor.8ba0fb9bc5a4e3599956.js></script><script type=text/javascript src=/static/js/app.0ca0beff292b73c39b1a.js></script></body></html>

src/main/webapp/static/js/23.756da192a4ed8e5ce106.js → src/main/webapp/static/js/22.c5bc34261e9f67860c34.js

@@ -1,2 +1,2 @@
-webpackJsonp([23],{BXS2:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o("mtWM"),a=o.n(r),n={data:function(){return{taskForm:[],taskFormData:{},loading:!1}},created:function(){var t=this;this.$http.get({url:"/rest/form/form-data",data:{taskId:this.$route.query.id}}).then(function(e){t.taskForm=e.formProperties,t.taskFormData={}})},methods:{completeTask:function(){var t=this;this.$refs.taskForm.validate(function(e){e&&(t.loading=!0,a.a.post("rest/form/form-data",{taskId:t.$route.query.id,properties:t.$refs.taskForm.getData()}).then(function(e){t.loading=!1,t.$message.success("成功"),t.$router.go(-1)}).catch(function(e){console.log(e),t.loading=!1,t.$message.error("失败")}))})}},components:{DynamicForm:o("uBmv").a}},s={render:function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",[o("h3"),t._v(" "),o("dynamic-form",{ref:"taskForm",staticStyle:{width:"500px"},attrs:{formProps:t.taskForm}},[o("el-form-item",[o("el-button",{on:{click:function(e){t.$router.go(-1)}}},[t._v("取消")]),t._v(" "),o("el-button",{attrs:{type:"primary",loading:t.loading},on:{click:t.completeTask}},[t._v("完成")])],1)],1)],1)},staticRenderFns:[]};var i=o("VU/8")(n,s,!1,function(t){o("j9OR")},"data-v-75280462",null);e.default=i.exports},j9OR:function(t,e){}});
-//# sourceMappingURL=23.756da192a4ed8e5ce106.js.map
+webpackJsonp([22],{BXS2:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o("mtWM"),a=o.n(r),n={data:function(){return{taskForm:[],taskFormData:{},loading:!1}},created:function(){var t=this;this.$http.get({url:"/rest/form/form-data",data:{taskId:this.$route.query.id}}).then(function(e){t.taskForm=e.formProperties,t.taskFormData={}})},methods:{completeTask:function(){var t=this;this.$refs.taskForm.validate(function(e){e&&(t.loading=!0,a.a.post("rest/form/form-data",{taskId:t.$route.query.id,properties:t.$refs.taskForm.getData()}).then(function(e){t.loading=!1,t.$message.success("成功"),t.$router.go(-1)}).catch(function(e){console.log(e),t.loading=!1,t.$message.error("失败")}))})}},components:{DynamicForm:o("uBmv").a}},s={render:function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",[o("h3"),t._v(" "),o("dynamic-form",{ref:"taskForm",staticStyle:{width:"500px"},attrs:{formProps:t.taskForm}},[o("el-form-item",[o("el-button",{on:{click:function(e){t.$router.go(-1)}}},[t._v("取消")]),t._v(" "),o("el-button",{attrs:{type:"primary",loading:t.loading},on:{click:t.completeTask}},[t._v("完成")])],1)],1)],1)},staticRenderFns:[]};var i=o("VU/8")(n,s,!1,function(t){o("j9OR")},"data-v-75280462",null);e.default=i.exports},j9OR:function(t,e){}});
+//# sourceMappingURL=22.c5bc34261e9f67860c34.js.map

src/main/webapp/static/js/35.ff2dfa1ec6141f726df6.js

@@ -1,2 +0,0 @@
-webpackJsonp([35],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("awIv")},"data-v-3d1f3150",null);t.default=s.exports},awIv:function(e,t){}});
-//# sourceMappingURL=35.ff2dfa1ec6141f726df6.js.map

src/main/webapp/static/js/36.a13305a657fd2b1a4dea.js

@@ -1,2 +0,0 @@
-webpackJsonp([36],{Ll7Y:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=i("mtWM"),a=i.n(n),s={data:function(){return{url:"",percentage:0,building:!1}},methods:{deploy:function(){var t=this;this.$confirm("确定重新部署?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){a.a.post("http://49.4.67.181:8000/job/信牧基础平台/build",{auth:{username:"admin",password:"3edc#EDC"}}).then(function(e){201===e.status&&(t.buildid=/(.*)\/(.+?)\/$/.exec(e.headers.location)[2],t.percentage=0,t.building=!0,t.pollingStatus())})}).catch(function(){})},pollingStatus:function(){var t=this;a.a.get("http://49.4.67.181:8000/job/信牧基础平台/"+this.buildid+"/api/json").then(function(e){if(200===e.status)if(e.data.building){var i=100*((new Date).getTime()-e.data.timestamp)/e.data.estimatedDuration;i=i<0?0:i>=100?99:parseInt(i),t.percentage=i,setTimeout(function(){t.pollingStatus()},500)}else t.percentage=100,t.building=!1,t.$message.success("部署成功")})}}},o={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",[this.building?e("div",[e("div",{staticStyle:{color:"#606266","font-size":"14px"}},[this._v("部署中")]),this._v(" "),e("el-progress",{attrs:{percentage:this.percentage}})],1):e("div",[e("el-alert",{attrs:{title:"请谨慎操作",type:"warning",description:"重新部署会导致网站暂时无法访问",closable:!1,"show-icon":""}}),this._v(" "),e("el-button",{staticStyle:{"margin-top":"20px"},attrs:{size:"small"},on:{click:this.deploy}},[this._v("重新部署")])],1)])},staticRenderFns:[]};var c=i("VU/8")(s,o,!1,function(t){i("iIFa")},"data-v-2fc804dc",null);e.default=c.exports},iIFa:function(t,e){}});
-//# sourceMappingURL=36.a13305a657fd2b1a4dea.js.map