6 ani în urmă · 71daa40ad5
--- a/WebRoot/WEB-INF/jsp/newAdmin/adminInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/adminInfo.jsp
@@ -1,137 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="分组">
			
 
				-                    <el-input v-model="row_info.groupId"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="用户名">
			
 
				-                    <el-input v-model="row_info.userName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="密码">
			
 
				-                    <el-input v-model="row_info.password"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../adminInfo/getAdminInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '1-1',
			
 
				-                user: {
			
 
				-                    id: '5-2',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.userName) {
			
 
				-                    this.$message.warning('请填写用户名');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../adminInfo/update' : '../adminInfo/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/adminInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/adminInfos.jsp
@@ -1,155 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}管理员</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="groupId"
			
 
				-                label="分组"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="userName"
			
 
				-                label="排序"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="password"
			
 
				-                label="密码"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '1-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../adminInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'adminInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../adminInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'adminInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/carInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/carInfo.jsp
@@ -1,254 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>车辆</title>
			
 
				-
			
 
				-    <style>
			
 
				-        .avatar-uploader .el-upload {
			
 
				-            border: 1px dashed #d9d9d9;
			
 
				-            border-radius: 6px;
			
 
				-            cursor: pointer;
			
 
				-            position: relative;
			
 
				-            overflow: hidden;
			
 
				-        }
			
 
				-
			
 
				-        .avatar-uploader .el-upload:hover {
			
 
				-            border-color: #20a0ff;
			
 
				-        }
			
 
				-
			
 
				-        .avatar-uploader-icon {
			
 
				-            font-size: 28px;
			
 
				-            color: #8c939d;
			
 
				-            width: 178px;
			
 
				-            height: 178px;
			
 
				-            line-height: 178px;
			
 
				-            text-align: center;
			
 
				-        }
			
 
				-
			
 
				-        .avatar {
			
 
				-            width: 178px;
			
 
				-            height: 178px;
			
 
				-            display: block;
			
 
				-        }
			
 
				-    </style>
			
 
				-
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-    <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-
			
 
				-        <el-form-item label="图片">
			
 
				-            <el-upload
			
 
				-                    class="avatar-uploader"
			
 
				-                    action="../assets/uploadFile"
			
 
				-                    :show-file-list="false"
			
 
				-                    :on-success="contactAvatarSuccess">
			
 
				-                <img v-if="avatar" :src="avatar" class="avatar">
			
 
				-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				-            </el-upload>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item label="服务点">
			
 
				-            <el-select v-model="row_info.storeId" placeholder="请选择">
			
 
				-                <el-option
			
 
				-                        v-for="item in storeInfos"
			
 
				-                        :key="item.id"
			
 
				-                        :label="item.title"
			
 
				-                        :value="item.id">
			
 
				-                </el-option>
			
 
				-            </el-select>
			
 
				-
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item label="车型">
			
 
				-            <el-input v-model="row_info.carModel"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="座位">
			
 
				-            <el-input v-model="row_info.seatNumber"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="牌照">
			
 
				-            <el-input v-model="row_info.license"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="续航">
			
 
				-            <el-input v-model="row_info.batteryRange"></el-input>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item label="日价格">
			
 
				-            <el-input v-model="row_info.dayPrice"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="周价格">
			
 
				-            <el-input v-model="row_info.weekPrice"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="月价格">
			
 
				-            <el-input v-model="row_info.monthPrice"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="车辆状态">
			
 
				-            <el-input v-model="row_info.carStatus"></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item>
			
 
				-            <el-button type="text" @click="mapDialogVisible = true">点击打开地图选择地址</el-button>
			
 
				-            <template v-if="mapDialogVisible">
			
 
				-                <iframe id="mapPage" width="100%" height="100%" frameborder=0
			
 
				-                        src="https://apis.map.qq.com/tools/locpicker?policy=1&search=1&type=1&coord=31.23035,121.47372&key=OFJBZ-SBUHF-MQVJ3-JSFRF-VT3UZ-GNBJX&referer=领先共享汽车">
			
 
				-                </iframe>
			
 
				-            </template>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-
			
 
				-        <el-form-item label="地址">
			
 
				-            <el-input v-model="row_info.address"></el-input>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item label="详细地址">
			
 
				-            <el-input v-model="row_info.addressDetail"></el-input>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item label="经度">
			
 
				-            <el-input v-model="row_info.longitude"></el-input>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item label="纬度">
			
 
				-            <el-input v-model="row_info.latitude"></el-input>
			
 
				-        </el-form-item>
			
 
				-
			
 
				-        <el-form-item>
			
 
				-            <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-            <el-button>取消</el-button>
			
 
				-        </el-form-item>
			
 
				-    </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-
			
 
				-    var __vue = new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-
			
 
				-            $.get({
			
 
				-                url: '../storeInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.storeInfos = res.data;
			
 
				-
			
 
				-            }.bind(this));
			
 
				-
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../carInfo/getCarInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-
			
 
				-                        if (res.data.realIcon) {
			
 
				-                            this.avatar = res.data.realIcon;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '17-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info: {
			
 
				-                    realIcon: '',
			
 
				-                    storeId: '',
			
 
				-                },
			
 
				-                storeInfos: [],
			
 
				-                avatar: '',
			
 
				-                dialogImageUrl: '',
			
 
				-                dialogVisible: false,
			
 
				-                mapDialogVisible: false,
			
 
				-
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-
			
 
				-                delete data.realIcon;
			
 
				-                $.post({
			
 
				-                    url: this.edit ? '../carInfo/update' : '../carInfo/save',
			
 
				-                    data: data
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        if (!this.edit) {
			
 
				-                            this.row_info.id = res.data;
			
 
				-                        }
			
 
				-                        this.edit = true;
			
 
				-                        this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                    } else {
			
 
				-                        this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-
			
 
				-            handlePictureCardPreview: function (file) {
			
 
				-                this.dialogImageUrl = file.url;
			
 
				-                this.dialogVisible = true;
			
 
				-
			
 
				-            },
			
 
				-            contactAvatarSuccess: function (res, file, fileList) {
			
 
				-                if (res.success) {
			
 
				-                    this.row_info.icon = res.data[0];
			
 
				-                }
			
 
				-                this.avatar = URL.createObjectURL(file.raw);
			
 
				-            },
			
 
				-
			
 
				-        }
			
 
				-    })
			
 
				-
			
 
				-
			
 
				-    window.addEventListener('message', function (event) {
			
 
				-        // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
			
 
				-        var loc = event.data;
			
 
				-        if (loc && loc.module == 'locationPicker') {//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
			
 
				-            console.log('location', loc);
			
 
				-            //console.log('loc.poiaddress', loc.poiaddress);
			
 
				-            //console.log('loc.poiname', loc.poiname);
			
 
				-            __vue.$set(__vue.row_info);
			
 
				-            __vue.row_info.address = loc.poiaddress;
			
 
				-            __vue.row_info.addressDetail = loc.poiname;
			
 
				-            __vue.row_info.longitude = loc.latlng.lng;
			
 
				-            __vue.row_info.latitude = loc.latlng.lat;
			
 
				-            __vue.mapDialogVisible = false;
			
 
				-
			
 
				-        }
			
 
				-    }, false);
			
 
				-
			
 
				-</script>
			
 
				-</html>
			
 
				-
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/carInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/carInfos.jsp
@@ -1,233 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-	<jsp:include page="head.jsp"/>
			
 
				-	<title>车辆</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-	<div class="filters">
			
 
				-		<el-button type="primary" @click="create()">创建</el-button>
			
 
				-		<div class="num"> 共{{totalNumber}}车辆</div>
			
 
				-	</div>
			
 
				-
			
 
				-	<el-table :data="rows"
			
 
				-			ref="table"
			
 
				-			style="width: 100%"
			
 
				-			element-loading-text="拼命加载中"
			
 
				-			stripe
			
 
				-			v-loading="loading">
			
 
				-			<el-table-column
			
 
				-				type="index"
			
 
				-				width="70"
			
 
				-				align="center">
			
 
				-			</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="storeId"
			
 
				-				label="服务点"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="carModel"
			
 
				-				label="车型"
			
 
				-				width="180"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="seatNumber"
			
 
				-				label="座位"
			
 
				-
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="license"
			
 
				-				label="牌照"
			
 
				-				width="150"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="batteryRange"
			
 
				-				label="续航"
			
 
				-				width="150"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<%--<el-table-column
			
 
				-				prop="icon"
			
 
				-				label="icon"
			
 
				-				align="center">
			
 
				-		</el-table-column>--%>
			
 
				-		<el-table-column
			
 
				-				prop="dayPrice"
			
 
				-				label="日价格"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="weekPrice"
			
 
				-				label="周价格"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="monthPrice"
			
 
				-				label="月价格"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="carStatus"
			
 
				-				label="状态"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<%--<el-table-column
			
 
				-				prop="address"
			
 
				-				label="address"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="addressDetail"
			
 
				-				label="addressDetail"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="longitude"
			
 
				-				label="longitude"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="latitude"
			
 
				-				label="latitude"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="createTime"
			
 
				-				label="createTime"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="updateTime"
			
 
				-				label="updateTime"
			
 
				-				align="center">
			
 
				-		</el-table-column>
			
 
				-		<el-table-column
			
 
				-				prop="delFlag"
			
 
				-				label="delFlag"
			
 
				-				align="center">
			
 
				-		</el-table-column>--%>
			
 
				-		<el-table-column
			
 
				-				:context="_self"
			
 
				-				width="150"
			
 
				-				inline-template
			
 
				-				label="操作"
			
 
				-				align="center">
			
 
				-			<div>
			
 
				-				<el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-				<el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-			</div>
			
 
				-		</el-table-column>
			
 
				-	</el-table>
			
 
				-	<div class="pagination-wrapper" v-show="!loading">
			
 
				-		<el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-					:page-size="pageSize"
			
 
				-					:current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-		</el-pagination>
			
 
				-	</div>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-	function getQueryString(name) {
			
 
				-		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-		var r = window.location.search.substr(1).match(reg);
			
 
				-		if (r != null) return unescape(r[2]);
			
 
				-		return null;
			
 
				-	}
			
 
				-	new Vue({
			
 
				-		el: '#app',
			
 
				-		created: function () {
			
 
				-			this.getRows();
			
 
				-		},
			
 
				-		data: function () {
			
 
				-			return {
			
 
				-				menu: '17-1',
			
 
				-				user: {
			
 
				-					id: '',
			
 
				-
			
 
				-					username: 'admin',
			
 
				-					avatar: ''
			
 
				-				},
			
 
				-				loading: false,
			
 
				-				totalNumber: 0,
			
 
				-				totalPage: 10,
			
 
				-				currentPage: 1,
			
 
				-				pageSize: 20,
			
 
				-				rows: []
			
 
				-			};
			
 
				-		},
			
 
				-		methods: {
			
 
				-			logout: function () {
			
 
				-				this.$confirm('确定要注销吗?', '提示', {
			
 
				-					confirmButtonText: '确定',
			
 
				-					cancelButtonText: '取消',
			
 
				-					type: 'info'
			
 
				-				}).then(function () {
			
 
				-					localStorage.removeItem('user');
			
 
				-					this.$router.push({path: '/login'});
			
 
				-				}.bind(this)).catch(function (e) {
			
 
				-
			
 
				-				});
			
 
				-			},
			
 
				-			getRows: function () {
			
 
				-				$.get({
			
 
				-					url: '../carInfo/page',
			
 
				-					data: {
			
 
				-						currentPage: this.currentPage,
			
 
				-						pageNumber: this.pageSize
			
 
				-					}
			
 
				-				}).then(function (res) {
			
 
				-					if (res.success) {
			
 
				-						this.totalNumber = res.data.page.totalNumber;
			
 
				-						this.rows = res.data.pp;
			
 
				-					}
			
 
				-				}.bind(this))
			
 
				-			},
			
 
				-			pageChange: function (page) {
			
 
				-				this.currentPage = page;
			
 
				-				this.getRows();
			
 
				-			},
			
 
				-			sizeChange: function (size) {
			
 
				-				this.pageSize = size;
			
 
				-				this.getRows();
			
 
				-			},
			
 
				-			editRow: function (row) {
			
 
				-				window.location = 'carInfo?id=' + row.id;
			
 
				-			},
			
 
				-			deleteRow: function (row) {
			
 
				-				this.$confirm('确定要删除吗?', '提示', {
			
 
				-					confirmButtonText: '删除',
			
 
				-					cancelButtonText: '取消',
			
 
				-					type: 'warning'
			
 
				-				}).then(function () {
			
 
				-					return $.post({
			
 
				-						url: '../carInfo/del',
			
 
				-						data: {
			
 
				-							id: row.id
			
 
				-						}
			
 
				-					})
			
 
				-				}.bind(this)).then(function (res) {
			
 
				-					if (res.success) {
			
 
				-						this.$message.success('删除成功');
			
 
				-						this.getRows();
			
 
				-					} else {
			
 
				-						this.$message.error('删除失败');
			
 
				-					}
			
 
				-				}.bind(this)).catch(function () {
			
 
				-
			
 
				-				});
			
 
				-			},
			
 
				-			create: function () {
			
 
				-				window.location = 'carInfo';
			
 
				-			}
			
 
				-		}
			
 
				-	})
			
 
				-</script>
			
 
				-</html>
			
 
				-
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/contentBefore.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/contentBefore.jsp
@@ -35,6 +35,9 @@
 
				                         <a href="saleinfos">
			
 
				                         <el-menu-item index="2-2">收房信息</el-menu-item>
			
 
				                         </a>
			
 
				+                        <a href="payTypeInfos">
			
 
				+                        <el-menu-item index="2-3">支付类型</el-menu-item>
			
 
				+                        </a>
			
 
				                     </el-submenu>
			
 
				             </aside>
			
 
				         </template>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/couponInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/couponInfo.jsp
@@ -1,174 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="优惠券">
			
 
				-                    <el-input v-model="row_info.name"></el-input>
			
 
				-                </el-form-item>
			
 
				-      <!--           
			
 
				-         <el-form-item
			
 
				-                label="服务类型">
			
 
				-             <el-select v-model="row_info.serviceType" clearable filterable   placeholder="请选择服务">
			
 
				-			    <el-option
			
 
				-			      v-for="item in serviceTypes"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.typeName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item> -->
			
 
				-        
			
 
				-                
			
 
				-                <el-form-item label="描述">
			
 
				-                    <el-input v-model="row_info.discription"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				- 
			
 
				-        
			
 
				-                
			
 
				-                 <el-form-item label="抵扣金额">
			
 
				-                    <el-input v-model="row_info.discountMoney"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                 <el-form-item label="条件(满可用)">
			
 
				-                    <el-input v-model="row_info.limitMoney"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                 <el-form-item label="领取后有限天数">
			
 
				-                    <el-input v-model="row_info.availableDays"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   /* $.get({
			
 
				-                   url: '../serviceType/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.serviceTypes = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	    */
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../couponInfo/getCouponInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '2-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	serviceType :'',
			
 
				-                },
			
 
				-                serviceTypes : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.name) {
			
 
				-                    this.$message.warning('请填写优惠券');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../couponInfo/update' : '../couponInfo/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/couponInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/couponInfos.jsp
@@ -1,175 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}优惠券</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="name"
			
 
				-                label="优惠券"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="discription"
			
 
				-                label="描述"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="discountMoney"
			
 
				-                label="抵扣金额"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="limitMoney"
			
 
				-                label="条件（元）"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <!-- <el-table-column
			
 
				-        		prop="serviceTypeName"
			
 
				-                label="服务类型"
			
 
				-                align="center">
			
 
				-        </el-table-column> -->
			
 
				-        <el-table-column
			
 
				-        		prop="status"
			
 
				-                label="状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="availableDays"
			
 
				-                label="领取后可用天数"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '2-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../couponInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'couponInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../couponInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'couponInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/franchiseeInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/franchiseeInfo.jsp
@@ -1,165 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-              
			
 
				-                <el-form-item label="用户名">
			
 
				-                    <el-input v-model="row_info.userName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="密码">
			
 
				-                    <el-input v-model="row_info.password"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item label="平台管理费比率">
			
 
				-                    <el-input v-model="row_info.feeRate"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                     <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  </el-form-item>
			
 
				-  
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   
			
 
				-     	   $.get({
			
 
				-                url: '../userInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.userInfos = res.data;
			
 
				-
			
 
				-            }.bind(this));
			
 
				-     	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../franchiseeInfo/getFranchiseeInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '15-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	userId: '',
			
 
				-                	feeRate : 10,
			
 
				-                },
			
 
				-                userInfos : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.userName) {
			
 
				-                    this.$message.warning('请填写用户名');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../franchiseeInfo/update' : '../franchiseeInfo/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/homeBanner.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/homeBanner.jsp
@@ -1,172 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-            
			
 
				-            	<el-form-item label="图片">
			
 
				-		         <el-upload
			
 
				-		                    class="avatar-uploader"
			
 
				-		                    action="../assets/uploadFile"
			
 
				-		                    :show-file-list="false"
			
 
				-		                    :on-success="contactAvatarSuccess">
			
 
				-		                <img v-if="avatar" :src="avatar" class="avatar">
			
 
				-		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				-		            </el-upload>
			
 
				-		        </el-form-item>
			
 
				-        
			
 
				-                <el-form-item label="标题">
			
 
				-                    <el-input v-model="row_info.title"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="地址">
			
 
				-                    <el-input v-model="row_info.url"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="排序">
			
 
				-                    <el-input v-model="row_info.rank"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../homeBanner/getHomeBanner',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        
			
 
				-                        if (res.data.realImage) {
			
 
				-                            this.avatar = res.data.realImage;
			
 
				-                        }
			
 
				-                        
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '3-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-                dialogImageUrl: '',
			
 
				-                dialogVisible: false,
			
 
				-                avatar: ''
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.title) {
			
 
				-                    this.$message.warning('请填写标题');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    delete data.realImage;
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../homeBanner/update' : '../homeBanner/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            
			
 
				-            handlePictureCardPreview: function (file) {
			
 
				-                this.dialogImageUrl = file.url;
			
 
				-                this.dialogVisible = true;
			
 
				-
			
 
				-            },
			
 
				-            contactAvatarSuccess: function (res, file, fileList) {
			
 
				-                if (res.success) {
			
 
				-                    this.row_info.image = res.data[0];
			
 
				-                }
			
 
				-                this.avatar = URL.createObjectURL(file.raw);
			
 
				-            },
			
 
				-            
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/homeBanners.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/homeBanners.jsp
@@ -1,164 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}banner</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="title"
			
 
				-                label="标题"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                label="图片"
			
 
				-                align="center"
			
 
				-                >
			
 
				-            <template scope="scope">
			
 
				-                <img class="singleImg" :src="scope.row.realImage">
			
 
				-            </template>
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="rank"
			
 
				-                label="排序"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="url"
			
 
				-                label="地址"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '3-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../homeBanner/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'homeBanner?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../homeBanner/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'homeBanner';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/homeSelected.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/homeSelected.jsp
@@ -1,206 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-            
			
 
				-            
			
 
				-            <el-form-item label="图片">
			
 
				-		         <el-upload
			
 
				-		                    class="avatar-uploader"
			
 
				-		                    action="../assets/uploadFile"
			
 
				-		                    :show-file-list="false"
			
 
				-		                    :on-success="contactAvatarSuccess">
			
 
				-		                <img v-if="avatar" :src="avatar" class="avatar">
			
 
				-		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				-		            </el-upload>
			
 
				-		        </el-form-item>
			
 
				-		        
			
 
				-                <el-form-item label="标题">
			
 
				-                    <el-input v-model="row_info.title"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="门店">
			
 
				-             <el-select v-model="row_info.storeId" clearable filterable   placeholder="请选择店铺">
			
 
				-			    <el-option
			
 
				-			      v-for="item in storeInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.title"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-                
			
 
				-                <el-form-item label="注释">
			
 
				-                    <el-input v-model="row_info.notice"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="显示价格">
			
 
				-                    <el-input v-model="row_info.price"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="排序标识">
			
 
				-                    <el-input v-model="row_info.rank"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../storeInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.storeInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../homeSelected/getHomeSelected',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        
			
 
				-                        if (res.data.realImage) {
			
 
				-                            this.avatar = res.data.realImage;
			
 
				-                        }
			
 
				-                        
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '4-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	
			
 
				-                	storeId : '',
			
 
				-                },
			
 
				-                storeInfos : [],
			
 
				-                dialogImageUrl: '',
			
 
				-                dialogVisible: false,
			
 
				-                avatar: ''
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.title) {
			
 
				-                    this.$message.warning('请填写标题');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    delete data.realImage;
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../homeSelected/update' : '../homeSelected/save',
			
 
				-                        data: data
			
 
				-                    
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            
			
 
				-            handlePictureCardPreview: function (file) {
			
 
				-                this.dialogImageUrl = file.url;
			
 
				-                this.dialogVisible = true;
			
 
				-
			
 
				-            },
			
 
				-            contactAvatarSuccess: function (res, file, fileList) {
			
 
				-                if (res.success) {
			
 
				-                    this.row_info.image = res.data[0];
			
 
				-                }
			
 
				-                this.avatar = URL.createObjectURL(file.raw);
			
 
				-            },
			
 
				-            
			
 
				-        
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/homeSelecteds.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/homeSelecteds.jsp
@@ -1,175 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}首页精选</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="storeId"
			
 
				-                label="店铺Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-                label="图片"
			
 
				-                align="center"
			
 
				-                >
			
 
				-            <template scope="scope">
			
 
				-                <img class="singleImg" :src="scope.row.realImage">
			
 
				-            </template>
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="title"
			
 
				-                label="标题"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="notice"
			
 
				-                label="注释"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="price"
			
 
				-                label="显示价格"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="rank"
			
 
				-                label="排序"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '4-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../homeSelected/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'homeSelected?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../homeSelected/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'homeSelected';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/labelInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/labelInfo.jsp
@@ -1,128 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="标签">
			
 
				-                    <el-input v-model="row_info.labelName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../labelInfo/getLabelInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '5-1',
			
 
				-                user: {
			
 
				-                    id: '5-2',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.labelName) {
			
 
				-                    this.$message.warning('请填写标签');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../labelInfo/update' : '../labelInfo/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/labelInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/labelInfos.jsp
@@ -1,145 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}标签</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="labelName"
			
 
				-                label="标签"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '5-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../labelInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'labelInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../labelInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'labelInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/memberAccounts.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/memberAccounts.jsp
@@ -1,189 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-      	<el-col :xs="24" :sm="6" :md="5" :lg="3">
			
 
				-            <el-select placeholder="请选择" v-model="userId">
			
 
				-                <el-option v-for="item in users" :label="item.userName" :value="item.id"></el-option>
			
 
				-            </el-select>
			
 
				-        </el-col>
			
 
				-        <el-col :md="24" :lg="12">
			
 
				-            <el-button type="primary" @click="getRows">筛 选</el-button>
			
 
				-        </el-col>
			
 
				-      
			
 
				-        <div class="num"> 共{{totalNumber}}银行卡</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="memberId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="accountName"
			
 
				-                label="姓名"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="bankName"
			
 
				-                label="开户行"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="bankCardNo"
			
 
				-                label="卡号"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="bankAddress"
			
 
				-                label="地址"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-     <!--    <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column> -->
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-            
			
 
				-            $.get({
			
 
				-                url: '../userInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                if (res.success) {
			
 
				-                    this.users = this.users.concat(res.data);
			
 
				-                }
			
 
				-            }.bind(this));
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '6-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                userId:"",
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                users:[],
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-            	
			
 
				-            	var data = {
			
 
				-                    currentPage: this.currentPage,
			
 
				-                    pageNumber: this.pageSize
			
 
				-                };
			
 
				-            	if (this.userId) {
			
 
				-                    data.memberId = this.userId;
			
 
				-                }
			
 
				-            	
			
 
				-                $.get({
			
 
				-                    url: '../memberAccount/page',
			
 
				-                    data: data
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'memberAccount?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../memberAccount/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'memberAccount';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/memberCoinTixians.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/memberCoinTixians.jsp
@@ -1,219 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>美光</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-<div class="filters">
			
 
				-      	<el-col :xs="24" :sm="6" :md="5" :lg="3">
			
 
				-            <el-select placeholder="请选择" v-model="userId">
			
 
				-                <el-option v-for="item in users" :label="item.userName" :value="item.id"></el-option>
			
 
				-            </el-select>
			
 
				-        </el-col>
			
 
				-        <el-col :md="24" :lg="12" :md="5" :lg="3">
			
 
				-            <el-button type="primary" @click="getRows">筛 选</el-button>
			
 
				-        </el-col>
			
 
				-        <div class="num"> 共{{totalNumber}}提现</div>
			
 
				-      </div>
			
 
				-        
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="memberId"
			
 
				-                label="提现人Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="insertTimeStr"
			
 
				-                label="时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="money"
			
 
				-                label="金额"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="accountId"
			
 
				-                label="银行账户"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="dealUser"
			
 
				-                label="处理人"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-         <el-table-column
			
 
				-        		prop="txStatus"
			
 
				-                label="状态"
			
 
				-                :formatter="formatState"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">通过</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">失败</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-            
			
 
				-            $.get({
			
 
				-                url: '../userInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                if (res.success) {
			
 
				-                    this.users = this.users.concat(res.data);
			
 
				-                }
			
 
				-            }.bind(this));
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '6-3',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                userId: '',
			
 
				-                users:[],
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-            	
			
 
				-            	var data = {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    };
			
 
				-                	if (this.userId) {
			
 
				-                        data.memberId = this.userId;
			
 
				-                    }
			
 
				-            	
			
 
				-                $.get({
			
 
				-                    url: '../memberCoinTixian/page',
			
 
				-                    data: data
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            formatState: function (row) {
			
 
				-                switch (row.txStatus) {
			
 
				-                    case 0:
			
 
				-                        return '待处理';
			
 
				-                    case 1:
			
 
				-                        return '通过';
			
 
				-                    case 2:
			
 
				-                        return '未通过';
			
 
				-                    default:
			
 
				-                        return '未知'
			
 
				-                }
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-            	$.post({
			
 
				-                    url: '../memberCoinTixian/pass',
			
 
				-                    data: {
			
 
				-                        id: row.id,
			
 
				-        	        	txStatus : 1
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        row.txStatus=1;
			
 
				-                        row.dealUser = res.data.superUser;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要失败吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../memberCoinTixian/fail',
			
 
				-                        data: {
			
 
				-                            id: row.id,
			
 
				-                            txStatus : 2
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                    	row.dealUser = res.data.superUser;
			
 
				-                    	row.txStatus=2;
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'memberCoinTixian';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/memberCoins.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/memberCoins.jsp
@@ -1,184 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-      
			
 
				-      <el-col :xs="24" :sm="6" :md="5" :lg="3">
			
 
				-            <el-select placeholder="请选择" v-model="userId">
			
 
				-                <el-option v-for="item in users" :label="item.userName" :value="item.id"></el-option>
			
 
				-            </el-select>
			
 
				-        </el-col>
			
 
				-        <el-col :md="24" :lg="12">
			
 
				-            <el-button type="primary" @click="getRows">筛 选</el-button>
			
 
				-        </el-col>
			
 
				-      
			
 
				-        <div class="num"> 共{{totalNumber}}余额明细</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="memberId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="insertUser"
			
 
				-                label="操作人"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="money"
			
 
				-                label="变动金额"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="balance"
			
 
				-                label="余额"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="remark"
			
 
				-                label="备注"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="createTimeStr"
			
 
				-                label="时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-            
			
 
				-            $.get({
			
 
				-                url: '../userInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                if (res.success) {
			
 
				-                    this.users = this.users.concat(res.data);
			
 
				-                }
			
 
				-            }.bind(this));
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '6-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                userId: '',
			
 
				-                users:[],
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-            	
			
 
				-            	var data = {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    };
			
 
				-                	if (this.userId) {
			
 
				-                        data.memberId = this.userId;
			
 
				-                    }
			
 
				-            	
			
 
				-                $.get({
			
 
				-                    url: '../memberCoin/page',
			
 
				-                    data: data
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'memberCoin?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../memberCoin/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'memberCoin';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/payTypeInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/payTypeInfo.jsp
@@ -0,0 +1,105 @@
 
				+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				+<html>
			
 
				+<head>
			
 
				+	<jsp:include page="head.jsp"/>
			
 
				+	<title>享居屋房源管理系统</title>
			
 
				+</head>
			
 
				+<body>
			
 
				+<jsp:include page="contentBefore.jsp"/>
			
 
				+<template>
			
 
				+	<el-form ref="form" :model="row_info" label-width="80px">
			
 
				+		<el-form-item label="支付类型">
			
 
				+			<el-input v-model="row_info.payType"></el-input>
			
 
				+		</el-form-item>
			
 
				+		<el-form-item label="天数">
			
 
				+			<el-input v-model="row_info.dayNum"></el-input>
			
 
				+		</el-form-item>
			
 
				+		<el-form-item label="备注">
			
 
				+			<el-input v-model="row_info.remark"></el-input>
			
 
				+		</el-form-item>
			
 
				+		<el-form-item label="排序">
			
 
				+			<el-input v-model="row_info.rank"></el-input>
			
 
				+		</el-form-item>
			
 
				+		<el-form-item>
			
 
				+			<el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				+			<el-button>取消</el-button>
			
 
				+	</el-form-item>
			
 
				+	</el-form>
			
 
				+</template>
			
 
				+<jsp:include page="contentAfter.jsp"/>
			
 
				+</body>
			
 
				+<script>
			
 
				+	function getQueryString(name) {
			
 
				+		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				+		var r = window.location.search.substr(1).match(reg);
			
 
				+		if (r != null) return unescape(r[2]);
			
 
				+		return null;
			
 
				+	}
			
 
				+	new Vue({
			
 
				+		el: '#app',
			
 
				+		created: function () {
			
 
				+			var id = getQueryString('id');
			
 
				+			if (id) {
			
 
				+				$.get({
			
 
				+					url: '../payTypeInfo/getPayTypeInfo',
			
 
				+					data: {
			
 
				+						id: id
			
 
				+					}
			
 
				+				}).then(function (res) {
			
 
				+					if (res.success) {
			
 
				+						this.edit = true;
			
 
				+						this.row_info = res.data;
			
 
				+					}
			
 
				+				}.bind(this));
			
 
				+			}
			
 
				+		},
			
 
				+		data: function () {
			
 
				+			return {
			
 
				+				menu: '2-3',
			
 
				+				user: {
			
 
				+					id: '',
			
 
				+
			
 
				+					username: 'admin',
			
 
				+					avatar: ''
			
 
				+				},
			
 
				+				loading: false,
			
 
				+				edit: false,
			
 
				+				tab: 1,
			
 
				+				row_info : {},
			
 
				+			};
			
 
				+		},
			
 
				+		methods: {
			
 
				+			logout: function () {
			
 
				+				this.$confirm('确定要注销吗?', '提示', {
			
 
				+					confirmButtonText: '确定',
			
 
				+					cancelButtonText: '取消',
			
 
				+					type: 'info'
			
 
				+				}).then(function () {
			
 
				+					localStorage.removeItem('user');
			
 
				+					this.$router.push({path: '/login'});
			
 
				+				}.bind(this)).catch(function (e) {
			
 
				+
			
 
				+				});
			
 
				+			},
			
 
				+			onSubmit: function () {
			
 
				+				var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				+				$.post({
			
 
				+					url: this.edit ? '../payTypeInfo/update' : '../payTypeInfo/save',
			
 
				+					data: data
			
 
				+				}).then(function (res) {
			
 
				+					if (res.success) {
			
 
				+						if (!this.edit) {
			
 
				+							this.row_info.id = res.data;
			
 
				+						}
			
 
				+						this.edit = true;
			
 
				+						this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				+					} else {
			
 
				+						this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				+					}
			
 
				+				}.bind(this))
			
 
				+			},
			
 
				+		}
			
 
				+	})
			
 
				+</script>
			
 
				+</html>
			
 
				+
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/franchiseeInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/franchiseeInfos.jsp
@@ -2,14 +2,14 @@
 
				 <html>
			
 
				 <head>
			
 
				     <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				+    <title>享居屋房源管理系统</title>
			
 
				 </head>
			
 
				 <body>
			
 
				 <jsp:include page="contentBefore.jsp"/>
			
 
				 <template>
			
 
				-      <div class="filters">
			
 
				+    <div class="filters">
			
 
				         <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}加盟商</div>
			
 
				+        <div class="num"> 共{{totalNumber}}记录</div>
			
 
				     </div>
			
 
				 
			
 
				     <el-table :data="rows"
			
@@ -24,23 +24,23 @@
 
				                 align="center">
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
 
				-        		prop="userName"
			
 
				-                label="排序"
			
 
				+                prop="payType"
			
 
				+                label="支付类型"
			
 
				                 align="center">
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
 
				-        		prop="password"
			
 
				-                label="密码"
			
 
				+                prop="dayNum"
			
 
				+                label="天数"
			
 
				                 align="center">
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
 
				-        		prop="feeRate"
			
 
				-                label="平台管理费比率"
			
 
				+                prop="remark"
			
 
				+                label="备注"
			
 
				                 align="center">
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
 
				-        		prop="userId"
			
 
				-                label="用户ID"
			
 
				+                prop="rank"
			
 
				+                label="排序"
			
 
				                 align="center">
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
@@ -55,18 +55,23 @@
 
				             </div>
			
 
				         </el-table-column>
			
 
				     </el-table>
			
 
				-
			
 
				     <div class="pagination-wrapper" v-show="!loading">
			
 
				         <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				                        :page-size="pageSize"
			
 
				                        :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				         </el-pagination>
			
 
				     </div>
			
 
				-
			
 
				 </template>
			
 
				 <jsp:include page="contentAfter.jsp"/>
			
 
				 </body>
			
 
				 <script>
			
 
				+    function getQueryString(name) {
			
 
				+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				+        var r = window.location.search.substr(1).match(reg);
			
 
				+        if (r != null) return unescape(r[2]);
			
 
				+        return null;
			
 
				+    }
			
 
				+
			
 
				     new Vue({
			
 
				         el: '#app',
			
 
				         created: function () {
			
@@ -74,9 +79,10 @@
 
				         },
			
 
				         data: function () {
			
 
				             return {
			
 
				-                menu: '15-1',
			
 
				+                menu: '2-3',
			
 
				                 user: {
			
 
				                     id: '',
			
 
				+
			
 
				                     username: 'admin',
			
 
				                     avatar: ''
			
 
				                 },
			
@@ -103,7 +109,7 @@
 
				             },
			
 
				             getRows: function () {
			
 
				                 $.get({
			
 
				-                    url: '../franchiseeInfo/page',
			
 
				+                    url: '../payTypeInfo/page',
			
 
				                     data: {
			
 
				                         currentPage: this.currentPage,
			
 
				                         pageNumber: this.pageSize
			
@@ -124,7 +130,7 @@
 
				                 this.getRows();
			
 
				             },
			
 
				             editRow: function (row) {
			
 
				-                window.location = 'franchiseeInfo?id=' + row.id;
			
 
				+                window.location = 'payTypeInfo?id=' + row.id;
			
 
				             },
			
 
				             deleteRow: function (row) {
			
 
				                 this.$confirm('确定要删除吗?', '提示', {
			
@@ -133,7 +139,7 @@
 
				                     type: 'warning'
			
 
				                 }).then(function () {
			
 
				                     return $.post({
			
 
				-                        url: '../franchiseeInfo/del',
			
 
				+                        url: '../payTypeInfo/del',
			
 
				                         data: {
			
 
				                             id: row.id
			
 
				                         }
			
@@ -150,11 +156,10 @@
 
				                 });
			
 
				             },
			
 
				             create: function () {
			
 
				-                window.location = 'franchiseeInfo';
			
 
				+                window.location = 'payTypeInfo';
			
 
				             }
			
 
				         }
			
 
				     })
			
 
				 </script>
			
 
				-
			
 
				-
			
 
				 </html>
			
 
				+
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/quickComment.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/quickComment.jsp
@@ -1,134 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="评论">
			
 
				-                    <el-input v-model="row_info.comment"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="星级">
			
 
				-                    <el-input v-model="row_info.starLevel"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../quickComment/getQuickComment',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	starLevel : 5
			
 
				-                },
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.comment) {
			
 
				-                    this.$message.warning('请填写评论');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../quickComment/update' : '../quickComment/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/quickComments.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/quickComments.jsp
@@ -1,150 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}快捷评论</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="comment"
			
 
				-                label="评论"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="starLevel"
			
 
				-                label="星级"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../quickComment/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'quickComment?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../quickComment/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'quickComment';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/rentInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/rentInfo.jsp
@@ -185,6 +185,7 @@
 
				 
			
 
				             <el-form-item class="excess" label="合同开始日期">
			
 
				                 <el-input v-model="row_info.contractStart"></el-input>
			
 
				+
			
 
				             </el-form-item>
			
 
				             <el-form-item class="excess" label="合同结束日期">
			
 
				                 <el-input v-model="row_info.contractEnd"></el-input>
			
@@ -356,7 +357,19 @@
 
				             <el-form-item label="视频">
			
 
				                 <el-input v-model="row_info.houseVideo"></el-input>
			
 
				             </el-form-item>
			
 
				-            <el-form-item style="position: fixed;bottom: -20px" >
			
 
				+            <el-form-item label="支付方式ID">
			
 
				+                <el-input v-model="row_info.payTypeId"></el-input>
			
 
				+            </el-form-item>
			
 
				+            <el-form-item label="单次金额">
			
 
				+                <el-input v-model="row_info.onceMoney"></el-input>
			
 
				+            </el-form-item>
			
 
				+            <el-form-item label="通知">
			
 
				+                <el-input v-model="row_info.noticeFlag"></el-input>
			
 
				+            </el-form-item>
			
 
				+            <el-form-item label="开单人电话">
			
 
				+                <el-input v-model="row_info.submitterPhone"></el-input>
			
 
				+            </el-form-item>
			
 
				+            <el-form-item style="position: fixed;bottom: -20px">
			
 
				 
			
 
				                 <el-button type="primary" v-show='userLimit==1||userLimit==2||userLimit==3||userLimit==4||userLimit==5'
			
 
				                            v-if="row_info.reviewFlag=='N'||userLimit==5"
			
@@ -383,7 +396,7 @@
 
				         if (getQueryString('currentPage')) {
			
 
				             console.log("getQueryString('searchId'):" + getQueryString('searchId'));
			
 
				             pageString = headStr + "currentPage=" + getQueryString('currentPage') + "&pageSize=" + getQueryString('pageSize')
			
 
				-                + "&typeId=" + getQueryString('typeId') + "&searchId=" + getQueryString('searchId');
			
 
				+                + "&typeId=" + getQueryString('typeId') + "&searchId=" + getQueryString('searchId') + "&reviewFlagKey=" + getQueryString('reviewFlagKey');
			
 
				         }
			
 
				 
			
 
				         return pageString;
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/rentInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/rentInfos.jsp
@@ -26,6 +26,14 @@
 
				             </el-option>
			
 
				          </el-select> -->
			
 
				         <el-button type="primary" @click="serchLike()" class="btn34">搜索</el-button>
			
 
				+
			
 
				+        <el-select v-model="reviewFlagKey" size="small" clearable filterable placeholder="审核状态" @change="serchLike"
			
 
				+                   style="width:120px">
			
 
				+            <el-option key="N" label="审核中" value="N"></el-option>
			
 
				+            <el-option key="Y" label="通过" value="Y"></el-option>
			
 
				+            <el-option key="F" label="解除" value="F"></el-option>
			
 
				+        </el-select>
			
 
				+
			
 
				         <!--  	<el-button type="primary" @click="create()" class="btn34">创建</el-button>  -->
			
 
				         <div class="num"> 共{{totalNumber}}标签</div>
			
 
				     </div>
			
@@ -309,7 +317,8 @@
 
				                 <el-button size="small" @click="editRow(row)"
			
 
				                            v-show="userLimit==1||userLimit==2||userLimit==3||userLimit==4||userLimit==5">查看
			
 
				                 </el-button>
			
 
				-                <el-button size="small" @click="auditorRow(row)" v-show="userLimit==2||userLimit==3||userLimit==4||userLimit==5"
			
 
				+                <el-button size="small" @click="auditorRow(row)"
			
 
				+                           v-show="userLimit==2||userLimit==3||userLimit==4||userLimit==5"
			
 
				                            v-if="row.reviewFlag=='N'">
			
 
				                     审核
			
 
				                 </el-button>
			
@@ -364,12 +373,17 @@
 
				                 this.pageSize = parseInt(getQueryString('pageSize'));
			
 
				             }
			
 
				             if (getQueryString('typeId')) {
			
 
				-               this.typeId = getQueryString('typeId');
			
 
				+                this.typeId = getQueryString('typeId');
			
 
				             }
			
 
				             if (getQueryString('searchId')) {
			
 
				-               this.searchId =  getQueryString('searchId')
			
 
				+                this.searchId = getQueryString('searchId')
			
 
				+            }
			
 
				+
			
 
				+            if (getQueryString('reviewFlagKey')) {
			
 
				+                this.reviewFlagKey = getQueryString('reviewFlagKey')
			
 
				             }
			
 
				 
			
 
				+
			
 
				             this.getUserLimit();
			
 
				             this.serchLike();
			
 
				         },
			
@@ -411,6 +425,7 @@
 
				                 auditorId: '',
			
 
				                 typeId: '',
			
 
				                 searchId: '',
			
 
				+                reviewFlagKey: '',
			
 
				             };
			
 
				         },
			
 
				         methods: {
			
@@ -464,7 +479,7 @@
 
				 
			
 
				                 window.location = 'rentInfo?id=' + row.id
			
 
				                     + "&currentPage=" + this.currentPage + "&pageSize=" + this.pageSize
			
 
				-                    + "&typeId=" + this.typeId + "&searchId=" + this.searchId+ "&typeFlag=2";
			
 
				+                    + "&typeId=" + this.typeId + "&searchId=" + this.searchId + "&typeFlag=2&reviewFlagKey=" + this.reviewFlagKey;
			
 
				             },
			
 
				             deleteRow: function (row) {
			
 
				                 this.$confirm('确定要删除吗?', '提示', {
			
@@ -526,7 +541,8 @@
 
				                         phone: phoneVal,
			
 
				                         note: noteVal,
			
 
				                         submitter: submitterVal,
			
 
				-                        type: 2
			
 
				+                        type: 2,
			
 
				+                        reviewFlag: this.reviewFlagKey,
			
 
				                     }
			
 
				                 }).then(function (res) {
			
 
				                     console.log(res);
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/repairerInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/repairerInfo.jsp
@@ -1,236 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="维修人员">
			
 
				-                    <el-input v-model="row_info.repairerName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                <el-form-item label="联系电话">
			
 
				-                    <el-input v-model="row_info.telephone"></el-input>
			
 
				-                </el-form-item>
			
 
				-              <!--   <el-form-item label="价格">
			
 
				-                    <el-input v-model="row_info.price"></el-input>
			
 
				-                </el-form-item> -->
			
 
				-               <el-form-item label="标签">
			
 
				-                  <el-select v-model="row_info.label" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in labelInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.labelName"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                
			
 
				-                  <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  </el-form-item>
			
 
				-  
			
 
				-                <!-- <el-form-item label="支持工位">
			
 
				-                    <el-select v-model="row_info.supportStation" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in stationInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.title"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-					  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="支持服务">
			
 
				-                       <el-select v-model="row_info.supportService" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in serviceInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.title"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-                </el-form-item>
			
 
				-                 -->
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	
			
 
				-        	
			
 
				-        	  $.get({
			
 
				-                  url: '../labelInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.labelInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	  
			
 
				-        	  
			
 
				-        	  $.get({
			
 
				-                  url: '../userInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.userInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	  
			
 
				-        	  
			
 
				-        	/*   $.get({
			
 
				-                  url: '../serviceInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.serviceInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	  
			
 
				-        	  
			
 
				-        	  $.get({
			
 
				-                  url: '../stationInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.stationInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	   */
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../repairerInfo/getRepairerInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        if(res.data.label){
			
 
				-                        	res.data.label = res.data.label.split(',').map(function(i){return Number(i);});
			
 
				-                        }
			
 
				-                        if(!res.data.userId){
			
 
				-                        	res.data.userId = '';
			
 
				-                        }
			
 
				-                        
			
 
				-                        this.row_info = res.data;
			
 
				-                        
			
 
				-                        
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '13-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	label : '',
			
 
				-                	supportStation : '',
			
 
				-                	supportService : '',
			
 
				-                	userId:'',
			
 
				-                },
			
 
				-                serviceInfos : [],
			
 
				-                labelInfos : [],
			
 
				-                stationInfos : [],
			
 
				-                userInfos : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.repairerName) {
			
 
				-                    this.$message.warning('请填写维修人员');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    data.label =  data.label.join();
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../repairerInfo/update' : '../repairerInfo/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/repairerInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/repairerInfos.jsp
@@ -1,187 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}维修人员</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="repairerName"
			
 
				-                label="维修人员"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="telephone"
			
 
				-                label="联系电话"
			
 
				-                align="center"
			
 
				-                width="150"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="sex"
			
 
				-                label="性别"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="label"
			
 
				-                label="标签"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <!-- <el-table-column
			
 
				-                prop="price"
			
 
				-                label="价格"
			
 
				-                align="center">
			
 
				-        </el-table-column> -->
			
 
				-        <el-table-column
			
 
				-                prop="icon"
			
 
				-                label="头像"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <!-- <el-table-column
			
 
				-                prop="supportStation"
			
 
				-                label="支持工位"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="supportService"
			
 
				-                label="支持服务"
			
 
				-                align="center">
			
 
				-        </el-table-column> -->
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '13-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../repairerInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'repairerInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../repairerInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'repairerInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/repairerOrder.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/repairerOrder.jsp
@@ -1,133 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-                <el-form-item label="总费 ">
			
 
				-                    <el-input v-model="row_info.totlePrice"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="工作时间 ">
			
 
				-                    <el-input v-model="row_info.workMinute"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="状态 ">
			
 
				-                    <el-input v-model="row_info.orderStatus"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../userOrder/getUserOrder',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '11-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../userOrder/update' : '../userOrder/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/repairerOrders.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/repairerOrders.jsp
@@ -1,190 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <div class="num"> 共{{totalNumber}}订单</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-         <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="repairerId"
			
 
				-                label="维修Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="storeId"
			
 
				-                label="门店ID"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="stationId"
			
 
				-                label="场地"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="remark"
			
 
				-                label="备注 "
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-                prop="createTimeStr"
			
 
				-                label="预约时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="confirmTimeStr"
			
 
				-                label="确认时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="endTimeStr"
			
 
				-                label="结束时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="statusFlag"
			
 
				-                label="订单状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="报单人"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="orderId"
			
 
				-                label="用户订单Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <!-- <el-button size="small" @click="editRow(row)">编辑</el-button> -->
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '13-3',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../repairerOrder/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'repairerOrder?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../repairerOrder/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'repairerOrder';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/saleinfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/saleinfos.jsp
@@ -4,9 +4,6 @@
 
				     <jsp:include page="head.jsp"/>
			
 
				     <title>享居屋房源管理系统</title>
			
 
				     <style>
			
 
				-        table {
			
 
				-            width: 6000 pxn;
			
 
				-        }
			
 
				     </style>
			
 
				 </head>
			
 
				 <body>
			
@@ -31,6 +28,14 @@
 
				             </el-option>
			
 
				          </el-select> -->
			
 
				         <el-button type="primary" @click="serchLike()" class="btn34">搜索</el-button>
			
 
				+
			
 
				+        <el-select v-model="reviewFlagKey" size="small" clearable filterable placeholder="审核状态" @change="serchLike"
			
 
				+                   style="width:120px">
			
 
				+            <el-option key="N" label="审核中" value="N"></el-option>
			
 
				+            <el-option key="Y" label="通过" value="Y"></el-option>
			
 
				+            <el-option key="F" label="解除" value="F"></el-option>
			
 
				+        </el-select>
			
 
				+
			
 
				         <!--  	<el-button type="primary" @click="create()">创建</el-button>  -->
			
 
				         <div class="num"> 共{{totalNumber}}标签</div>
			
 
				     </div>
			
@@ -313,9 +318,11 @@
 
				                 label="操作"
			
 
				                 align="center">
			
 
				             <div>
			
 
				-                <el-button size="small" @click="editRow(row)" v-show="userLimit==1||userLimit==2||userLimit==3||userLimit==4||userLimit==5">查看
			
 
				+                <el-button size="small" @click="editRow(row)"
			
 
				+                           v-show="userLimit==1||userLimit==2||userLimit==3||userLimit==4||userLimit==5">查看
			
 
				                 </el-button>
			
 
				-                <el-button size="small" @click="auditorRow(row)" v-show="userLimit==2||userLimit==3||userLimit==4||userLimit==5" v-if="row.reviewFlag=='N'">
			
 
				+                <el-button size="small" @click="auditorRow(row)"
			
 
				+                           v-show="userLimit==2||userLimit==3||userLimit==4||userLimit==5" v-if="row.reviewFlag=='N'">
			
 
				                     审核
			
 
				                 </el-button>
			
 
				                 <!-- <el-button size="small" @click="editRow(row)" v-show="userLimit==2||userLimit==3">修改</el-button> -->
			
@@ -371,7 +378,10 @@
 
				                 this.typeId = getQueryString('typeId');
			
 
				             }
			
 
				             if (getQueryString('searchId')) {
			
 
				-                this.searchId =  getQueryString('searchId')
			
 
				+                this.searchId = getQueryString('searchId')
			
 
				+            }
			
 
				+            if (getQueryString('reviewFlagKey')) {
			
 
				+                this.reviewFlagKey = getQueryString('reviewFlagKey')
			
 
				             }
			
 
				 
			
 
				             this.getUserLimit();
			
@@ -401,6 +411,7 @@
 
				                 auditorId: '',
			
 
				                 typeId: '',
			
 
				                 searchId: '',
			
 
				+                reviewFlagKey: '',
			
 
				             };
			
 
				         },
			
 
				         methods: {
			
@@ -453,7 +464,7 @@
 
				             editRow: function (row) {
			
 
				                 window.location = 'rentInfo?id=' + row.id
			
 
				                     + "&currentPage=" + this.currentPage + "&pageSize=" + this.pageSize
			
 
				-                    + "&typeId=" + this.typeId + "&searchId=" + this.searchId+ "&typeFlag=1";
			
 
				+                    + "&typeId=" + this.typeId + "&searchId=" + this.searchId + "&typeFlag=1&reviewFlagKey="+this.reviewFlagKey;
			
 
				             },
			
 
				             deleteRow: function (row) {
			
 
				                 this.$confirm('确定要删除吗?', '提示', {
			
@@ -518,7 +529,8 @@
 
				                         phone: phoneVal,
			
 
				                         note: noteVal,
			
 
				                         submitter: submitterVal,
			
 
				-                        type: 1
			
 
				+                        type: 1,
			
 
				+                        reviewFlag: this.reviewFlagKey,
			
 
				                     }
			
 
				                 }).then(function (res) {
			
 
				                     console.log(res);
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/serviceType.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/serviceType.jsp
@@ -1,132 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="类型">
			
 
				-                    <el-input v-model="row_info.typeName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="排序">
			
 
				-                    <el-input v-model="row_info.rank"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../serviceType/getServiceType',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '8-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.typeName) {
			
 
				-                    this.$message.warning('请填写类型');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../serviceType/update' : '../serviceType/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/serviceTypes.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/serviceTypes.jsp
@@ -1,150 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}服务类型</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="typeName"
			
 
				-                label="类型"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="rank"
			
 
				-                label="排序"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '8-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../serviceType/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'serviceType?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../serviceType/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'serviceType';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationArrangement.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationArrangement.jsp
@@ -1,187 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="场地">
			
 
				-             <el-select v-model="row_info.stationId" clearable filterable   placeholder="请选择">
			
 
				-			    <el-option
			
 
				-			      v-for="item in stationInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.title"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-                
			
 
				-        <!--  <el-form-item
			
 
				-                label="间隔">
			
 
				-             <el-select v-model="row_info.intervalId" clearable filterable   placeholder="请选择">
			
 
				-			    <el-option
			
 
				-			      v-for="item in timeIntervals"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.beginTime"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item> -->
			
 
				-           
			
 
				-         <el-form-item  label="日期">
			
 
				-        <el-date-picker v-model="row_info.workDate" type="date" placeholder="日期"
			
 
				-                            ></el-date-picker>        
			
 
				-         </el-form-item> 
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../stationInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.stationInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../timeInterval/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.timeIntervals = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-      /*       var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../stationArrangement/getStationArrangement',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            } */
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '9-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	
			
 
				-                	stationId : '',
			
 
				-                	intervalId : '',
			
 
				-                	workDate : '',
			
 
				-                	
			
 
				-                },
			
 
				-                timeIntervals : [],
			
 
				-                stationInfos : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.stationId) {
			
 
				-                    this.$message.warning('请填选择场地');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    if (data.workDate) {
			
 
				-                    	var myDate = new Date(data.workDate);
			
 
				-                        data.arrangementDate = myDate.getFullYear()+'-'+(myDate.getMonth()+1)+'-'+myDate.getDate();
			
 
				-                    }
			
 
				-                    
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../timeInterval/createArrangement' : '../timeInterval/createArrangement',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            //this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationArrangements.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationArrangements.jsp
@@ -1,179 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}场地排班</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="stationId"
			
 
				-                label="场地"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="beginTime"
			
 
				-                label="间隔"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="workDateStr"
			
 
				-                label="日期"
			
 
				-                align="center"
			
 
				-                 width="120"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderId"
			
 
				-                label="订单"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="userId"
			
 
				-                label="用户"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="status"
			
 
				-                label="状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderTimeStr"
			
 
				-                label="订单时间"
			
 
				-                align="center"
			
 
				-                 width="120"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <!-- <el-button size="small" @click="editRow(row)">编辑</el-button> -->
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '9-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../stationArrangement/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'stationArrangement?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../stationArrangement/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'stationArrangement';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationComment.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationComment.jsp
@@ -1,205 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="场地">
			
 
				-             <el-select v-model="row_info.stationId" clearable filterable   placeholder="请选择场地">
			
 
				-			    <el-option
			
 
				-			      v-for="item in stationInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.title"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="快速评价">
			
 
				-             <el-select v-model="row_info.quickId" clearable filterable   placeholder="请选择快速评价">
			
 
				-			    <el-option
			
 
				-			      v-for="item in quickComments"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.comment"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-                
			
 
				-                <el-form-item label="订单id">
			
 
				-                    <el-input v-model="row_info.orderId"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="评价内容">
			
 
				-                    <el-input v-model="row_info.content"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                 <el-form-item label="星级">
			
 
				-                    <el-input v-model="row_info.starLevel"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../userInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.userInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../stationInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.stationInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../quickComment/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.quickComments = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../stationComment/getStationComment',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-                userInfos : [],
			
 
				-                stationInfos : [],
			
 
				-                quickComments : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.stationId) {
			
 
				-                    this.$message.warning('请填选择场地');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../stationComment/update' : '../stationComment/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationComments.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationComments.jsp
@@ -1,175 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}评论</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="stationId"
			
 
				-                label="场地Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderId"
			
 
				-                label="订单Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="quickId"
			
 
				-                label="快速评价"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="content"
			
 
				-                label="内容"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="starLevel"
			
 
				-                label="星级"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="createTimeStr"
			
 
				-                label="时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../stationComment/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'stationComment?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../stationComment/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'stationComment';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationInfo.jsp
@@ -1,277 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <%--<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.config.js"></script>
			
 
				-	<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.all.js"></script>--%>
			
 
				-
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-            
			
 
				-            
			
 
				-         <%--   <el-form-item label="图片">
			
 
				-		         <el-upload
			
 
				-		                    class="avatar-uploader"
			
 
				-		                    action="../assets/uploadFile"
			
 
				-		                    :show-file-list="false"
			
 
				-		                    :on-success="contactAvatarSuccess">
			
 
				-		                <img v-if="avatar" :src="avatar" class="avatar">
			
 
				-		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				-		            </el-upload>
			
 
				-		        </el-form-item>--%>
			
 
				-		        
			
 
				-                 <el-form-item label="门店">
			
 
				-                  <el-select v-model="row_info.storeId"  placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in storeInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.title"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-               <%--<el-form-item label="类型">
			
 
				-                  <el-select v-model="row_info.stationType"  placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in stationTypes"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.typeName"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>--%>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item label="充电桩号">
			
 
				-                    <el-input v-model="row_info.stationNo"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="标题">
			
 
				-                    <el-input v-model="row_info.title"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-        
			
 
				-                 <el-form-item label="价格">
			
 
				-                    <el-input v-model="row_info.price"></el-input>
			
 
				-                </el-form-item>
			
 
				-             <%--
			
 
				-             <el-form-item label="联系电话">
			
 
				-                 <el-input v-model="row_info.telephone"></el-input>
			
 
				-             </el-form-item>
			
 
				-
			
 
				-
			
 
				-             <el-form-item label="摘要">
			
 
				-                 <el-input v-model="row_info.abstractText"  type="textarea" :rows="2"></el-input>
			
 
				-             </el-form-item>
			
 
				-
			
 
				-           <el-form-item label="内容">
			
 
				-             <script id="container" name="content" type="text/plain"></script>
			
 
				-         </el-form-item>
			
 
				-         --%>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    var __vue = new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	
			
 
				-
			
 
				-     	   $.get({
			
 
				-                url: '../storeInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.storeInfos = res.data;
			
 
				-
			
 
				-            }.bind(this));
			
 
				-     	   
			
 
				-     	  /* $.get({
			
 
				-                url: '../stationType/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.stationTypes = res.data;
			
 
				-
			
 
				-            }.bind(this));*/
			
 
				-     	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../stationInfo/getStationInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        
			
 
				-                        this.row_info = res.data;
			
 
				-                       /* if (res.data.realImage) {
			
 
				-                            this.avatar = res.data.realImage;
			
 
				-                        }
			
 
				-                        
			
 
				-                        var ue = this.editor;
			
 
				-                        ue.addListener("ready", function () {
			
 
				-                            //var arr = [];
			
 
				-                            //arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
			
 
				-                            ue.setContent(res.data.content, false);
			
 
				-                        });*/
			
 
				-                        
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '9-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	//realImage:'',
			
 
				-                	storeId : '',
			
 
				-                	//stationType:'',
			
 
				-                },
			
 
				-                dialogImageUrl: '',
			
 
				-                dialogVisible: false,
			
 
				-                mapDialogVisible: false,
			
 
				-                avatar: '',
			
 
				-                editor: null,
			
 
				-                storeInfos : [],
			
 
				-                stationTypes : [],
			
 
				-            };
			
 
				-        },
			
 
				-        
			
 
				-        
			
 
				-        mounted: function () {
			
 
				-       /*     this.editor = UE.getEditor('container', {
			
 
				-                toolbars: [[
			
 
				-                    'fullscreen',
			
 
				-                    'source',
			
 
				-                    'undo',
			
 
				-                    'redo',
			
 
				-                    'bold',
			
 
				-                    'insertimage',
			
 
				-                    'justify',
			
 
				-                    'justifyleft', //居左对齐
			
 
				-                    'justifyright', //居右对齐
			
 
				-                    'justifycenter', //居中对齐
			
 
				-                    'justifyjustify' //两端对齐
			
 
				-                ]],
			
 
				-                pasteplain: true,
			
 
				-                retainOnlyLabelPasted: true
			
 
				-            });
			
 
				-            */
			
 
				-            
			
 
				-        },
			
 
				-        
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.title) {
			
 
				-                    this.$message.warning('请填写标题');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    //data.content = this.editor.getContent();
			
 
				-                    delete data.realImage;
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../stationInfo/update' : '../stationInfo/save',
			
 
				-                        data: data
			
 
				-                    
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            
			
 
				-            handlePictureCardPreview: function (file) {
			
 
				-                this.dialogImageUrl = file.url;
			
 
				-                this.dialogVisible = true;
			
 
				-
			
 
				-            },
			
 
				-            contactAvatarSuccess: function (res, file, fileList) {
			
 
				-                if (res.success) {
			
 
				-                    this.row_info.image = res.data[0];
			
 
				-                }
			
 
				-                this.avatar = URL.createObjectURL(file.raw);
			
 
				-            },
			
 
				-            
			
 
				-        
			
 
				-            }
			
 
				-    })
			
 
				-    
			
 
				-    
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationInfos.jsp
@@ -1,201 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-    <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}充电桩</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-
			
 
				-        <%--<el-table-column
			
 
				-                label="图片"
			
 
				-                align="center"
			
 
				-                >
			
 
				-            <template scope="scope">
			
 
				-                <img class="singleImg" :src="scope.row.realImage">
			
 
				-            </template>
			
 
				-        </el-table-column>--%>
			
 
				-
			
 
				-        <el-table-column
			
 
				-                prop="storeId"
			
 
				-                label="门店"
			
 
				-                align="center"
			
 
				-        >
			
 
				-        </el-table-column>
			
 
				-
			
 
				-        <el-table-column
			
 
				-                prop="stationNo"
			
 
				-                label="充电桩号码"
			
 
				-                align="center"
			
 
				-        >
			
 
				-        </el-table-column>
			
 
				-
			
 
				-        <el-table-column
			
 
				-                prop="title"
			
 
				-                label="标题"
			
 
				-                align="center"
			
 
				-        >
			
 
				-        </el-table-column>
			
 
				-
			
 
				-        <el-table-column
			
 
				-                prop="price"
			
 
				-                label="价格"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-
			
 
				-        <%-- <el-table-column
			
 
				-                 prop="telephone"
			
 
				-                 label="联系电话"
			
 
				-                 align="center"
			
 
				-                 width="150"
			
 
				-                 >
			
 
				-         </el-table-column>--%>
			
 
				-
			
 
				-        <el-table-column
			
 
				-                prop="stationStatus"
			
 
				-                label="状态"
			
 
				-                align="center"
			
 
				-        >
			
 
				-        </el-table-column>
			
 
				-
			
 
				-        <%--<el-table-column
			
 
				-        		prop="typeName"
			
 
				-                label="类型"
			
 
				-                align="center"
			
 
				-                width="150"
			
 
				-                >
			
 
				-        </el-table-column>--%>
			
 
				-
			
 
				-
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '9-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../stationInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'stationInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../stationInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'stationInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationOrders.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationOrders.jsp
@@ -1,221 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <div class="num"> 共{{totalNumber}}订单</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="storeId"
			
 
				-                label="服务点ID"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="stationId"
			
 
				-                label="充电桩ID"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="serviceFee"
			
 
				-                label="费用"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="totlePrice"
			
 
				-                label="总价"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="workMinute"
			
 
				-                label="分钟"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="coin"
			
 
				-                label="余额"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-       
			
 
				-        <el-table-column
			
 
				-                prop="cash"
			
 
				-                label="现金"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-         <el-table-column
			
 
				-                prop="couponMoney"
			
 
				-                label="优惠券抵扣"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-                prop="serviceTimeStr"
			
 
				-                label="预约时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="beginTimeStr"
			
 
				-                label="使用时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="endTimeStr"
			
 
				-                label="结束时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="orderStatus"
			
 
				-                label="订单状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="payTimeStr"
			
 
				-                label="支付时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="cancelReason"
			
 
				-                label="取消原因"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userCouponId"
			
 
				-                label="优惠券Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '11-3',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../stationOrder/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'stationOrder?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../stationOrder/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'stationOrder';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationType.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationType.jsp
@@ -1,132 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="类型">
			
 
				-                    <el-input v-model="row_info.typeName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="排序">
			
 
				-                    <el-input v-model="row_info.rank"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../stationType/getStationType',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '9-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.typeName) {
			
 
				-                    this.$message.warning('请填写类型');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../stationType/update' : '../stationType/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/stationTypes.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/stationTypes.jsp
@@ -1,150 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}服务类型</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="typeName"
			
 
				-                label="类型"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="rank"
			
 
				-                label="排序"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '9-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../stationType/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'stationType?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../stationType/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'stationType';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/storeComment.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/storeComment.jsp
@@ -1,218 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="门店">
			
 
				-             <el-select v-model="row_info.storeId" clearable filterable   placeholder="请选择门店">
			
 
				-			    <el-option
			
 
				-			      v-for="item in storeInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.title"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="快速评价">
			
 
				-             <el-select v-model="row_info.quickId" clearable filterable  multiple  placeholder="请选择快速评价">
			
 
				-			    <el-option
			
 
				-			      v-for="item in quickComments"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.comment"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-                
			
 
				-                <el-form-item label="订单id">
			
 
				-                    <el-input v-model="row_info.orderId"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="评价内容">
			
 
				-                    <el-input v-model="row_info.content"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                 <el-form-item label="星级">
			
 
				-                    <el-input v-model="row_info.starLevel"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../userInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.userInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../storeInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.storeInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../quickComment/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.quickComments = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../storeComment/getStoreComment',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                        
			
 
				-                        if(res.data.quickId){
			
 
				-                        	res.data.quickId = res.data.quickId.split(',').map(function(i){return Number(i);});
			
 
				-                        }
			
 
				-                        
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-4',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	userId:'',
			
 
				-                	storeId : '',
			
 
				-                	quickId : '',
			
 
				-                	
			
 
				-                	
			
 
				-                },
			
 
				-                userInfos : [],
			
 
				-                stationInfos : [],
			
 
				-                quickComments : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.storeId) {
			
 
				-                    this.$message.warning('请填选择门店');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    data.quickId =  data.quickId.join();
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../storeComment/update' : '../storeComment/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/storeComments.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/storeComments.jsp
@@ -1,175 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}评论</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="storeId"
			
 
				-                label="门店Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderId"
			
 
				-                label="订单Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="quickId"
			
 
				-                label="快速评价"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="content"
			
 
				-                label="内容"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="starLevel"
			
 
				-                label="星级"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="createTimeStr"
			
 
				-                label="时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-4',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../storeComment/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'storeComment?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../storeComment/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'storeComment';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/storeInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/storeInfo.jsp
@@ -1,384 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-   <%-- <script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.config.js"></script>
			
 
				-	<script type="text/javascript" src="${pageContext.request.contextPath}/ueditor/ueditor.all.js"></script>--%>
			
 
				-
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>
			
 
				-    .avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-            
			
 
				-            
			
 
				-         <%--   <el-form-item label="图片">
			
 
				-		         <el-upload
			
 
				-		                    class="avatar-uploader"
			
 
				-		                    action="../assets/uploadFile"
			
 
				-		                    :show-file-list="false"
			
 
				-		                    :on-success="contactAvatarSuccess">
			
 
				-		                <img v-if="avatar" :src="avatar" class="avatar">
			
 
				-		                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				-		            </el-upload>
			
 
				-		        </el-form-item>--%>
			
 
				-		        
			
 
				-                <el-form-item label="标题">
			
 
				-                    <el-input v-model="row_info.title"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-        
			
 
				-                <%-- <el-form-item label="价格">
			
 
				-                    <el-input v-model="row_info.price"></el-input>
			
 
				-                </el-form-item>--%>
			
 
				-                
			
 
				-                <el-form-item label="联系电话">
			
 
				-                    <el-input v-model="row_info.telephone"></el-input>
			
 
				-                </el-form-item>
			
 
				-              <!--   <el-form-item label="支持服务">
			
 
				-                  <el-select v-model="row_info.supportService" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in serviceInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.title"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item> -->
			
 
				-                <%--<el-form-item label="是否为加盟店">
			
 
				-                <el-switch
			
 
				-				  v-model="isFranchisee"
			
 
				-				  on-color="#13ce66"
			
 
				-				  off-color="#ff4949">
			
 
				-				</el-switch>
			
 
				-				</el-form-item>
			
 
				-
			
 
				-                <el-form-item label="加盟商"  v-if="isFranchisee" >
			
 
				-                  <el-select v-model="row_info.franchiseeId"  clearable filterable  placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in franchiseeInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.userName"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item label="保洁">
			
 
				-                  <el-select v-model="row_info.technicianId"  clearable filterable  placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in technicianInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.technicianName"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item label="维修工">
			
 
				-                  <el-select v-model="row_info.repairerId" clearable  filterable  placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in repairerInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.repairerName"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item label="摘要">
			
 
				-                    <el-input v-model="row_info.abstractText"  type="textarea" :rows="2"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-              <el-form-item label="内容">
			
 
				-            	<script id="container" name="content" type="text/plain"></script>
			
 
				-    		</el-form-item>--%>
			
 
				-    		
			
 
				-              <el-form-item>
			
 
				-                    <el-button type="text" @click="mapDialogVisible = true">点击打开地图选择地址</el-button>
			
 
				-				<template v-if="mapDialogVisible">
			
 
				-				<iframe id="mapPage" width="100%" height="100%" frameborder=0
			
 
				-                        src="https://apis.map.qq.com/tools/locpicker?policy=1&search=1&type=1&coord=31.23035,121.47372&key=OFJBZ-SBUHF-MQVJ3-JSFRF-VT3UZ-GNBJX&referer=领先共享汽车">
			
 
				-                </iframe>
			
 
				-                </template>
			
 
				-               </el-form-item>
			
 
				-               
			
 
				-               
			
 
				-    		<el-form-item label="地址">
			
 
				-                    <el-input v-model="row_info.address"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="详细地址">
			
 
				-                    <el-input v-model="row_info.addressDetail"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="经度">
			
 
				-                    <el-input v-model="row_info.longitude"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="纬度">
			
 
				-                    <el-input v-model="row_info.latitude"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-    		
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    var __vue = new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	
			
 
				-
			
 
				-     	  /* $.get({
			
 
				-                url: '../repairerInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.repairerInfos = res.data;
			
 
				-
			
 
				-            }.bind(this));
			
 
				-     	   
			
 
				-     	   $.get({
			
 
				-                url: '../technicianInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.technicianInfos = res.data;
			
 
				-
			
 
				-            }.bind(this));
			
 
				-     	   
			
 
				-     	   $.get({
			
 
				-                url: '../franchiseeInfo/all'
			
 
				-            }).then(function (res) {
			
 
				-                this.franchiseeInfos = res.data;
			
 
				-
			
 
				-            }.bind(this));*/
			
 
				-     	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../storeInfo/getStoreInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        
			
 
				-                       /*  if(res.data.supportService){
			
 
				-                        	res.data.supportService = res.data.supportService.split(',').map(function(i){return Number(i)});
			
 
				-                        } */
			
 
				-                        /*if(!res.data.technicianId){
			
 
				-                        	res.data.technicianId = '';
			
 
				-                        }
			
 
				-                        if(!res.data.repairerId){
			
 
				-                        	res.data.repairerId = '';
			
 
				-                        }
			
 
				-                        if(!res.data.franchiseeId){
			
 
				-                        	res.data.franchiseeId = '';
			
 
				-                        }
			
 
				-                        
			
 
				-                        if(res.data.isAdmin=="N"){
			
 
				-                        	this.isFranchisee = true;
			
 
				-                        }*/
			
 
				-                        
			
 
				-                        this.row_info = res.data;
			
 
				-
			
 
				-                        /*if (res.data.realImage) {
			
 
				-                            this.avatar = res.data.realImage;
			
 
				-                        }
			
 
				-                        
			
 
				-                        var ue = this.editor;
			
 
				-                        ue.addListener("ready", function () {
			
 
				-                            //var arr = [];
			
 
				-                            //arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
			
 
				-                            ue.setContent(res.data.content, false);
			
 
				-                        });*/
			
 
				-                        
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '14-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	//realImage:'',
			
 
				-                	//supportService : '',
			
 
				-                	//technicianId:'',
			
 
				-                	//repairerId:'',
			
 
				-                	//franchiseeId:'',
			
 
				-                },
			
 
				-                dialogImageUrl: '',
			
 
				-                dialogVisible: false,
			
 
				-                mapDialogVisible: false,
			
 
				-                avatar: '',
			
 
				-                editor: null,
			
 
				-                serviceInfos : [],
			
 
				-                technicianInfos : [],
			
 
				-                repairerInfos : [],
			
 
				-                franchiseeInfos : [],
			
 
				-                isFranchisee : false,
			
 
				-            };
			
 
				-        },
			
 
				-        
			
 
				-        
			
 
				-        mounted: function () {
			
 
				-        /*    this.editor = UE.getEditor('container', {
			
 
				-                toolbars: [[
			
 
				-                    'fullscreen',
			
 
				-                    'source',
			
 
				-                    'undo',
			
 
				-                    'redo',
			
 
				-                    'bold',
			
 
				-                    'insertimage',
			
 
				-                    'justify',
			
 
				-                    'justifyleft', //居左对齐
			
 
				-                    'justifyright', //居右对齐
			
 
				-                    'justifycenter', //居中对齐
			
 
				-                    'justifyjustify' //两端对齐
			
 
				-                ]],
			
 
				-                pasteplain: true,
			
 
				-                retainOnlyLabelPasted: true
			
 
				-            });*/
			
 
				-            
			
 
				-            
			
 
				-        },
			
 
				-        
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.title) {
			
 
				-                    this.$message.warning('请填写标题');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    //data.content = this.editor.getContent();
			
 
				-                    //data.supportService =  data.supportService.join();
			
 
				-                    //data.isAdmin = this.isFranchisee ? 'N' : 'Y';
			
 
				-                    
			
 
				-                    delete data.realImage;
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../storeInfo/update' : '../storeInfo/save',
			
 
				-                        data: data
			
 
				-                    
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            
			
 
				-            handlePictureCardPreview: function (file) {
			
 
				-                this.dialogImageUrl = file.url;
			
 
				-                this.dialogVisible = true;
			
 
				-
			
 
				-            },
			
 
				-            contactAvatarSuccess: function (res, file, fileList) {
			
 
				-                if (res.success) {
			
 
				-                    this.row_info.image = res.data[0];
			
 
				-                }
			
 
				-                this.avatar = URL.createObjectURL(file.raw);
			
 
				-            },
			
 
				-            
			
 
				-        
			
 
				-            }
			
 
				-    })
			
 
				-    
			
 
				-    
			
 
				-    
			
 
				-    window.addEventListener('message', function (event) {
			
 
				-        // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
			
 
				-        var loc = event.data;
			
 
				-        if (loc && loc.module == 'locationPicker') {//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
			
 
				-            console.log('location', loc);
			
 
				-            //console.log('loc.poiaddress', loc.poiaddress);
			
 
				-            //console.log('loc.poiname', loc.poiname);
			
 
				-          __vue.$set(__vue.row_info);
			
 
				-          __vue.row_info.address = loc.poiaddress;
			
 
				-          __vue.row_info.addressDetail = loc.poiname;
			
 
				-          __vue.row_info.longitude = loc.latlng.lng;
			
 
				-          __vue.row_info.latitude = loc.latlng.lat;
			
 
				-          __vue.mapDialogVisible = false;
			
 
				-
			
 
				-        }
			
 
				-    }, false);
			
 
				-    
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/storeInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/storeInfos.jsp
@@ -1,208 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}服务点</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-       <%-- <el-table-column
			
 
				-                label="图片"
			
 
				-                align="center"
			
 
				-                >
			
 
				-            <template scope="scope">
			
 
				-                <img class="singleImg" :src="scope.row.realImage">
			
 
				-            </template>
			
 
				-        </el-table-column>--%>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="title"
			
 
				-                label="标题"
			
 
				-                align="center"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <%--<el-table-column
			
 
				-        		prop="price"
			
 
				-                label="价格"
			
 
				-                align="center">
			
 
				-        </el-table-column>--%>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="telephone"
			
 
				-                label="联系电话"
			
 
				-                align="center"
			
 
				-                width="150"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-    <!--     <el-table-column
			
 
				-        		prop="supportService"
			
 
				-                label="支持服务"
			
 
				-                align="center">
			
 
				-        </el-table-column> -->
			
 
				-        
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="address"
			
 
				-                label="地址"
			
 
				-                align="center"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="addressDetail"
			
 
				-                label="详细地址"
			
 
				-                align="center"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-      <%--  <el-table-column
			
 
				-        		prop="isAdmin"
			
 
				-                label="管理员所有"
			
 
				-                align="center"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-        		prop="franchiseeId"
			
 
				-                label="加盟商Id"
			
 
				-                align="center"
			
 
				-                >
			
 
				-        </el-table-column>--%>
			
 
				-        
			
 
				-        
			
 
				-        
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '14-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../storeInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'storeInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../storeInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'storeInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianArrangement.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianArrangement.jsp
@@ -1,185 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="技师">
			
 
				-             <el-select v-model="row_info.technicianId" clearable filterable   placeholder="请选择">
			
 
				-			    <el-option
			
 
				-			      v-for="item in technicianInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.technicianName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-                
			
 
				-       <!--   <el-form-item
			
 
				-                label="间隔">
			
 
				-             <el-select v-model="row_info.intervalId" clearable filterable   placeholder="请选择">
			
 
				-			    <el-option
			
 
				-			      v-for="item in timeIntervals"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.beginTime"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item> -->
			
 
				-           
			
 
				-         <el-form-item  label="日期">
			
 
				-        <el-date-picker v-model="row_info.workDate" type="date" placeholder="日期"
			
 
				-                            ></el-date-picker>        
			
 
				-         </el-form-item> 
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../technicianInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.technicianInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../timeInterval/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.timeIntervals = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-          /*   var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../technicianArrangement/getTechnicianArrangement',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            } */
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '10-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	technicianId : '',
			
 
				-                	intervalId : '',
			
 
				-                	workDate : '',
			
 
				-                },
			
 
				-                timeIntervals : [],
			
 
				-                technicianInfos : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.technicianId) {
			
 
				-                    this.$message.warning('请填选择技师');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    if (data.workDate) {
			
 
				-                    	var myDate = new Date(data.workDate);
			
 
				-                        data.arrangementDate = myDate.getFullYear()+'-'+(myDate.getMonth()+1)+'-'+myDate.getDate();
			
 
				-                    }
			
 
				-                    
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../timeInterval/createArrangement' : '../timeInterval/createArrangement',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            //this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianArrangements.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianArrangements.jsp
@@ -1,179 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}技师排班</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="technicianId"
			
 
				-                label="技师"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="beginTime"
			
 
				-                label="间隔"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="workDateStr"
			
 
				-                label="日期"
			
 
				-                align="center"
			
 
				-                 width="120"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderId"
			
 
				-                label="订单"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="userId"
			
 
				-                label="用户"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="status"
			
 
				-                label="状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderTimeStr"
			
 
				-                label="订单时间"
			
 
				-                align="center"
			
 
				-                 width="120"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-               <!--  <el-button size="small" @click="editRow(row)">编辑</el-button> -->
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '10-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../technicianArrangement/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'technicianArrangement?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../technicianArrangement/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'technicianArrangement';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianComment.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianComment.jsp
@@ -1,205 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="技师">
			
 
				-             <el-select v-model="row_info.technicianId" clearable filterable   placeholder="请选择技师">
			
 
				-			    <el-option
			
 
				-			      v-for="item in technicianInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.technicianName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="快速评价">
			
 
				-             <el-select v-model="row_info.quickId" clearable filterable   placeholder="请选择快速评价">
			
 
				-			    <el-option
			
 
				-			      v-for="item in quickComments"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.comment"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-                
			
 
				-                <el-form-item label="订单id">
			
 
				-                    <el-input v-model="row_info.orderId"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                 <el-form-item label="评价内容">
			
 
				-                    <el-input v-model="row_info.content"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                 <el-form-item label="星级">
			
 
				-                    <el-input v-model="row_info.starLevel"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../userInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.userInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../technicianInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.technicianInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../quickComment/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.quickComments = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../technicianComment/getTechnicianComment',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-3',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-                userInfos : [],
			
 
				-                technicianInfos : [],
			
 
				-                quickComments : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.stationId) {
			
 
				-                    this.$message.warning('请填选择场地');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../technicianComment/update' : '../technicianComment/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianComments.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianComments.jsp
@@ -1,175 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}评论</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="technicianId"
			
 
				-                label="技师Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="orderId"
			
 
				-                label="订单Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="quickId"
			
 
				-                label="快速评价"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="content"
			
 
				-                label="内容"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="starLevel"
			
 
				-                label="星级"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="createTimeStr"
			
 
				-                label="时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '7-3',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../technicianComment/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'technicianComment?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../technicianComment/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'technicianComment';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianInfo.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianInfo.jsp
@@ -1,233 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="技师名">
			
 
				-                    <el-input v-model="row_info.technicianName"></el-input>
			
 
				-                </el-form-item>
			
 
				-                <el-form-item label="联系电话">
			
 
				-                    <el-input v-model="row_info.telephone"></el-input>
			
 
				-                </el-form-item>
			
 
				-              <!--   <el-form-item label="价格">
			
 
				-                    <el-input v-model="row_info.price"></el-input>
			
 
				-                </el-form-item> -->
			
 
				-               <el-form-item label="标签">
			
 
				-                  <el-select v-model="row_info.label" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in labelInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.labelName"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                
			
 
				-                      <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  </el-form-item>
			
 
				-  
			
 
				-                <!-- <el-form-item label="支持工位">
			
 
				-                    <el-select v-model="row_info.supportStation" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in stationInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.title"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-					  
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="支持服务">
			
 
				-                       <el-select v-model="row_info.supportService" multiple placeholder="请选择">
			
 
				-					    <el-option
			
 
				-					      v-for="item in serviceInfos"
			
 
				-					      :key="item.id"
			
 
				-					      :label="item.title"
			
 
				-					      :value="item.id">
			
 
				-					    </el-option>
			
 
				-					  </el-select>
			
 
				-                </el-form-item>
			
 
				-                 -->
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	
			
 
				-        	
			
 
				-        	  $.get({
			
 
				-                  url: '../labelInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.labelInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	  
			
 
				-        	  
			
 
				-        	  $.get({
			
 
				-                  url: '../userInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.userInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	  
			
 
				-        	/*   $.get({
			
 
				-                  url: '../serviceInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.serviceInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	  
			
 
				-        	  
			
 
				-        	  $.get({
			
 
				-                  url: '../stationInfo/all'
			
 
				-              }).then(function (res) {
			
 
				-                  this.stationInfos = res.data;
			
 
				-
			
 
				-              }.bind(this));
			
 
				-        	   */
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../technicianInfo/getTechnicianInfo',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        if(res.data.label){
			
 
				-                        	res.data.label = res.data.label.split(',').map(function(i){return Number(i);});
			
 
				-                        }
			
 
				-                        
			
 
				-                        if(!res.data.userId){
			
 
				-                        	res.data.userId = '';
			
 
				-                        }
			
 
				-                        
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '10-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	label : '',
			
 
				-                	supportStation : '',
			
 
				-                	supportService : '',
			
 
				-                	userId:'',
			
 
				-                },
			
 
				-                serviceInfos : [],
			
 
				-                labelInfos : [],
			
 
				-                stationInfos : [],
			
 
				-                userInfos : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.technicianName) {
			
 
				-                    this.$message.warning('请填写技师名');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    data.label =  data.label.join();
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../technicianInfo/update' : '../technicianInfo/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianInfos.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianInfos.jsp
@@ -1,187 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}保洁</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="technicianName"
			
 
				-                label="技师名"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="telephone"
			
 
				-                label="联系电话"
			
 
				-                align="center"
			
 
				-                width="150"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="sex"
			
 
				-                label="性别"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="label"
			
 
				-                label="标签"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <!-- <el-table-column
			
 
				-                prop="price"
			
 
				-                label="价格"
			
 
				-                align="center">
			
 
				-        </el-table-column> -->
			
 
				-        <el-table-column
			
 
				-                prop="icon"
			
 
				-                label="头像"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <!-- <el-table-column
			
 
				-                prop="supportStation"
			
 
				-                label="支持工位"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="supportService"
			
 
				-                label="支持服务"
			
 
				-                align="center">
			
 
				-        </el-table-column> -->
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '10-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../technicianInfo/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'technicianInfo?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../technicianInfo/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'technicianInfo';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianOrder.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianOrder.jsp
@@ -1,133 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-                <el-form-item label="总费 ">
			
 
				-                    <el-input v-model="row_info.totlePrice"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="工作时间 ">
			
 
				-                    <el-input v-model="row_info.workMinute"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="状态 ">
			
 
				-                    <el-input v-model="row_info.orderStatus"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../userOrder/getUserOrder',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '11-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../userOrder/update' : '../userOrder/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/technicianOrders.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/technicianOrders.jsp
@@ -1,190 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <div class="num"> 共{{totalNumber}}订单</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-          <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="technicianId"
			
 
				-                label="保洁Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="storeId"
			
 
				-                label="门店ID"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="stationId"
			
 
				-                label="场地"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="remark"
			
 
				-                label="备注 "
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-                prop="createTimeStr"
			
 
				-                label="预约时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="confirmTimeStr"
			
 
				-                label="确认时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="endTimeStr"
			
 
				-                label="结束时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="statusFlag"
			
 
				-                label="订单状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="报单人"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="orderId"
			
 
				-                label="用户订单Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <!-- <el-button size="small" @click="editRow(row)">编辑</el-button> -->
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '10-3',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../technicianOrder/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'technicianOrder?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../technicianOrder/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'technicianOrder';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/timeInterval.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/timeInterval.jsp
@@ -1,134 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                <el-form-item label="开始时间">
			
 
				-                    <el-input v-model="row_info.beginTime"></el-input>
			
 
				-                </el-form-item>
			
 
				-                <el-form-item label="结束时间">
			
 
				-                    <el-input v-model="row_info.endTime"></el-input>
			
 
				-                </el-form-item>
			
 
				-                <el-form-item label="排序">
			
 
				-                    <el-input v-model="row_info.rank"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../timeInterval/getTimeInterval',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '12-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.beginTime) {
			
 
				-                    this.$message.warning('请填写时间');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../timeInterval/update' : '../timeInterval/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/timeIntervals.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/timeIntervals.jsp
@@ -1,155 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}时间间隔</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="beginTime"
			
 
				-                label="开始时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="endTime"
			
 
				-                label="结束时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="rank"
			
 
				-                label="排序"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '12-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../timeInterval/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'timeInterval?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../timeInterval/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'timeInterval';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/userCoupon.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/userCoupon.jsp
@@ -1,182 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-         <el-form-item
			
 
				-                label="优惠券">
			
 
				-             <el-select v-model="row_info.couponId" clearable filterable   placeholder="请选择服务">
			
 
				-			    <el-option
			
 
				-			      v-for="item in couponInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.name"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  
			
 
				-        </el-form-item>
			
 
				-        
			
 
				-         <el-form-item
			
 
				-                label="用户">
			
 
				-             <el-select v-model="row_info.userId" clearable filterable   placeholder="请选择用户">
			
 
				-			    <el-option
			
 
				-			      v-for="item in userInfos"
			
 
				-			      :key="item.id"
			
 
				-			      :label="item.nickName"
			
 
				-			      :value="item.id">
			
 
				-			    </el-option>
			
 
				-			  </el-select>
			
 
				-  </el-form-item>
			
 
				-        
			
 
				-        <el-form-item  label="结束日期">
			
 
				-        <el-date-picker v-model="row_info.endTime" type="date" placeholder="结束日期"
			
 
				-                            ></el-date-picker>        
			
 
				-         </el-form-item> 
			
 
				-           
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-        	
			
 
				-        	   $.get({
			
 
				-                   url: '../couponInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.couponInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   $.get({
			
 
				-                   url: '../userInfo/all'
			
 
				-               }).then(function (res) {
			
 
				-                   this.userInfos = res.data;
			
 
				-
			
 
				-               }.bind(this));
			
 
				-        	   
			
 
				-        	   
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../userCoupon/getUserCoupon',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '2-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {
			
 
				-                	endTime:'',
			
 
				-                	userId:'',
			
 
				-                	couponId:'',
			
 
				-                },
			
 
				-                userInfos : [],
			
 
				-                couponInfos : [],
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                if (!this.row_info.couponId) {
			
 
				-                    this.$message.warning('请填写优惠券');
			
 
				-                }  else {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    
			
 
				-                    if (data.endTime) {
			
 
				-                        data.endTime = Date.parse(new Date(data.endTime));
			
 
				-                    }
			
 
				-                    
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../userCoupon/update' : '../userCoupon/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-                }
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/userCoupons.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/userCoupons.jsp
@@ -1,162 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <el-button type="primary" @click="create()">创建</el-button>
			
 
				-        <div class="num"> 共{{totalNumber}}用户优惠券</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="couponId"
			
 
				-                label="优惠券"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="userId"
			
 
				-                label="用户id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="endTimeStr"
			
 
				-                label="结束时间"
			
 
				-                align="center"
			
 
				-                width="120"
			
 
				-                >
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-        		prop="isUsed"
			
 
				-                label="是否使用"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '2-2',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../userCoupon/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'userCoupon?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../userCoupon/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'userCoupon';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/userOrder.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/userOrder.jsp
@@ -1,133 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-    <style>.avatar-uploader .el-upload {
			
 
				-        border: 1px dashed #d9d9d9;
			
 
				-        border-radius: 6px;
			
 
				-        cursor: pointer;
			
 
				-        position: relative;
			
 
				-        overflow: hidden;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader .el-upload:hover {
			
 
				-        border-color: #20a0ff;
			
 
				-    }
			
 
				-
			
 
				-    .avatar-uploader-icon {
			
 
				-        font-size: 28px;
			
 
				-        color: #8c939d;
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        line-height: 178px;
			
 
				-        text-align: center;
			
 
				-    }
			
 
				-
			
 
				-    .avatar {
			
 
				-        width: 178px;
			
 
				-        height: 178px;
			
 
				-        display: block;
			
 
				-    }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-            <el-form ref="form" :model="row_info" label-width="80px">
			
 
				-                
			
 
				-                <el-form-item label="总费 ">
			
 
				-                    <el-input v-model="row_info.totlePrice"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="工作时间 ">
			
 
				-                    <el-input v-model="row_info.workMinute"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item label="状态 ">
			
 
				-                    <el-input v-model="row_info.orderStatus"></el-input>
			
 
				-                </el-form-item>
			
 
				-                
			
 
				-                <el-form-item>
			
 
				-                    <el-button type="primary" @click="onSubmit">{{edit?'保存':'立即创建'}}</el-button>
			
 
				-                    <el-button>取消</el-button>
			
 
				-                </el-form-item>
			
 
				-            </el-form>
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    function getQueryString(name) {
			
 
				-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
			
 
				-        var r = window.location.search.substr(1).match(reg);
			
 
				-        if (r != null) return unescape(r[2]);
			
 
				-        return null;
			
 
				-    }
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            var id = getQueryString('id');
			
 
				-            if (id) {
			
 
				-                $.get({
			
 
				-                    url: '../userOrder/getUserOrder',
			
 
				-                    data: {
			
 
				-                        id: id
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.edit = true;
			
 
				-                        this.row_info = res.data;
			
 
				-                    }
			
 
				-                }.bind(this));
			
 
				-            }
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '11-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                edit: false,
			
 
				-                tab: 1,
			
 
				-                row_info : {},
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            onSubmit: function () {
			
 
				-                    var data = JSON.parse(JSON.stringify(this.row_info));
			
 
				-                    $.post({
			
 
				-                        url: this.edit ? '../userOrder/update' : '../userOrder/save',
			
 
				-                        data: data
			
 
				-                    }).then(function (res) {
			
 
				-                        if (res.success) {
			
 
				-                            if (!this.edit) {
			
 
				-                                this.row_info.id = res.data;
			
 
				-                            }
			
 
				-                            this.edit = true;
			
 
				-                            this.$message.success(this.edit ? '保存成功' : '创建成功');
			
 
				-                        } else {
			
 
				-                            this.$message.error(this.edit ? '保存失败' : '创建失败');
			
 
				-                        }
			
 
				-                    }.bind(this))
			
 
				-            },
			
 
				-            }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/WEB-INF/jsp/newAdmin/userOrders.jsp
+++ b/WebRoot/WEB-INF/jsp/newAdmin/userOrders.jsp
@@ -1,304 +0,0 @@
 
				-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <jsp:include page="head.jsp"/>
			
 
				-    <title>领先共享汽车</title>
			
 
				-</head>
			
 
				-<body>
			
 
				-<jsp:include page="contentBefore.jsp"/>
			
 
				-<template>
			
 
				-      <div class="filters">
			
 
				-        <div class="num"> 共{{totalNumber}}订单</div>
			
 
				-    </div>
			
 
				-
			
 
				-    <el-table :data="rows"
			
 
				-              ref="table"
			
 
				-              style="width: 100%"
			
 
				-              element-loading-text="拼命加载中"
			
 
				-              stripe
			
 
				-              v-loading="loading">
			
 
				-        <el-table-column
			
 
				-                type="index"
			
 
				-                width="70"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userId"
			
 
				-                label="用户Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="carId"
			
 
				-                label="车辆ID"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="serviceFee"
			
 
				-                label="租车费用"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="safeFee"
			
 
				-                label="保险"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="technicianFee"
			
 
				-                label="总价"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="totlePrice"
			
 
				-                label="总价"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="leaseDays"
			
 
				-                label="租赁天数"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="coin"
			
 
				-                label="余额"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-       
			
 
				-        <el-table-column
			
 
				-                prop="cash"
			
 
				-                label="现金"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-         <el-table-column
			
 
				-                prop="couponMoney"
			
 
				-                label="优惠券抵扣"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        
			
 
				-        <el-table-column
			
 
				-                prop="serviceTimeStr"
			
 
				-                label="预约时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="beginTimeStr"
			
 
				-                label="使用时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="endTimeStr"
			
 
				-                label="结束时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="orderStatus"
			
 
				-                label="订单状态"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="payTimeStr"
			
 
				-                label="支付时间"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="cancelReason"
			
 
				-                label="取消原因"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="userCouponId"
			
 
				-                label="优惠券Id"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="takeMode"
			
 
				-                label="取车方式"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="takeStoreId"
			
 
				-                label="取车服务点"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="takeAddress"
			
 
				-                label="取车地址"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="returnMode"
			
 
				-                label="还车方式"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="returnStoreId"
			
 
				-                label="还车服务点"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                prop="returnAddress"
			
 
				-                label="还车地址"
			
 
				-                align="center">
			
 
				-        </el-table-column>
			
 
				-        <el-table-column
			
 
				-                :context="_self"
			
 
				-                width="150"
			
 
				-                inline-template
			
 
				-                label="操作"
			
 
				-                align="center">
			
 
				-            <div>
			
 
				-                <el-button size="small" v-if="row.orderStatus==0" @click="editRow(row)">编辑</el-button>
			
 
				-                <el-button size="small" v-if="row.orderStatus==1" @click="takeCar(row)">取车</el-button>
			
 
				-                <el-button size="small" v-if="row.orderStatus==2" @click="returnCar(row)">还车</el-button>
			
 
				-                <el-button size="small" type="danger" @click="deleteRow(row)">删除</el-button>
			
 
				-            </div>
			
 
				-        </el-table-column>
			
 
				-    </el-table>
			
 
				-
			
 
				-    <div class="pagination-wrapper" v-show="!loading">
			
 
				-        <el-pagination layout="sizes, prev, pager, next" :page-size="pageSize" :total="totalNumber"
			
 
				-                       :page-size="pageSize"
			
 
				-                       :current-page="currentPage" @current-change="pageChange" @size-change="sizeChange">
			
 
				-        </el-pagination>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<jsp:include page="contentAfter.jsp"/>
			
 
				-</body>
			
 
				-<script>
			
 
				-    new Vue({
			
 
				-        el: '#app',
			
 
				-        created: function () {
			
 
				-            this.getRows();
			
 
				-        },
			
 
				-        data: function () {
			
 
				-            return {
			
 
				-                menu: '11-1',
			
 
				-                user: {
			
 
				-                    id: '',
			
 
				-                    username: 'admin',
			
 
				-                    avatar: ''
			
 
				-                },
			
 
				-                loading: false,
			
 
				-                totalNumber: 0,
			
 
				-                totalPage: 10,
			
 
				-                currentPage: 1,
			
 
				-                pageSize: 20,
			
 
				-                rows: []
			
 
				-            };
			
 
				-        },
			
 
				-        methods: {
			
 
				-            logout: function () {
			
 
				-                this.$confirm('确定要注销吗?', '提示', {
			
 
				-                    confirmButtonText: '确定',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'info'
			
 
				-                }).then(function () {
			
 
				-                    localStorage.removeItem('user');
			
 
				-                    this.$router.push({path: '/login'});
			
 
				-                }.bind(this)).catch(function (e) {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            getRows: function () {
			
 
				-                $.get({
			
 
				-                    url: '../userOrder/page',
			
 
				-                    data: {
			
 
				-                        currentPage: this.currentPage,
			
 
				-                        pageNumber: this.pageSize
			
 
				-                    }
			
 
				-                }).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.totalNumber = res.data.page.totalNumber;
			
 
				-                        this.rows = res.data.pp;
			
 
				-                    }
			
 
				-                }.bind(this))
			
 
				-            },
			
 
				-            pageChange: function (page) {
			
 
				-                this.currentPage = page;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            sizeChange: function (size) {
			
 
				-                this.pageSize = size;
			
 
				-                this.getRows();
			
 
				-            },
			
 
				-            editRow: function (row) {
			
 
				-                window.location = 'userOrder?id=' + row.id;
			
 
				-            },
			
 
				-            deleteRow: function (row) {
			
 
				-                this.$confirm('确定要删除吗?', '提示', {
			
 
				-                    confirmButtonText: '删除',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../userOrder/del',
			
 
				-                        data: {
			
 
				-                            id: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('删除成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('删除失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            takeCar: function (row) {
			
 
				-                this.$confirm('确定要取车吗?', '提示', {
			
 
				-                    confirmButtonText: '取车',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../userOrder/takeCar',
			
 
				-                        data: {
			
 
				-                            orderId: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('取车成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('取车失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            returnCar: function (row) {
			
 
				-                this.$confirm('确定要还车吗?', '提示', {
			
 
				-                    confirmButtonText: '还车',
			
 
				-                    cancelButtonText: '取消',
			
 
				-                    type: 'warning'
			
 
				-                }).then(function () {
			
 
				-                    return $.post({
			
 
				-                        url: '../userOrder/returnCar',
			
 
				-                        data: {
			
 
				-                            orderId: row.id
			
 
				-                        }
			
 
				-                    })
			
 
				-                }.bind(this)).then(function (res) {
			
 
				-                    if (res.success) {
			
 
				-                        this.$message.success('还车成功');
			
 
				-                        this.getRows();
			
 
				-                    } else {
			
 
				-                        this.$message.error('还车失败');
			
 
				-                    }
			
 
				-                }.bind(this)).catch(function () {
			
 
				-
			
 
				-                });
			
 
				-            },
			
 
				-            create: function () {
			
 
				-                window.location = 'userOrder';
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-
			
 
				-</html>
			
--- a/WebRoot/form_yh.html
+++ b/WebRoot/form_yh.html
@@ -373,6 +373,26 @@
 
				         <el-form-item label="开单人">
			
 
				             <el-input v-model="form.submitter"></el-input>
			
 
				         </el-form-item>
			
 
				+
			
 
				+        <el-form-item label="开单人电话">
			
 
				+            <el-input v-model="form.submitterPhone"></el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item label="支付方式">
			
 
				+
			
 
				+            <el-select v-model="form.payTypeId" placeholder="请选择支付方式">
			
 
				+                <el-option
			
 
				+                        v-for="item in payTypeInfoOptions"
			
 
				+                        :key="item.id"
			
 
				+                        :label="item.payType"
			
 
				+                        :value="item.id">
			
 
				+                </el-option>
			
 
				+            </el-select>
			
 
				+
			
 
				+        </el-form-item>
			
 
				+        <el-form-item label="单次金额">
			
 
				+            <el-input v-model="form.onceMoney"></el-input>
			
 
				+        </el-form-item>
			
 
				+
			
 
				         <el-form-item>
			
 
				             <el-button type="primary" :loading="loading"  @click.native="onSave">提交</el-button>
			
 
				             <el-button @click.native="reback()">取消</el-button>
			
@@ -482,6 +502,7 @@
 
				                 bankCardPhoto: '',
			
 
				                 firstPayTime: '',
			
 
				                 houseVideo: '',
			
 
				+                payTypeId:'',
			
 
				             },
			
 
				             imgData: [{url: 'img/bg1.jpg'}, {url: 'img/bg2.jpg'}, {url: 'img/bg3.jpg'}, {url: 'img/bg4.jpg'}],
			
 
				             rules: {
			
@@ -502,7 +523,8 @@
 
				                 idCardPhotoA: [
			
 
				                     {required: true, message: '请上传身份证照片', trigger: 'change'}
			
 
				                 ]
			
 
				-            }
			
 
				+            },
			
 
				+            payTypeInfoOptions: []
			
 
				         },
			
 
				 
			
 
				         methods: {
			
@@ -618,6 +640,20 @@
 
				             }
			
 
				         },
			
 
				 
			
 
				+        created: function () {
			
 
				+            var that = this;
			
 
				+            $.get({
			
 
				+                url: '../payTypeInfo/all',
			
 
				+                data: {}
			
 
				+            }).then(function (res) {
			
 
				+
			
 
				+
			
 
				+                if (res.success == true) {
			
 
				+                    that.payTypeInfoOptions = res.data;
			
 
				+                }
			
 
				+            });
			
 
				+        }
			
 
				+
			
 
				     })
			
 
				 </script>
			
 
				 </html>
			
--- a/WebRoot/form_zf.html
+++ b/WebRoot/form_zf.html
@@ -9,7 +9,7 @@
 
				     <link rel="stylesheet" href="css/style.css">
			
 
				 </head>
			
 
				 <body>
			
 
				-<div id="app" >
			
 
				+<div id="app">
			
 
				     <el-row>
			
 
				         <template>
			
 
				             <!--  <el-carousel :interval="5000" arrow="always" height="150px">
			
@@ -271,8 +271,26 @@
 
				         <el-form-item label="开单人">
			
 
				             <el-input v-model="form.submitter"></el-input>
			
 
				         </el-form-item>
			
 
				+        <el-form-item label="开单人电话">
			
 
				+            <el-input v-model="form.submitterPhone"></el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item label="支付方式">
			
 
				+
			
 
				+            <el-select v-model="form.payTypeId" placeholder="请选择支付方式">
			
 
				+                <el-option
			
 
				+                        v-for="item in payTypeInfoOptions"
			
 
				+                        :key="item.id"
			
 
				+                        :label="item.payType"
			
 
				+                        :value="item.id">
			
 
				+                </el-option>
			
 
				+            </el-select>
			
 
				+
			
 
				+        </el-form-item>
			
 
				+        <el-form-item label="单次金额">
			
 
				+            <el-input v-model="form.onceMoney"></el-input>
			
 
				+        </el-form-item>
			
 
				         <el-form-item>
			
 
				-            <el-button type="primary" :loading="loading"  @click.native="onSave">提交</el-button>
			
 
				+            <el-button type="primary" :loading="loading" @click.native="onSave">提交</el-button>
			
 
				             <el-button @click.native="reback()">取消</el-button>
			
 
				         </el-form-item>
			
 
				 
			
@@ -287,7 +305,7 @@
 
				     var app = new Vue({
			
 
				         el: '#app',
			
 
				         data: {
			
 
				-            loading:false,
			
 
				+            loading: false,
			
 
				             idCardPhotoA: '',
			
 
				             idCardPhotoB: '',
			
 
				             idCardPhotoAa: '',
			
@@ -361,7 +379,8 @@
 
				                 alipayCount: '',
			
 
				                 bankCardName: '',
			
 
				                 bankCardCount: '',
			
 
				-                bankCardPhoto: ''
			
 
				+                bankCardPhoto: '',
			
 
				+                payTypeId:''
			
 
				             },
			
 
				             imgData: [{url: 'img/bg1.jpg'}, {url: 'img/bg2.jpg'}, {url: 'img/bg3.jpg'}, {url: 'img/bg4.jpg'}],
			
 
				             rules: {
			
@@ -381,7 +400,8 @@
 
				                 idCardPhotoA: [
			
 
				                     {required: true, message: '请上传身份证照片', trigger: 'change'}
			
 
				                 ]
			
 
				-            }
			
 
				+            },
			
 
				+            payTypeInfoOptions: []
			
 
				         },
			
 
				 
			
 
				         methods: {
			
@@ -417,7 +437,7 @@
 
				             onSubmit: function (form) {
			
 
				 
			
 
				                 var data = JSON.parse(JSON.stringify(this.form));
			
 
				-                this.loading=true
			
 
				+                this.loading = true
			
 
				                 $.get({
			
 
				                     url: 'rentInfo/getOne',
			
 
				                     data: {
			
@@ -426,7 +446,7 @@
 
				                         type: 2
			
 
				                     }
			
 
				                 }).then(function (res) {
			
 
				-                    this.loading=false
			
 
				+                    this.loading = false
			
 
				 
			
 
				                     if (res.success == true) {
			
 
				 
			
@@ -452,6 +472,19 @@
 
				             reback: function () {
			
 
				                 history.back();
			
 
				             }
			
 
				+        },
			
 
				+        created: function () {
			
 
				+            var that = this;
			
 
				+            $.get({
			
 
				+                url: '../payTypeInfo/all',
			
 
				+                data: {}
			
 
				+            }).then(function (res) {
			
 
				+
			
 
				+
			
 
				+                if (res.success == true) {
			
 
				+                    that.payTypeInfoOptions = res.data;
			
 
				+                }
			
 
				+            });
			
 
				         }
			
 
				     })
			
 
				 </script>
			
--- a/src/com/suyuan/dao/PayTypeInfoMapper.java
+++ b/src/com/suyuan/dao/PayTypeInfoMapper.java
@@ -0,0 +1,33 @@
 
				+package com.suyuan.dao;
			
 
				+
			
 
				+import java.util.List;
			
 
				+import java.util.Map;
			
 
				+
			
 
				+import org.springframework.stereotype.Repository;
			
 
				+
			
 
				+import com.suyuan.model.PayTypeInfo;
			
 
				+
			
 
				+/**
			
 
				+ * pay_type_info Dao接口
			
 
				+ * Wed Apr 10 14:48:25 CST 2019  Suo Chen Cheng
			
 
				+ */ 
			
 
				+@Repository("com.suyuan.dao.PayTypeInfoMapper")
			
 
				+public interface PayTypeInfoMapper {
			
 
				+
			
 
				+	int deleteByPrimaryKey(Integer id);
			
 
				+
			
 
				+	int insertSelective(PayTypeInfo record);
			
 
				+
			
 
				+	PayTypeInfo selectByPrimaryKey(Integer id);
			
 
				+
			
 
				+	int updateByPrimaryKeySelective(PayTypeInfo record);
			
 
				+
			
 
				+	List <PayTypeInfo> queryAllPayTypeInfo(PayTypeInfo record);
			
 
				+
			
 
				+	List <PayTypeInfo> queryPayTypeInfosByPage(Map <String, Object> parameter);
			
 
				+
			
 
				+	int delete(String id);
			
 
				+
			
 
				+	PayTypeInfo queryPayTypeInfo(PayTypeInfo record);
			
 
				+}
			
 
				+
			
--- a/src/com/suyuan/dao/PayTypeInfoMapper.xml
+++ b/src/com/suyuan/dao/PayTypeInfoMapper.xml
@@ -0,0 +1,190 @@
 
				+<?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.suyuan.dao.PayTypeInfoMapper" >
			
 
				+	<resultMap id="BaseResultMap" type="com.suyuan.model.PayTypeInfo" >
			
 
				+		<id column="id" property="id" jdbcType="INTEGER" />
			
 
				+		<result column="pay_type" property="payType" jdbcType="VARCHAR" />
			
 
				+		<result column="day_num" property="dayNum" jdbcType="INTEGER" />
			
 
				+		<result column="remark" property="remark" jdbcType="VARCHAR" />
			
 
				+		<result column="rank" property="rank" jdbcType="INTEGER" />
			
 
				+		<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
			
 
				+		<result column="del_flag" property="delFlag" jdbcType="CHAR" />
			
 
				+	</resultMap>
			
 
				+	<sql id="Base_Column_List" >
			
 
				+		 id, pay_type, day_num, remark, rank, update_time, del_flag
			
 
				+	</sql>
			
 
				+	<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
			
 
				+		select
			
 
				+		<include refid="Base_Column_List" />
			
 
				+		from pay_type_info
			
 
				+		where id = #{id,jdbcType=INTEGER}
			
 
				+	</select>
			
 
				+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
			
 
				+		delete from pay_type_info
			
 
				+		where id = #{id,jdbcType=INTEGER}
			
 
				+	</delete>
			
 
				+	<insert id="insertSelective" parameterType="com.suyuan.model.PayTypeInfo" useGeneratedKeys="true" keyProperty="id">
			
 
				+		insert into pay_type_info
			
 
				+		<trim prefix="(" suffix=")" suffixOverrides="," >
			
 
				+			<if test="id != null" >
			
 
				+				id,	
			
 
				+			</if>
			
 
				+			<if test="payType != null" >
			
 
				+				pay_type,	
			
 
				+			</if>
			
 
				+			<if test="dayNum != null" >
			
 
				+				day_num,	
			
 
				+			</if>
			
 
				+			<if test="remark != null" >
			
 
				+				remark,	
			
 
				+			</if>
			
 
				+			<if test="rank != null" >
			
 
				+				rank,	
			
 
				+			</if>
			
 
				+			<if test="updateTime != null" >
			
 
				+				update_time,	
			
 
				+			</if>
			
 
				+			<if test="delFlag != null" >
			
 
				+				del_flag,	
			
 
				+			</if>
			
 
				+		</trim>
			
 
				+		<trim prefix="values (" suffix=")" suffixOverrides="," >
			
 
				+			<if test="id != null" >
			
 
				+				#{id,jdbcType=INTEGER},	
			
 
				+			</if>
			
 
				+			<if test="payType != null" >
			
 
				+				#{payType,jdbcType=VARCHAR},	
			
 
				+			</if>
			
 
				+			<if test="dayNum != null" >
			
 
				+				#{dayNum,jdbcType=INTEGER},	
			
 
				+			</if>
			
 
				+			<if test="remark != null" >
			
 
				+				#{remark,jdbcType=VARCHAR},	
			
 
				+			</if>
			
 
				+			<if test="rank != null" >
			
 
				+				#{rank,jdbcType=INTEGER},	
			
 
				+			</if>
			
 
				+			<if test="updateTime != null" >
			
 
				+				#{updateTime,jdbcType=TIMESTAMP},	
			
 
				+			</if>
			
 
				+			<if test="delFlag != null" >
			
 
				+				#{delFlag,jdbcType=CHAR},	
			
 
				+			</if>
			
 
				+		</trim>
			
 
				+	</insert>
			
 
				+	<update id="updateByPrimaryKeySelective" parameterType="com.suyuan.model.PayTypeInfo" >
			
 
				+		update pay_type_info
			
 
				+		<set >
			
 
				+			<if test="payType != null" >
			
 
				+				pay_type = #{payType,jdbcType=VARCHAR},	
			
 
				+			</if>
			
 
				+			<if test="dayNum != null" >
			
 
				+				day_num = #{dayNum,jdbcType=INTEGER},	
			
 
				+			</if>
			
 
				+			<if test="remark != null" >
			
 
				+				remark = #{remark,jdbcType=VARCHAR},	
			
 
				+			</if>
			
 
				+			<if test="rank != null" >
			
 
				+				rank = #{rank,jdbcType=INTEGER},	
			
 
				+			</if>
			
 
				+			<if test="updateTime != null" >
			
 
				+				update_time = #{updateTime,jdbcType=TIMESTAMP},	
			
 
				+			</if>
			
 
				+			<if test="delFlag != null" >
			
 
				+				del_flag = #{delFlag,jdbcType=CHAR},	
			
 
				+			</if>
			
 
				+		</set>
			
 
				+		where id = #{id,jdbcType=INTEGER}
			
 
				+	</update>
			
 
				+	<select id="queryPayTypeInfosByPage" parameterType="java.util.Map" resultType="com.suyuan.model.PayTypeInfo">
			
 
				+		select <include refid="Base_Column_List"/> from pay_type_info
			
 
				+		<where>
			
 
				+			and del_flag = 'N'
			
 
				+			<if test="record.id != null and !&quot;&quot;.equals(record.id)">
			
 
				+				and id = #{record.id}	
			
 
				+			</if>
			
 
				+			<if test="record.payType != null and !&quot;&quot;.equals(record.payType)">
			
 
				+				and pay_type = #{record.payType}	
			
 
				+			</if>
			
 
				+			<if test="record.dayNum != null and !&quot;&quot;.equals(record.dayNum)">
			
 
				+				and day_num = #{record.dayNum}	
			
 
				+			</if>
			
 
				+			<if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
			
 
				+				and remark = #{record.remark}	
			
 
				+			</if>
			
 
				+			<if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
			
 
				+				and rank = #{record.rank}	
			
 
				+			</if>
			
 
				+			<if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
			
 
				+				and update_time = #{record.updateTime}	
			
 
				+			</if>
			
 
				+			<if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
			
 
				+				and del_flag = #{record.delFlag}	
			
 
				+			</if>
			
 
				+		</where>
			
 
				+		order by rank desc , id desc
			
 
				+	</select>
			
 
				+	<select id="queryAllPayTypeInfo" parameterType="java.util.Map" resultType="com.suyuan.model.PayTypeInfo">
			
 
				+		select <include refid="Base_Column_List"/> from pay_type_info
			
 
				+		<where>
			
 
				+			and del_flag = 'N'
			
 
				+			<if test="id != null and !&quot;&quot;.equals(id)">
			
 
				+				and id = #{id}	
			
 
				+			</if>
			
 
				+			<if test="payType != null and !&quot;&quot;.equals(payType)">
			
 
				+				and pay_type = #{payType}	
			
 
				+			</if>
			
 
				+			<if test="dayNum != null and !&quot;&quot;.equals(dayNum)">
			
 
				+				and day_num = #{dayNum}	
			
 
				+			</if>
			
 
				+			<if test="remark != null and !&quot;&quot;.equals(remark)">
			
 
				+				and remark = #{remark}	
			
 
				+			</if>
			
 
				+			<if test="rank != null and !&quot;&quot;.equals(rank)">
			
 
				+				and rank = #{rank}	
			
 
				+			</if>
			
 
				+			<if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
			
 
				+				and update_time = #{updateTime}	
			
 
				+			</if>
			
 
				+			<if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
			
 
				+				and del_flag = #{delFlag}	
			
 
				+			</if>
			
 
				+		</where>
			
 
				+		order by rank desc , id desc
			
 
				+	</select>
			
 
				+	<select id="queryPayTypeInfo" parameterType="java.util.Map" resultType="com.suyuan.model.PayTypeInfo">
			
 
				+		select <include refid="Base_Column_List"/> from pay_type_info
			
 
				+		<where>
			
 
				+			and del_flag = 'N'
			
 
				+			<if test="id != null and !&quot;&quot;.equals(id)">
			
 
				+				and id = #{id}	
			
 
				+			</if>
			
 
				+			<if test="payType != null and !&quot;&quot;.equals(payType)">
			
 
				+				and pay_type = #{payType}	
			
 
				+			</if>
			
 
				+			<if test="dayNum != null and !&quot;&quot;.equals(dayNum)">
			
 
				+				and day_num = #{dayNum}	
			
 
				+			</if>
			
 
				+			<if test="remark != null and !&quot;&quot;.equals(remark)">
			
 
				+				and remark = #{remark}	
			
 
				+			</if>
			
 
				+			<if test="rank != null and !&quot;&quot;.equals(rank)">
			
 
				+				and rank = #{rank}	
			
 
				+			</if>
			
 
				+			<if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
			
 
				+				and update_time = #{updateTime}	
			
 
				+			</if>
			
 
				+			<if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
			
 
				+				and del_flag = #{delFlag}	
			
 
				+			</if>
			
 
				+		</where>
			
 
				+		LIMIT 1
			
 
				+	</select>
			
 
				+	<update id="delete">
			
 
				+		UPDATE pay_type_info SET del_flag = 'Y'
			
 
				+		<where>
			
 
				+			AND id = #{id}
			
 
				+		</where>
			
 
				+	</update>
			
 
				+</mapper>
			
 
				+
			
--- a/src/com/suyuan/dao/RentInfoMapper.xml
+++ b/src/com/suyuan/dao/RentInfoMapper.xml
@@ -67,6 +67,11 @@
 
				         <result column="first_pay_time" property="firstPayTime" jdbcType="VARCHAR"/>
			
 
				         <result column="house_video" property="houseVideo" jdbcType="VARCHAR"/>
			
 
				         <result column="review_time" property="reviewTime" jdbcType="TIMESTAMP"/>
			
 
				+        <result column="pay_type_id" property="payTypeId" jdbcType="INTEGER"/>
			
 
				+        <result column="once_money" property="onceMoney" jdbcType="VARCHAR"/>
			
 
				+        <result column="notice_time" property="noticeTime" jdbcType="TIMESTAMP"/>
			
 
				+        <result column="notice_flag" property="noticeFlag" jdbcType="CHAR"/>
			
 
				+        <result column="submitter_phone" property="submitterPhone" jdbcType="VARCHAR"/>
			
 
				     </resultMap>
			
 
				     <sql id="Base_Column_List">
			
 
				 		 id, address, name, id_card, id_card_photo_a, id_card_photo_b, equity_prove_a, equity_prove_b,
			
@@ -79,7 +84,8 @@
 
				 		 elec_meters_valley, elec_meters_valley_photo, elec_meters_sum, elec_meters_sum_photo,
			
 
				 		 month_rent, pay_type, pay_photo, contract_start, contract_end, vacancy_time, age_limit, rent,
			
 
				 		 alipay_name, alipay_count, bank_card_name, bank_card_count, bank_card_photo, id_card_photo_aa,
			
 
				-		 id_card_photo_bb,review_flag, review_remark, first_pay_time, house_video, review_time
			
 
				+		 id_card_photo_bb,review_flag, review_remark, first_pay_time, house_video, review_time,
			
 
				+		 pay_type_id, once_money, notice_time, notice_flag, submitter_phone
			
 
				 	</sql>
			
 
				     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
			
 
				 		select
			
@@ -289,6 +295,21 @@
 
				             <if test="reviewTime != null">
			
 
				                 review_time,
			
 
				             </if>
			
 
				+            <if test="payTypeId != null">
			
 
				+                pay_type_id,
			
 
				+            </if>
			
 
				+            <if test="onceMoney != null">
			
 
				+                once_money,
			
 
				+            </if>
			
 
				+            <if test="noticeTime != null">
			
 
				+                notice_time,
			
 
				+            </if>
			
 
				+            <if test="noticeFlag != null">
			
 
				+                notice_flag,
			
 
				+            </if>
			
 
				+            <if test="submitterPhone != null">
			
 
				+                submitter_phone,
			
 
				+            </if>
			
 
				         </trim>
			
 
				         <trim prefix="values (" suffix=")" suffixOverrides=",">
			
 
				             <if test="id != null">
			
@@ -486,6 +507,21 @@
 
				             <if test="reviewTime != null">
			
 
				                 #{reviewTime,jdbcType=TIMESTAMP},
			
 
				             </if>
			
 
				+            <if test="payTypeId != null">
			
 
				+                #{payTypeId,jdbcType=INTEGER},
			
 
				+            </if>
			
 
				+            <if test="onceMoney != null">
			
 
				+                #{onceMoney,jdbcType=VARCHAR},
			
 
				+            </if>
			
 
				+            <if test="noticeTime != null">
			
 
				+                #{noticeTime,jdbcType=TIMESTAMP},
			
 
				+            </if>
			
 
				+            <if test="noticeFlag != null">
			
 
				+                #{noticeFlag,jdbcType=CHAR},
			
 
				+            </if>
			
 
				+            <if test="submitterPhone != null">
			
 
				+                #{submitterPhone,jdbcType=VARCHAR},
			
 
				+            </if>
			
 
				         </trim>
			
 
				     </insert>
			
 
				     <update id="updateByPrimaryKeySelective" parameterType="com.suyuan.model.RentInfo">
			
@@ -683,6 +719,21 @@
 
				             <if test="reviewTime != null">
			
 
				                 review_time = #{reviewTime,jdbcType=TIMESTAMP},
			
 
				             </if>
			
 
				+            <if test="payTypeId != null">
			
 
				+                pay_type_id = #{payTypeId,jdbcType=INTEGER},
			
 
				+            </if>
			
 
				+            <if test="onceMoney != null">
			
 
				+                once_money = #{onceMoney,jdbcType=VARCHAR},
			
 
				+            </if>
			
 
				+            <if test="noticeTime != null">
			
 
				+                notice_time = #{noticeTime,jdbcType=TIMESTAMP},
			
 
				+            </if>
			
 
				+            <if test="noticeFlag != null">
			
 
				+                notice_flag = #{noticeFlag,jdbcType=CHAR},
			
 
				+            </if>
			
 
				+            <if test="submitterPhone != null">
			
 
				+                submitter_phone = #{submitterPhone,jdbcType=VARCHAR},
			
 
				+            </if>
			
 
				         </set>
			
 
				         where id = #{id,jdbcType=INTEGER}
			
 
				     </update>
			
@@ -882,6 +933,18 @@
 
				             <if test="record.houseVideo != null and !&quot;&quot;.equals(record.houseVideo)">
			
 
				                 and house_video = #{record.houseVideo}
			
 
				             </if>
			
 
				+            <if test="record.payTypeId != null and !&quot;&quot;.equals(record.payTypeId)">
			
 
				+                and pay_type_id = #{record.payTypeId}
			
 
				+            </if>
			
 
				+            <if test="record.onceMoney != null and !&quot;&quot;.equals(record.onceMoney)">
			
 
				+                and once_money = #{record.onceMoney}
			
 
				+            </if>
			
 
				+            <if test="record.noticeFlag != null and !&quot;&quot;.equals(record.noticeFlag)">
			
 
				+                and notice_flag = #{record.noticeFlag}
			
 
				+            </if>
			
 
				+            <if test="record.submitterPhone != null and !&quot;&quot;.equals(record.submitterPhone)">
			
 
				+                and submitter_phone = #{record.submitterPhone}
			
 
				+            </if>
			
 
				         </where>
			
 
				         order by id desc
			
 
				     </select>
			
@@ -1081,6 +1144,18 @@
 
				             <if test="houseVideo != null and !&quot;&quot;.equals(houseVideo)">
			
 
				                 and house_video = #{houseVideo}
			
 
				             </if>
			
 
				+            <if test="payTypeId != null and !&quot;&quot;.equals(payTypeId)">
			
 
				+                and pay_type_id = #{payTypeId}
			
 
				+            </if>
			
 
				+            <if test="onceMoney != null and !&quot;&quot;.equals(onceMoney)">
			
 
				+                and once_money = #{onceMoney}
			
 
				+            </if>
			
 
				+            <if test="noticeFlag != null and !&quot;&quot;.equals(noticeFlag)">
			
 
				+                and notice_flag = #{noticeFlag}
			
 
				+            </if>
			
 
				+            <if test="submitterPhone != null and !&quot;&quot;.equals(submitterPhone)">
			
 
				+                and submitter_phone = #{submitterPhone}
			
 
				+            </if>
			
 
				         </where>
			
 
				         order by id desc
			
 
				     </select>
			
@@ -1280,6 +1355,9 @@
 
				             <if test="houseVideo != null and !&quot;&quot;.equals(houseVideo)">
			
 
				                 and house_video = #{houseVideo}
			
 
				             </if>
			
 
				+            <if test="submitterPhone != null and !&quot;&quot;.equals(submitterPhone)">
			
 
				+                and submitter_phone = #{submitterPhone}
			
 
				+            </if>
			
 
				         </where>
			
 
				         LIMIT 1
			
 
				     </select>
			
@@ -1318,6 +1396,23 @@
 
				             <if test="record.type != null and record.type != ''">
			
 
				                 and type = #{record.type}
			
 
				             </if>
			
 
				+            <if test="record.reviewFlag != null and record.reviewFlag != ''">
			
 
				+                and review_flag = #{record.reviewFlag}
			
 
				+            </if>
			
 
				+
			
 
				+            <if test="record.payTypeId != null and !&quot;&quot;.equals(record.payTypeId)">
			
 
				+                and pay_type_id = #{record.payTypeId}
			
 
				+            </if>
			
 
				+            <if test="record.onceMoney != null and !&quot;&quot;.equals(record.onceMoney)">
			
 
				+                and once_money = #{record.onceMoney}
			
 
				+            </if>
			
 
				+            <if test="record.noticeFlag != null and !&quot;&quot;.equals(record.noticeFlag)">
			
 
				+                and notice_flag = #{record.noticeFlag}
			
 
				+            </if>
			
 
				+            <if test="record.submitterPhone != null and !&quot;&quot;.equals(record.submitterPhone)">
			
 
				+                and submitter_phone = #{record.submitterPhone}
			
 
				+            </if>
			
 
				+
			
 
				 
			
 
				         </where>
			
 
				         order by id desc
			
--- a/src/com/suyuan/model/PayTypeInfo.java
+++ b/src/com/suyuan/model/PayTypeInfo.java
@@ -0,0 +1,87 @@
 
				+package com.suyuan.model;
			
 
				+
			
 
				+import java.util.*;
			
 
				+
			
 
				+import org.codehaus.jackson.annotate.JsonAutoDetect;
			
 
				+import org.codehaus.jackson.map.annotate.JsonSerialize;
			
 
				+
			
 
				+/**
			
 
				+ * pay_type_info 实体类
			
 
				+ * Wed Apr 10 14:48:25 CST 2019  Suo Chen Cheng
			
 
				+ */ 
			
 
				+@JsonAutoDetect
			
 
				+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
			
 
				+public class PayTypeInfo{
			
 
				+
			
 
				+	private Integer id;
			
 
				+
			
 
				+	private String payType;
			
 
				+
			
 
				+	private Integer dayNum;
			
 
				+
			
 
				+	private String remark;
			
 
				+
			
 
				+	private Integer rank;
			
 
				+
			
 
				+	private Date updateTime;
			
 
				+
			
 
				+	private String delFlag;
			
 
				+
			
 
				+	public void setId(Integer id){
			
 
				+		this.id=id;
			
 
				+	}
			
 
				+
			
 
				+	public Integer getId(){
			
 
				+		return id;
			
 
				+	}
			
 
				+
			
 
				+	public void setPayType(String payType){
			
 
				+		this.payType=payType;
			
 
				+	}
			
 
				+
			
 
				+	public String getPayType(){
			
 
				+		return payType;
			
 
				+	}
			
 
				+
			
 
				+	public void setDayNum(Integer dayNum){
			
 
				+		this.dayNum=dayNum;
			
 
				+	}
			
 
				+
			
 
				+	public Integer getDayNum(){
			
 
				+		return dayNum;
			
 
				+	}
			
 
				+
			
 
				+	public void setRemark(String remark){
			
 
				+		this.remark=remark;
			
 
				+	}
			
 
				+
			
 
				+	public String getRemark(){
			
 
				+		return remark;
			
 
				+	}
			
 
				+
			
 
				+	public void setRank(Integer rank){
			
 
				+		this.rank=rank;
			
 
				+	}
			
 
				+
			
 
				+	public Integer getRank(){
			
 
				+		return rank;
			
 
				+	}
			
 
				+
			
 
				+	public void setUpdateTime(Date updateTime){
			
 
				+		this.updateTime=updateTime;
			
 
				+	}
			
 
				+
			
 
				+	public Date getUpdateTime(){
			
 
				+		return updateTime;
			
 
				+	}
			
 
				+
			
 
				+	public void setDelFlag(String delFlag){
			
 
				+		this.delFlag=delFlag;
			
 
				+	}
			
 
				+
			
 
				+	public String getDelFlag(){
			
 
				+		return delFlag;
			
 
				+	}
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/com/suyuan/model/RentInfo.java
+++ b/src/com/suyuan/model/RentInfo.java
--- a/src/com/suyuan/service/PayTypeInfoService.java
+++ b/src/com/suyuan/service/PayTypeInfoService.java
@@ -0,0 +1,29 @@
 
				+package com.suyuan.service;
			
 
				+
			
 
				+import java.util.List;
			
 
				+
			
 
				+import com.suyuan.dto.Page;
			
 
				+import com.suyuan.model.PayTypeInfo;
			
 
				+
			
 
				+/**
			
 
				+ * pay_type_info service接口类
			
 
				+ * Wed Apr 10 14:48:25 CST 2019  Suo Chen Cheng
			
 
				+ */ 
			
 
				+public interface PayTypeInfoService {
			
 
				+
			
 
				+	List <PayTypeInfo> getPayTypeInfoList(PayTypeInfo record);
			
 
				+
			
 
				+	List <PayTypeInfo> getPayTypeInfoByPage(Page page, PayTypeInfo record);
			
 
				+
			
 
				+	PayTypeInfo getPayTypeInfoById(String id);
			
 
				+
			
 
				+	PayTypeInfo getPayTypeInfo(PayTypeInfo record);
			
 
				+
			
 
				+	boolean createPayTypeInfo(PayTypeInfo record);
			
 
				+
			
 
				+	boolean deletePayTypeInfo(String id);
			
 
				+
			
 
				+	boolean updatePayTypeInfo(PayTypeInfo record);
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/com/suyuan/service/impl/PayTypeInfoServiceImpl.java
+++ b/src/com/suyuan/service/impl/PayTypeInfoServiceImpl.java
@@ -0,0 +1,144 @@
 
				+package com.suyuan.service.impl;
			
 
				+
			
 
				+import java.util.HashMap;
			
 
				+import java.util.List;
			
 
				+import java.util.Map;
			
 
				+
			
 
				+import org.apache.log4j.Logger;
			
 
				+import org.springframework.beans.factory.annotation.Autowired;
			
 
				+import org.springframework.stereotype.Service;
			
 
				+
			
 
				+import com.suyuan.constant.AppConstant;
			
 
				+import com.suyuan.dao.PayTypeInfoMapper;
			
 
				+import com.suyuan.dto.Page;
			
 
				+import com.suyuan.model.PayTypeInfo;
			
 
				+import com.suyuan.service.PayTypeInfoService;
			
 
				+
			
 
				+/**
			
 
				+ * pay_type_info service接口实现类
			
 
				+ * Wed Apr 10 14:48:25 CST 2019  Suo Chen Cheng
			
 
				+ */ 
			
 
				+@Service
			
 
				+public class PayTypeInfoServiceImpl implements PayTypeInfoService {
			
 
				+
			
 
				+	private static Logger   logger = Logger.getLogger(PayTypeInfoServiceImpl.class);
			
 
				+
			
 
				+	@Autowired
			
 
				+	private PayTypeInfoMapper payTypeInfoMapper;
			
 
				+
			
 
				+	@Override
			
 
				+	public List <PayTypeInfo> getPayTypeInfoList(PayTypeInfo record) {
			
 
				+
			
 
				+		logger.info("getPayTypeInfoList");
			
 
				+		try {
			
 
				+
			
 
				+			return payTypeInfoMapper.queryAllPayTypeInfo(record);
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("getPayTypeInfoList", e);
			
 
				+		}
			
 
				+
			
 
				+		return null;
			
 
				+	}
			
 
				+
			
 
				+	@Override
			
 
				+	public List <PayTypeInfo> getPayTypeInfoByPage(Page page, PayTypeInfo record) {
			
 
				+
			
 
				+		logger.info("getPayTypeInfoByPage");
			
 
				+		try {
			
 
				+
			
 
				+			Map <String, Object> parameter = new HashMap <String, Object>();
			
 
				+			parameter.put("record", record);
			
 
				+			parameter.put(AppConstant.PAGE, page);
			
 
				+
			
 
				+			return payTypeInfoMapper.queryPayTypeInfosByPage(parameter);
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("getPayTypeInfoByPage", e);
			
 
				+		}
			
 
				+
			
 
				+		return null;
			
 
				+	}
			
 
				+
			
 
				+	@Override
			
 
				+	public PayTypeInfo getPayTypeInfoById(String id) {
			
 
				+
			
 
				+		logger.info("getPayTypeInfoById");
			
 
				+		try {
			
 
				+
			
 
				+			return payTypeInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("getPayTypeInfoById", e);
			
 
				+		}
			
 
				+
			
 
				+		return null;
			
 
				+	}
			
 
				+
			
 
				+	@Override
			
 
				+	public PayTypeInfo getPayTypeInfo(PayTypeInfo record) {
			
 
				+
			
 
				+		logger.info("getPayTypeInfo");
			
 
				+		try {
			
 
				+
			
 
				+			return payTypeInfoMapper.queryPayTypeInfo(record);
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("getPayTypeInfo", e);
			
 
				+		}
			
 
				+
			
 
				+		return null;
			
 
				+	}
			
 
				+
			
 
				+	@Override
			
 
				+	public boolean createPayTypeInfo(PayTypeInfo record) {
			
 
				+
			
 
				+		logger.info("createPayTypeInfo");
			
 
				+		try {
			
 
				+
			
 
				+			int updates = payTypeInfoMapper.insertSelective(record);
			
 
				+
			
 
				+			if (updates > 0) {
			
 
				+				return true;
			
 
				+			}
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("createPayTypeInfo", e);
			
 
				+		}
			
 
				+
			
 
				+		return false;
			
 
				+	}
			
 
				+
			
 
				+	@Override
			
 
				+	public boolean deletePayTypeInfo(String id) {
			
 
				+
			
 
				+		logger.info("deletePayTypeInfo");
			
 
				+		try {
			
 
				+
			
 
				+			int updates = payTypeInfoMapper.delete(id);
			
 
				+
			
 
				+			if (updates > 0) {
			
 
				+				return true;
			
 
				+			}
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("deletePayTypeInfo", e);
			
 
				+		}
			
 
				+
			
 
				+		return false;
			
 
				+	}
			
 
				+
			
 
				+	@Override
			
 
				+	public boolean updatePayTypeInfo(PayTypeInfo record) {
			
 
				+
			
 
				+		logger.info("updatePayTypeInfo");
			
 
				+		try {
			
 
				+
			
 
				+			int updates = payTypeInfoMapper.updateByPrimaryKeySelective(record);
			
 
				+
			
 
				+			if (updates > 0) {
			
 
				+				return true;
			
 
				+			}
			
 
				+		} catch (Exception e) {
			
 
				+			logger.error("updatePayTypeInfo", e);
			
 
				+		}
			
 
				+
			
 
				+		return false;
			
 
				+	}
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/com/suyuan/web/PayTypeInfoController.java
+++ b/src/com/suyuan/web/PayTypeInfoController.java
@@ -0,0 +1,123 @@
 
				+package com.suyuan.web;
			
 
				+
			
 
				+import java.util.HashMap;
			
 
				+import java.util.List;
			
 
				+import java.util.Map;
			
 
				+
			
 
				+import org.springframework.beans.factory.annotation.Autowired;
			
 
				+import org.springframework.stereotype.Controller;
			
 
				+import org.springframework.web.bind.annotation.RequestMapping;
			
 
				+import org.springframework.web.bind.annotation.RequestMethod;
			
 
				+import org.springframework.web.bind.annotation.RequestParam;
			
 
				+import org.springframework.web.bind.annotation.ResponseBody;
			
 
				+
			
 
				+import com.suyuan.constant.AppConstant;
			
 
				+import com.suyuan.dto.Page;
			
 
				+import com.suyuan.dto.Result;
			
 
				+import com.suyuan.model.PayTypeInfo;
			
 
				+import com.suyuan.service.PayTypeInfoService;
			
 
				+
			
 
				+/**
			
 
				+ * pay_type_info controller类
			
 
				+ * Wed Apr 10 14:48:25 CST 2019  Suo Chen Cheng
			
 
				+ */ 
			
 
				+@Controller
			
 
				+@RequestMapping("/payTypeInfo")
			
 
				+public class PayTypeInfoController extends BaseController  {
			
 
				+
			
 
				+	@Autowired
			
 
				+	private PayTypeInfoService payTypeInfoService;
			
 
				+
			
 
				+	/**
			
 
				+	 * <p>获取全部记录。</p>
			
 
				+	 */ 
			
 
				+	@RequestMapping(value = "/all", method = RequestMethod.GET)
			
 
				+	@ResponseBody
			
 
				+	public Result all(PayTypeInfo record) {
			
 
				+
			
 
				+		List <PayTypeInfo> pp = payTypeInfoService.getPayTypeInfoList(record);
			
 
				+		return new Result(true, pp);
			
 
				+	}
			
 
				+
			
 
				+	/**
			
 
				+	 * <p>根据Id。</p>
			
 
				+	 */ 
			
 
				+	@RequestMapping(value = "/getPayTypeInfo", method = RequestMethod.GET)
			
 
				+	@ResponseBody
			
 
				+	public Result getPayTypeInfo(@RequestParam(required = false, value = "id") String id) {
			
 
				+
			
 
				+		PayTypeInfo data = payTypeInfoService.getPayTypeInfoById(id);
			
 
				+		return new Result(true, data);
			
 
				+	}
			
 
				+
			
 
				+	/**
			
 
				+	 * <p>根据条件获取。</p>
			
 
				+	 */ 
			
 
				+	@RequestMapping(value = "/getOne", method = RequestMethod.GET)
			
 
				+	@ResponseBody
			
 
				+	public Result getOne(PayTypeInfo record) {
			
 
				+
			
 
				+		PayTypeInfo data = payTypeInfoService.getPayTypeInfo(record);
			
 
				+		return new Result(true, data);
			
 
				+	}
			
 
				+
			
 
				+	/**
			
 
				+	 * <p>分页查询。</p>
			
 
				+	 */ 
			
 
				+	@RequestMapping(value = "/page", method = RequestMethod.GET)
			
 
				+	@ResponseBody
			
 
				+	public Result page(Page page, PayTypeInfo record) {
			
 
				+
			
 
				+		Map <String, Object> result = new HashMap <>();
			
 
				+
			
 
				+		List <PayTypeInfo> pp = payTypeInfoService.getPayTypeInfoByPage(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(PayTypeInfo record) {
			
 
				+
			
 
				+		boolean num = payTypeInfoService.createPayTypeInfo(record);
			
 
				+		if (num) {
			
 
				+			return new Result(true, record.getId());
			
 
				+		}
			
 
				+		return new Result(false, "保存异常");
			
 
				+	}
			
 
				+
			
 
				+	/**
			
 
				+	 * <p>更新信息。</p>
			
 
				+	 */ 
			
 
				+	@RequestMapping(value = "/update", method = RequestMethod.POST)
			
 
				+	@ResponseBody
			
 
				+	public Result updatePayTypeInfo(PayTypeInfo record) {
			
 
				+
			
 
				+		boolean num = payTypeInfoService.updatePayTypeInfo(record);
			
 
				+		if (num) {
			
 
				+			return new Result(true, "保存成功");
			
 
				+		}
			
 
				+		return new Result(false, "保存异常");
			
 
				+	}
			
 
				+
			
 
				+	/**
			
 
				+	 * <p>删除。</p>
			
 
				+	 */ 
			
 
				+	@RequestMapping(value = "/del", method = RequestMethod.POST)
			
 
				+	@ResponseBody
			
 
				+	public Result deletePayTypeInfo(@RequestParam(required = true, value = "id") String id) {
			
 
				+
			
 
				+		boolean num = payTypeInfoService.deletePayTypeInfo(id);
			
 
				+		if (num) {
			
 
				+			return new Result(true, "删除成功");
			
 
				+		}
			
 
				+		return new Result(false, "删除异常");
			
 
				+	}
			
 
				+
			
 
				+}
			
 
				+
			
--- a/src/com/suyuan/web/admin/AdminController.java
+++ b/src/com/suyuan/web/admin/AdminController.java
@@ -1,233 +1,180 @@
 
				-/*     */
			
 
				 package com.suyuan.web.admin;
			
 
				-/*     */
			
 
				-/*     */
			
 
				 
			
 
				 import com.suyuan.dao.UserInfoMapper;
			
 
				-/*     */ import com.suyuan.dto.Page;
			
 
				+import com.suyuan.dto.Page;
			
 
				 import com.suyuan.dto.Result;
			
 
				-/*     */ import com.suyuan.model.RentInfo;
			
 
				+import com.suyuan.model.RentInfo;
			
 
				 import com.suyuan.model.UserInfo;
			
 
				-/*     */ import com.suyuan.service.impl.RentInfoServiceImpl;
			
 
				-/*     */ import java.io.IOException;
			
 
				-/*     */ import java.io.PrintStream;
			
 
				-/*     */ import java.util.HashMap;
			
 
				+import com.suyuan.service.impl.RentInfoServiceImpl;
			
 
				+
			
 
				+import java.io.IOException;
			
 
				+import java.io.PrintStream;
			
 
				+import java.util.HashMap;
			
 
				 import java.util.List;
			
 
				 import java.util.Map;
			
 
				-/*     */ import javax.annotation.Resource;
			
 
				-/*     */ import javax.servlet.http.HttpServletRequest;
			
 
				-/*     */ import javax.servlet.http.HttpServletResponse;
			
 
				-/*     */ import javax.servlet.http.HttpSession;
			
 
				-/*     */ import net.sf.json.JSONObject;
			
 
				-/*     */ import org.apache.commons.lang.StringUtils;
			
 
				+import javax.annotation.Resource;
			
 
				+import javax.servlet.http.HttpServletRequest;
			
 
				+import javax.servlet.http.HttpServletResponse;
			
 
				+import javax.servlet.http.HttpSession;
			
 
				+
			
 
				+import net.sf.json.JSONObject;
			
 
				+import org.apache.commons.lang.StringUtils;
			
 
				 import org.apache.http.HttpEntity;
			
 
				-/*     */ import org.apache.http.ParseException;
			
 
				-/*     */ import org.apache.http.client.ClientProtocolException;
			
 
				-/*     */ import org.apache.http.client.methods.CloseableHttpResponse;
			
 
				-/*     */ import org.apache.http.client.methods.HttpGet;
			
 
				-/*     */ import org.apache.http.client.methods.HttpPost;
			
 
				-/*     */ import org.apache.http.entity.StringEntity;
			
 
				-/*     */ import org.apache.http.impl.client.CloseableHttpClient;
			
 
				-/*     */ import org.apache.http.impl.client.HttpClients;
			
 
				-/*     */ import org.apache.http.util.EntityUtils;
			
 
				-/*     */ import org.apache.log4j.Logger;
			
 
				-/*     */ import org.springframework.stereotype.Controller;
			
 
				-/*     */ import org.springframework.transaction.annotation.Transactional;
			
 
				-/*     */ import org.springframework.web.bind.annotation.RequestMapping;
			
 
				-/*     */ import org.springframework.web.bind.annotation.ResponseBody;
			
 
				-/*     */ import org.springframework.web.servlet.ModelAndView;
			
 
				-
			
 
				-/*     */
			
 
				-/*     */
			
 
				+import org.apache.http.ParseException;
			
 
				+import org.apache.http.client.ClientProtocolException;
			
 
				+import org.apache.http.client.methods.CloseableHttpResponse;
			
 
				+import org.apache.http.client.methods.HttpGet;
			
 
				+import org.apache.http.client.methods.HttpPost;
			
 
				+import org.apache.http.entity.StringEntity;
			
 
				+import org.apache.http.impl.client.CloseableHttpClient;
			
 
				+import org.apache.http.impl.client.HttpClients;
			
 
				+import org.apache.http.util.EntityUtils;
			
 
				+import org.apache.log4j.Logger;
			
 
				+import org.springframework.stereotype.Controller;
			
 
				+import org.springframework.transaction.annotation.Transactional;
			
 
				+import org.springframework.web.bind.annotation.RequestMapping;
			
 
				+import org.springframework.web.bind.annotation.ResponseBody;
			
 
				+import org.springframework.web.servlet.ModelAndView;
			
 
				+
			
 
				 @Controller
			
 
				-/*     */
			
 
				 @RequestMapping({"/admin"})
			
 
				-/*     */ public class AdminController
			
 
				-        /*     */ {
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				+public class AdminController {
			
 
				+
			
 
				+
			
 
				     @Resource
			
 
				-    /*     */ UserInfoMapper mapper;
			
 
				+    UserInfoMapper mapper;
			
 
				+
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				     public String getAccess_token()
			
 
				-    /*     */     throws ParseException, IOException
			
 
				-    /*     */ {
			
 
				-        /*  51 */
			
 
				+            throws ParseException, IOException {
			
 
				         String path = "https://oapi.dingtalk.com/sns/gettoken?appid=dingoazvsyaieercmwxmvu&appsecret=qvxkE3hiLnSbgIrWA7oydSLVd_e8t3XafwbxUcfMF3z0edwEKZ0fD6a7JzpVqVJU";
			
 
				-        /*     */
			
 
				-        /*  55 */
			
 
				+
			
 
				         CloseableHttpClient client = HttpClients.createDefault();
			
 
				-        /*     */
			
 
				-        /*  57 */
			
 
				+
			
 
				         HttpGet post = new HttpGet(path);
			
 
				-        /*     */
			
 
				-        /*  60 */
			
 
				+
			
 
				         CloseableHttpResponse response = client.execute(post);
			
 
				-        /*     */
			
 
				-        /*  62 */
			
 
				+
			
 
				         HttpEntity tt = response.getEntity();
			
 
				-        /*  63 */
			
 
				         String s = EntityUtils.toString(tt, "UTF-8");
			
 
				-        /*  64 */
			
 
				         JSONObject json = JSONObject.fromObject(s);
			
 
				-        /*     */
			
 
				-        /*  67 */
			
 
				+
			
 
				         return (String) json.get("access_token");
			
 
				-        /*     */
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    public JSONObject getUserInfo(String path) throws ParseException, IOException
			
 
				-    /*     */ {
			
 
				-        /*  72 */
			
 
				+
			
 
				+    public JSONObject getUserInfo(String path) throws ParseException, IOException {
			
 
				         CloseableHttpClient client = HttpClients.createDefault();
			
 
				-        /*     */
			
 
				-        /*  74 */
			
 
				+
			
 
				         HttpGet post = new HttpGet(path);
			
 
				-        /*     */
			
 
				-        /*  77 */
			
 
				+
			
 
				         CloseableHttpResponse response = client.execute(post);
			
 
				-        /*     */
			
 
				-        /*  79 */
			
 
				+
			
 
				         HttpEntity tt = response.getEntity();
			
 
				-        /*  80 */
			
 
				         String s = EntityUtils.toString(tt, "UTF-8");
			
 
				-        /*  81 */
			
 
				         JSONObject json = JSONObject.fromObject(s);
			
 
				-        /*     */
			
 
				-        /*  84 */
			
 
				+
			
 
				         return json;
			
 
				-        /*     */
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    public JSONObject getPersistent_code(String path, String tmp_auth_code) throws ClientProtocolException, IOException
			
 
				-    /*     */ {
			
 
				-        /*  89 */
			
 
				+
			
 
				+    public JSONObject getPersistent_code(String path, String tmp_auth_code) throws ClientProtocolException, IOException {
			
 
				         CloseableHttpClient client = HttpClients.createDefault();
			
 
				-        /*     */
			
 
				-        /*  93 */
			
 
				+
			
 
				         HttpPost post = new HttpPost(path);
			
 
				-        /*     */
			
 
				-        /*  95 */
			
 
				+
			
 
				         JSONObject jsonObject3_1 = new JSONObject();
			
 
				-        /*  96 */
			
 
				         jsonObject3_1.put("tmp_auth_code", tmp_auth_code);
			
 
				-        /*  97 */
			
 
				         HttpEntity httpEntity3 = null;
			
 
				-        /*  98 */
			
 
				         httpEntity3 = new StringEntity(jsonObject3_1.toString(), "UTF-8");
			
 
				-        /*     */
			
 
				-        /* 100 */
			
 
				+
			
 
				         post.setEntity(httpEntity3);
			
 
				-        /*     */
			
 
				-        /* 103 */
			
 
				+
			
 
				         CloseableHttpResponse res = client.execute(post);
			
 
				-        /* 104 */
			
 
				         HttpEntity resultEntity = res.getEntity();
			
 
				-        /* 105 */
			
 
				         String strEntity = EntityUtils.toString(resultEntity);
			
 
				-        /* 106 */
			
 
				         JSONObject json = JSONObject.fromObject(strEntity);
			
 
				-        /*     */
			
 
				-        /* 110 */
			
 
				+
			
 
				         return json;
			
 
				-        /*     */
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    public String getSNS_TOKEN(String path, JSONObject json) throws ClientProtocolException, IOException
			
 
				-    /*     */ {
			
 
				-        /* 115 */
			
 
				+
			
 
				+    public String getSNS_TOKEN(String path, JSONObject json) throws ClientProtocolException, IOException {
			
 
				         CloseableHttpClient client = HttpClients.createDefault();
			
 
				-        /*     */
			
 
				-        /* 118 */
			
 
				+
			
 
				         HttpPost post = new HttpPost(path);
			
 
				-        /*     */
			
 
				-        /* 120 */
			
 
				+
			
 
				         JSONObject jsonObject4 = new JSONObject();
			
 
				-        /* 121 */
			
 
				         jsonObject4.put("openid", json.getString("openid"));
			
 
				-        /* 122 */
			
 
				         jsonObject4.put("persistent_code", json.getString("persistent_code"));
			
 
				-        /* 123 */
			
 
				         HttpEntity httpEntity4 = null;
			
 
				-        /* 124 */
			
 
				         httpEntity4 = new StringEntity(jsonObject4.toString(), "UTF-8");
			
 
				-        /*     */
			
 
				-        /* 126 */
			
 
				+
			
 
				         post.setEntity(httpEntity4);
			
 
				-        /*     */
			
 
				-        /* 130 */
			
 
				+
			
 
				         CloseableHttpResponse res = client.execute(post);
			
 
				-        /* 131 */
			
 
				         HttpEntity resultEntity = res.getEntity();
			
 
				-        /* 132 */
			
 
				         String strEntity = EntityUtils.toString(resultEntity);
			
 
				-        /* 133 */
			
 
				         json = JSONObject.fromObject(strEntity);
			
 
				-        /*     */
			
 
				-        /* 137 */
			
 
				+
			
 
				         return json.getString("sns_token");
			
 
				-        /*     */
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				+
			
 
				     @RequestMapping(value = {"/index"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */
			
 
				+
			
 
				     @Transactional(rollbackFor = {Exception.class})
			
 
				-    /*     */ public ModelAndView index(HttpServletRequest req, HttpServletResponse res, String code, String state) {
			
 
				+    public ModelAndView index(HttpServletRequest req, HttpServletResponse res, String code, String state) {
			
 
				         //临时绕过钉钉登录
			
 
				-//        req.getSession(true).setAttribute("superUserId", String.valueOf(10001));
			
 
				-//        req.getSession(true).setAttribute("superUserName", "管理员1");
			
 
				-//        UserInfo user = this.mapper.selectByUserName("scc");
			
 
				-//        req.getSession().setAttribute("userInfo", user);
			
 
				-//        return new ModelAndView("jsp/newAdmin/index.jsp");
			
 
				-
			
 
				-        System.out.println("222  访问index  222");
			
 
				-        if (StringUtils.isNotEmpty(code)) {
			
 
				-
			
 
				-            String tmp_auth_code = code;
			
 
				-            JSONObject json = null;
			
 
				-            try {
			
 
				-                String access_token = getAccess_token();
			
 
				-                String path = "https://oapi.dingtalk.com/sns/get_persistent_code?access_token=" + access_token;
			
 
				-                json = getPersistent_code(path, tmp_auth_code);
			
 
				-
			
 
				-                path = "https://oapi.dingtalk.com/sns/get_sns_token?access_token=" + access_token;
			
 
				-                String sns_token = getSNS_TOKEN(path, json);
			
 
				-                path = "https://oapi.dingtalk.com/sns/getuserinfo?sns_token=" + sns_token;
			
 
				-                json = getUserInfo(path);
			
 
				-                JSONObject userInfo = JSONObject.fromObject(json.getString("user_info"));
			
 
				-                String userName = userInfo.getString("nick");
			
 
				-                UserInfo user = this.mapper.selectByUserName(userName);
			
 
				-                if (user == null) {
			
 
				-                    UserInfo newUser = new UserInfo();
			
 
				-                    newUser.setUserName(userInfo.getString("nick"));
			
 
				-                    newUser.setLimitF("1");
			
 
				-                    newUser.setAddress("");
			
 
				-                    this.mapper.insertUserInfo(newUser);
			
 
				-                    req.getSession().setAttribute("userInfo", newUser);
			
 
				-                } else {
			
 
				-
			
 
				-                    req.getSession().setAttribute("userInfo", user);
			
 
				-                }
			
 
				-            } catch (Exception e) {
			
 
				-                e.printStackTrace();
			
 
				-                return new ModelAndView("redirect:login");
			
 
				-            }
			
 
				-            req.getSession(true).setAttribute("superUserId", String.valueOf(10001));
			
 
				-            req.getSession(true).setAttribute("superUserName", "管理员1");
			
 
				-            return new ModelAndView("jsp/newAdmin/index.jsp");
			
 
				-
			
 
				-        } else {
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-        }
			
 
				+        req.getSession(true).setAttribute("superUserId", String.valueOf(10001));
			
 
				+        req.getSession(true).setAttribute("superUserName", "管理员1");
			
 
				+        UserInfo user = this.mapper.selectByUserName("scc");
			
 
				+        req.getSession().setAttribute("userInfo", user);
			
 
				+        return new ModelAndView("jsp/newAdmin/index.jsp");
			
 
				+
			
 
				+//        System.out.println("222  访问index  222");
			
 
				+//        if (StringUtils.isNotEmpty(code)) {
			
 
				+//
			
 
				+//            String tmp_auth_code = code;
			
 
				+//            JSONObject json = null;
			
 
				+//            try {
			
 
				+//                String access_token = getAccess_token();
			
 
				+//                String path = "https://oapi.dingtalk.com/sns/get_persistent_code?access_token=" + access_token;
			
 
				+//                json = getPersistent_code(path, tmp_auth_code);
			
 
				+//
			
 
				+//                path = "https://oapi.dingtalk.com/sns/get_sns_token?access_token=" + access_token;
			
 
				+//                String sns_token = getSNS_TOKEN(path, json);
			
 
				+//                path = "https://oapi.dingtalk.com/sns/getuserinfo?sns_token=" + sns_token;
			
 
				+//                json = getUserInfo(path);
			
 
				+//                JSONObject userInfo = JSONObject.fromObject(json.getString("user_info"));
			
 
				+//                String userName = userInfo.getString("nick");
			
 
				+//                UserInfo user = this.mapper.selectByUserName(userName);
			
 
				+//                if (user == null) {
			
 
				+//                    UserInfo newUser = new UserInfo();
			
 
				+//                    newUser.setUserName(userInfo.getString("nick"));
			
 
				+//                    newUser.setLimitF("1");
			
 
				+//                    newUser.setAddress("");
			
 
				+//                    this.mapper.insertUserInfo(newUser);
			
 
				+//                    req.getSession().setAttribute("userInfo", newUser);
			
 
				+//                } else {
			
 
				+//
			
 
				+//                    req.getSession().setAttribute("userInfo", user);
			
 
				+//                }
			
 
				+//            } catch (Exception e) {
			
 
				+//                e.printStackTrace();
			
 
				+//                return new ModelAndView("redirect:login");
			
 
				+//            }
			
 
				+//            req.getSession(true).setAttribute("superUserId", String.valueOf(10001));
			
 
				+//            req.getSession(true).setAttribute("superUserName", "管理员1");
			
 
				+//            return new ModelAndView("jsp/newAdmin/index.jsp");
			
 
				+//
			
 
				+//        } else {
			
 
				+//            return new ModelAndView("redirect:login");
			
 
				+//        }
			
 
				     }
			
 
				 
			
 
				 
			
@@ -242,61 +189,21 @@ import org.apache.http.HttpEntity;
 
				         return new Result(false, "error");
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				+
			
 
				     @RequestMapping(value = {"/login"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public void login(HttpServletResponse res)
			
 
				-    /*     */ {
			
 
				-        /* 199 */
			
 
				+    public void login(HttpServletResponse res) {
			
 
				         String path = "https://oapi.dingtalk.com/connect/qrconnect?appid=dingoazvsyaieercmwxmvu&response_type=code&scope=snsapi_login&state=STATE&redirect_uri=http://fy.xiangjuwu.com/admin/index";
			
 
				-        /*     */
			
 
				-        try
			
 
				-            /*     */ {
			
 
				-            /* 202 */
			
 
				+
			
 
				+        try {
			
 
				             res.sendRedirect(path);
			
 
				-            /*     */
			
 
				+
			
 
				         } catch (IOException e) {
			
 
				-            /* 204 */
			
 
				             e.printStackTrace();
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/adminInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView adminInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 215 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 216 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 218 */
			
 
				-        return new ModelAndView("jsp/newAdmin/adminInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/adminInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView adminInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 225 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 226 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 228 */
			
 
				-        return new ModelAndView("jsp/newAdmin/adminInfo.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				     @RequestMapping(value = {"/userInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				     public ModelAndView userInfos(HttpServletRequest request) {
			
 
				 
			
@@ -319,103 +226,76 @@ import org.apache.http.HttpEntity;
 
				 
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				+
			
 
				     @RequestMapping({"/userId"})
			
 
				-    /*     */
			
 
				+
			
 
				     @Transactional(rollbackFor = {Exception.class})
			
 
				-    /*     */
			
 
				+
			
 
				     @ResponseBody
			
 
				-    /*     */ public Result getUserById(Integer id) {
			
 
				-        /* 253 */
			
 
				+    public Result getUserById(Integer id) {
			
 
				         UserInfo user = this.mapper.selectById(id);
			
 
				-        /* 254 */
			
 
				         System.out.println(user);
			
 
				-        /* 255 */
			
 
				         return new Result(true, user);
			
 
				-        /*     */
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				+
			
 
				     @RequestMapping(value = {"/userInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView userInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 262 */
			
 
				+    public ModelAndView userInfo(HttpServletRequest request) {
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 263 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				+
			
 
				         }
			
 
				-        /* 265 */
			
 
				         return new ModelAndView("jsp/newAdmin/userInfo.jsp");
			
 
				-        /*     */
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    /* 272 */
			
 
				     @RequestMapping({"/updateUser"})
			
 
				-    /*     */
			
 
				+
			
 
				     @Transactional(rollbackFor = {Exception.class})
			
 
				-    /*     */
			
 
				+
			
 
				     @ResponseBody
			
 
				-    /*     */ public Result updateUser(HttpServletRequest req, UserInfo user) {
			
 
				+    public Result updateUser(HttpServletRequest req, UserInfo user) {
			
 
				         if (user != null) {
			
 
				-            /* 273 */
			
 
				             this.mapper.updateAddress(user);
			
 
				-            /*     */
			
 
				+
			
 
				         }
			
 
				-        /* 275 */
			
 
				         user = (UserInfo) req.getSession().getAttribute("userInfo");
			
 
				-        /*     */
			
 
				-        /* 277 */
			
 
				+
			
 
				         user = this.mapper.selectByUserName(user.getUserName());
			
 
				-        /*     */
			
 
				-        /* 279 */
			
 
				         req.getSession().setAttribute("userInfo", user);
			
 
				-        /*     */
			
 
				-        /* 281 */
			
 
				+
			
 
				         return new Result(true, "");
			
 
				     }
			
 
				 
			
 
				-    /* 287 */
			
 
				     @RequestMapping({"/saveUser"})
			
 
				-    /*     */
			
 
				     @Transactional(rollbackFor = {Exception.class})
			
 
				-    /*     */
			
 
				     @ResponseBody
			
 
				-    /*     */ public Result saveUser(HttpServletRequest request, UserInfo user) {
			
 
				+    public Result saveUser(HttpServletRequest request, UserInfo user) {
			
 
				         if (user != null) {
			
 
				-            /* 288 */
			
 
				             this.mapper.insertUserInfo(user);
			
 
				-            /*     */
			
 
				+
			
 
				         }
			
 
				-        /*     */
			
 
				-        /* 291 */
			
 
				+
			
 
				         return new Result(true, "");
			
 
				     }
			
 
				 
			
 
				-    /* 297 */
			
 
				     @RequestMapping({"/delUser"})
			
 
				-    /*     */
			
 
				     @Transactional(rollbackFor = {Exception.class})
			
 
				-    /*     */
			
 
				     @ResponseBody
			
 
				-    /*     */ public Result delUser(HttpServletRequest request, UserInfo user) {
			
 
				+    public Result delUser(HttpServletRequest request, UserInfo user) {
			
 
				         if (user != null) {
			
 
				-            /* 298 */
			
 
				             this.mapper.delete(user.getId());
			
 
				-            /*     */
			
 
				+
			
 
				         }
			
 
				-        /* 300 */
			
 
				         return new Result(true, "");
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				+
			
 
				     @RequestMapping(value = {"/getUserInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */
			
 
				     @Transactional(rollbackFor = {Exception.class})
			
 
				-    /*     */
			
 
				     @ResponseBody
			
 
				-    /*     */ public Result getUser(HttpServletRequest request, Page page, UserInfo record) {
			
 
				+    public Result getUser(HttpServletRequest request, Page page, UserInfo record) {
			
 
				 
			
 
				         Map parameter = new HashMap();
			
 
				         parameter.put("record", record);
			
@@ -432,8 +312,7 @@ import org.apache.http.HttpEntity;
 
				         return new Result(true, result);
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				+
			
 
				     @RequestMapping({"/toUserInfo"})
			
 
				     public ModelAndView toGetUserInfo(HttpServletRequest req) {
			
 
				 
			
@@ -447,921 +326,106 @@ import org.apache.http.HttpEntity;
 
				         return new ModelAndView("jsp/newAdmin/index.jsp");
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/couponInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView couponInfos(HttpServletRequest request) {
			
 
				-        /* 326 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 327 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 329 */
			
 
				-        return new ModelAndView("jsp/newAdmin/couponInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/couponInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView couponInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 336 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 337 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 339 */
			
 
				-        return new ModelAndView("jsp/newAdmin/couponInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/userCoupons"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView userCoupons(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 346 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 347 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 349 */
			
 
				-        return new ModelAndView("jsp/newAdmin/userCoupons.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/userCoupon"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView userCoupon(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 356 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 357 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 359 */
			
 
				-        return new ModelAndView("jsp/newAdmin/userCoupon.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/homeBanners"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView homeBanners(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 366 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 367 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 369 */
			
 
				-        return new ModelAndView("jsp/newAdmin/homeBanners.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/homeBanner"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView homeBanner(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 376 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 377 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 379 */
			
 
				-        return new ModelAndView("jsp/newAdmin/homeBanner.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/homeSelecteds"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView homeSelecteds(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 386 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 387 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 389 */
			
 
				-        return new ModelAndView("jsp/newAdmin/homeSelecteds.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/homeSelected"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView homeSelected(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 396 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 397 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 399 */
			
 
				-        return new ModelAndView("jsp/newAdmin/homeSelected.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/labelInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView labelInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 406 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 407 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 409 */
			
 
				-        return new ModelAndView("jsp/newAdmin/labelInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/labelInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView labelInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 416 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 417 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 419 */
			
 
				-        return new ModelAndView("jsp/newAdmin/labelInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/memberAccounts"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView memberAccounts(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 426 */
			
 
				+    @RequestMapping(value = {"/serviceInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView serviceInfos(HttpServletRequest request) {
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 427 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 429 */
			
 
				-        return new ModelAndView("jsp/newAdmin/memberAccounts.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/memberCoins"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView memberCoins(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 436 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 437 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 439 */
			
 
				-        return new ModelAndView("jsp/newAdmin/memberCoins.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/serviceInfos.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/memberCoinTixians"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView memberCoinTixians(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 446 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 447 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 449 */
			
 
				-        return new ModelAndView("jsp/newAdmin/memberCoinTixians.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/quickComments"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView quickComments(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 456 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 457 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 459 */
			
 
				-        return new ModelAndView("jsp/newAdmin/quickComments.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/quickComment"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView quickComment(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 466 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 467 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 469 */
			
 
				-        return new ModelAndView("jsp/newAdmin/quickComment.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationComments"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationComments(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 476 */
			
 
				+    @RequestMapping(value = {"/serviceInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView serviceInfo(HttpServletRequest request) {
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 477 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 479 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationComments.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationComment"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationComment(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 486 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 487 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 489 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationComment.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/serviceInfo.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianComments"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianComments(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 496 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 497 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 499 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianComments.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianComment"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianComment(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 506 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 507 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 509 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianComment.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/storeComments"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView storeComments(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 516 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 517 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 519 */
			
 
				-        return new ModelAndView("jsp/newAdmin/storeComments.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+    @RequestMapping(value = {"/rentInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView rentInfos(HttpServletRequest request) {
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/storeComment"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView storeComment(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 526 */
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 527 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 529 */
			
 
				-        return new ModelAndView("jsp/newAdmin/storeComment.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/serviceInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView serviceInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 536 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 537 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 539 */
			
 
				-        return new ModelAndView("jsp/newAdmin/serviceInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/serviceInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView serviceInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 546 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 547 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 549 */
			
 
				-        return new ModelAndView("jsp/newAdmin/serviceInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/serviceTypes"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView serviceTypes(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 556 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 557 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 559 */
			
 
				-        return new ModelAndView("jsp/newAdmin/serviceTypes.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/rentInfos.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/serviceType"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView serviceType(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 566 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 567 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 569 */
			
 
				-        return new ModelAndView("jsp/newAdmin/serviceType.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationTypes"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationTypes(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 576 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 577 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 579 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationTypes.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+    @RequestMapping(value = {"/rentInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView rentInfo(HttpServletRequest request, Integer type) {
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationType"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationType(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 586 */
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 587 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 589 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationType.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 596 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 597 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 599 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 606 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 607 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 609 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 616 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 617 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 619 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianInfos.jsp");
			
 
				-        /*     */
			
 
				+        return new ModelAndView("jsp/newAdmin/rentInfo.jsp");
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 626 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 627 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 629 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/userOrders"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView userOrders(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 636 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 637 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 639 */
			
 
				-        return new ModelAndView("jsp/newAdmin/userOrders.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+    @RequestMapping(value = {"/saleinfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView saleinfos(HttpServletRequest request) {
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/userOrder"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView userOrder(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 646 */
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 647 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 649 */
			
 
				-        return new ModelAndView("jsp/newAdmin/userOrder.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/timeIntervals"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView timeIntervals(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 656 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 657 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 659 */
			
 
				-        return new ModelAndView("jsp/newAdmin/timeIntervals.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/timeInterval"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView timeInterval(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 666 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 667 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 669 */
			
 
				-        return new ModelAndView("jsp/newAdmin/timeInterval.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianArrangements"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianArrangements(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 676 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 677 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 679 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianArrangements.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/saleinfos.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianArrangement"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianArrangement(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 686 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 687 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 689 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianArrangement.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationArrangements"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationArrangements(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 696 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 697 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 699 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationArrangements.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationArrangement"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationArrangement(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 706 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 707 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 709 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationArrangement.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+    @RequestMapping(value = {"/saleinfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView saleinfo(HttpServletRequest request) {
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/storeInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView storeInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 716 */
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 717 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 719 */
			
 
				-        return new ModelAndView("jsp/newAdmin/storeInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/storeInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView storeInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 726 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 727 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 729 */
			
 
				-        return new ModelAndView("jsp/newAdmin/storeInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/repairerInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView repairerInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 736 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 737 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 739 */
			
 
				-        return new ModelAndView("jsp/newAdmin/repairerInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/repairerInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView repairerInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 746 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 747 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 749 */
			
 
				-        return new ModelAndView("jsp/newAdmin/repairerInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/saleinfo.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/franchiseeInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView franchiseeInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 756 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 757 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 759 */
			
 
				-        return new ModelAndView("jsp/newAdmin/franchiseeInfos.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/franchiseeInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView franchiseeInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 766 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 767 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 769 */
			
 
				-        return new ModelAndView("jsp/newAdmin/franchiseeInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+    @RequestMapping(value = {"/payTypeInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView payTypeInfos(HttpServletRequest request) {
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianOrders"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianOrders(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 776 */
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 777 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 779 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianOrders.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/technicianOrder"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView technicianOrder(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 786 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 787 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 789 */
			
 
				-        return new ModelAndView("jsp/newAdmin/technicianOrder.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/repairerOrders"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView repairerOrders(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 796 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 797 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 799 */
			
 
				-        return new ModelAndView("jsp/newAdmin/repairerOrders.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/repairerOrder"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView repairerOrder(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 806 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 807 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 809 */
			
 
				-        return new ModelAndView("jsp/newAdmin/repairerOrder.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/payTypeInfos.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/authenticationInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView authenticationInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 815 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 816 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 818 */
			
 
				-        return new ModelAndView("jsp/newAdmin/authenticationInfos.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/carInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView carInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 825 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 826 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 828 */
			
 
				-        return new ModelAndView("jsp/newAdmin/carInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+    @RequestMapping(value = {"/payTypeInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				+    public ModelAndView payTypeInfo(HttpServletRequest request) {
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/carInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView carInfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 834 */
			
 
				         if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 835 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 837 */
			
 
				-        return new ModelAndView("jsp/newAdmin/carInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/stationOrders"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView stationOrders(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 843 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 844 */
			
 
				             return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 846 */
			
 
				-        return new ModelAndView("jsp/newAdmin/stationOrders.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/rentInfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView rentInfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 853 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 854 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				         }
			
 
				-        /* 856 */
			
 
				-        return new ModelAndView("jsp/newAdmin/rentInfos.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/rentInfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView rentInfo(HttpServletRequest request, Integer type)
			
 
				-    /*     */ {
			
 
				-        /* 863 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 864 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /*     */
			
 
				-        /* 868 */
			
 
				-        return new ModelAndView("jsp/newAdmin/rentInfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				+        return new ModelAndView("jsp/newAdmin/payTypeInfo.jsp");
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/saleinfos"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView saleinfos(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 878 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 879 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 881 */
			
 
				-        return new ModelAndView("jsp/newAdmin/saleinfos.jsp");
			
 
				-        /*     */
			
 
				     }
			
 
				 
			
 
				-    /*     */
			
 
				-    /*     */
			
 
				-    @RequestMapping(value = {"/saleinfo"}, method = {org.springframework.web.bind.annotation.RequestMethod.GET})
			
 
				-    /*     */ public ModelAndView saleinfo(HttpServletRequest request)
			
 
				-    /*     */ {
			
 
				-        /* 888 */
			
 
				-        if (request.getSession().getAttribute("superUserId") == null) {
			
 
				-            /* 889 */
			
 
				-            return new ModelAndView("redirect:login");
			
 
				-            /*     */
			
 
				-        }
			
 
				-        /* 891 */
			
 
				-        return new ModelAndView("jsp/newAdmin/saleinfo.jsp");
			
 
				-        /*     */
			
 
				-    }
			
 
				-    /*     */
			
 
				 }
			
 
				-
			
 
				-/* Location:           C:\Users\Administrator\Desktop\新建文件夹\WEB-INF\classes\
			
 
				- * Qualified Name:     com.suyuan.web.admin.AdminController
			
 
				- * JD-Core Version:    0.6.2
			
 
				- */
			
--- a/src/zouma/frame/gen/GenEntity.java
+++ b/src/zouma/frame/gen/GenEntity.java
@@ -1,1259 +1,1476 @@
 
				-/*      */ package zouma.frame.gen;
			
 
				-/*      */ 
			
 
				-/*      */ import java.io.File;
			
 
				-/*      */ import java.io.FileWriter;
			
 
				-/*      */ import java.io.IOException;
			
 
				-/*      */ import java.io.PrintStream;
			
 
				-/*      */ import java.io.PrintWriter;
			
 
				-/*      */ import java.sql.Connection;
			
 
				-/*      */ import java.sql.DatabaseMetaData;
			
 
				-/*      */ import java.sql.DriverManager;
			
 
				-/*      */ import java.sql.PreparedStatement;
			
 
				-/*      */ import java.sql.ResultSet;
			
 
				-/*      */ import java.sql.ResultSetMetaData;
			
 
				-/*      */ import java.sql.SQLException;
			
 
				-/*      */ import java.util.Date;
			
 
				-/*      */ import zouma.frame.util.StringUtil;
			
 
				-/*      */ 
			
 
				-/*      */ public class GenEntity
			
 
				-/*      */ {
			
 
				-/*   15 */   private static boolean f_util = false;
			
 
				-/*   16 */   private static boolean f_sql = false;
			
 
				-/*   17 */   private static boolean f_math = false;
			
 
				-/*      */ 
			
 
				-/*      */   public static void GenAll(TableParams tableParams)
			
 
				-/*      */   {
			
 
				-/*   26 */     String PK_NAME = "id";
			
 
				-/*   27 */     Connection con = null;
			
 
				-/*      */ 
			
 
				-/*   30 */     String sql = "select * from " + tableParams.getTabelName();
			
 
				-/*   31 */     PreparedStatement pStemt = null;
			
 
				-/*      */     try {
			
 
				-/*      */       try {
			
 
				-/*   34 */         Class.forName("com.mysql.jdbc.Driver");
			
 
				-/*      */       }
			
 
				-/*      */       catch (ClassNotFoundException e1) {
			
 
				-/*   37 */         e1.printStackTrace();
			
 
				-/*      */       }
			
 
				-/*   39 */       con = DriverManager.getConnection("jdbc:mysql://rm-bp14x23t9lalb9ftio.mysql.rds.aliyuncs.com/house_source", "huabangyun", "NJhby2017");
			
 
				-/*   40 */       pStemt = con.prepareStatement(sql);
			
 
				-/*   41 */       ResultSetMetaData rsmd = pStemt.getMetaData();
			
 
				-/*      */ 
			
 
				-/*   43 */       ResultSet pkRSet = con.getMetaData().getPrimaryKeys(con.getCatalog().toUpperCase(), 
			
 
				-/*   44 */         null, tableParams.getTabelName());
			
 
				-/*      */ 
			
 
				-/*   46 */       while (pkRSet.next()) {
			
 
				-/*   47 */         System.out.println(pkRSet.getString("COLUMN_NAME"));
			
 
				-/*   48 */         PK_NAME = pkRSet.getString("COLUMN_NAME");
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*   51 */       int size = rsmd.getColumnCount();
			
 
				-/*   52 */       String[] colnames = new String[size];
			
 
				-/*   53 */       String[] colTypes = new String[size];
			
 
				-/*   54 */       int[] colSizes = new int[size];
			
 
				-/*   55 */       for (int i = 0; i < size; i++) {
			
 
				-/*   56 */         colnames[i] = rsmd.getColumnName(i + 1);
			
 
				-/*   57 */         colTypes[i] = rsmd.getColumnTypeName(i + 1);
			
 
				-/*      */ 
			
 
				-/*   59 */         if ((colTypes[i].equalsIgnoreCase("datetime")) || (colTypes[i].equalsIgnoreCase("timestamp"))) {
			
 
				-/*   60 */           f_util = true;
			
 
				-/*      */         }
			
 
				-/*   62 */         if ((colTypes[i].equalsIgnoreCase("image")) || (colTypes[i].equalsIgnoreCase("text"))) {
			
 
				-/*   63 */           f_sql = true;
			
 
				-/*      */         }
			
 
				-/*   65 */         if ((colTypes[i].equalsIgnoreCase("decimal")) || (colTypes[i].equalsIgnoreCase("numeric")) || 
			
 
				-/*   66 */           (colTypes[i].equalsIgnoreCase("real")) || (colTypes[i].equalsIgnoreCase("money")) || 
			
 
				-/*   67 */           (colTypes[i].equalsIgnoreCase("smallmoney"))) {
			
 
				-/*   68 */           f_math = true;
			
 
				-/*      */         }
			
 
				-/*   70 */         colSizes[i] = rsmd.getColumnDisplaySize(i + 1);
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*   74 */       if (tableParams.isModelFlag())
			
 
				-/*      */       {
			
 
				-/*   76 */         createModelFile(tableParams, colnames, colTypes);
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*   80 */       if (tableParams.isDaoFlag())
			
 
				-/*      */       {
			
 
				-/*   82 */         createDaoClassFile(tableParams);
			
 
				-/*   83 */         createDaoXmlFile(tableParams, colnames, colTypes, PK_NAME);
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*   87 */       if (tableParams.isServiceFlag())
			
 
				-/*      */       {
			
 
				-/*   89 */         createServiceFile(tableParams, PK_NAME);
			
 
				-/*   90 */         createServiceImplFile(tableParams, PK_NAME);
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*   94 */       if (tableParams.isControllerFlag())
			
 
				-/*      */       {
			
 
				-/*   96 */         createControllerFile(tableParams, PK_NAME);
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*  101 */       if (tableParams.isJspFlag()) {
			
 
				-/*  102 */         createJspByPageFile(tableParams, PK_NAME, colnames);
			
 
				-/*  103 */         createJspEditFile(tableParams, PK_NAME, colnames);
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*  107 */       pStemt.close();
			
 
				-/*  108 */       pkRSet.close();
			
 
				-/*  109 */       con.close();
			
 
				-/*      */     }
			
 
				-/*      */     catch (SQLException e) {
			
 
				-/*  112 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createJspEditFile(TableParams tableParams, String pk_name, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  120 */     String jspEditContent = parseJspEdit(tableParams.getTabelName(), pk_name, colnames);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/*  123 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/*  125 */       String fileName = directory.getAbsolutePath() + "/" + changeToFolder(tableParams.getJspTargetPackage()) + StringUtil.underlineToCamel(tableParams.getTabelName()) + ".jsp";
			
 
				-/*  126 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/*  127 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/*  128 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/*  129 */       pw.println(jspEditContent);
			
 
				-/*  130 */       pw.flush();
			
 
				-/*  131 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/*  133 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseJspEdit(String tabelName, String pkName, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  139 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/*  142 */     String upTableName = StringUtil.initcap(tabelName);
			
 
				-/*  143 */     String downTableName = StringUtil.underlineToCamel(tabelName);
			
 
				-/*      */ 
			
 
				-/*  146 */     sb.append("<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %>\r\n");
			
 
				-/*  147 */     sb.append("<html>\r\n");
			
 
				-/*      */ 
			
 
				-/*  149 */     sb.append("<head>\r\n");
			
 
				-/*  150 */     sb.append("\t<jsp:include page=\"head.jsp\"/>\r\n");
			
 
				-/*      */ 
			
 
				-/*  153 */     sb.append("\t<title>zouma.frame</title>\r\n");
			
 
				-/*      */ 
			
 
				-/*  155 */     sb.append("</head>\r\n");
			
 
				-/*      */ 
			
 
				-/*  157 */     sb.append("<body>\r\n");
			
 
				-/*      */ 
			
 
				-/*  159 */     sb.append("<jsp:include page=\"contentBefore.jsp\"/>\r\n");
			
 
				-/*  160 */     sb.append("<template>\r\n");
			
 
				-/*      */ 
			
 
				-/*  162 */     sb.append("\t<el-form ref=\"form\" :model=\"row_info\" label-width=\"80px\">\r\n");
			
 
				-/*      */ 
			
 
				-/*  165 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  167 */       if (!pkName.equalsIgnoreCase(colnames[i]))
			
 
				-/*      */       {
			
 
				-/*  169 */         sb.append("\t\t<el-form-item label=\"" + StringUtil.underlineToCamel(colnames[i]) + "\">\r\n");
			
 
				-/*  170 */         sb.append("\t\t\t<el-input v-model=\"row_info." + StringUtil.underlineToCamel(colnames[i]) + "\"></el-input>\r\n");
			
 
				-/*  171 */         sb.append("\t\t</el-form-item>\r\n");
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  177 */     sb.append("\t\t<el-form-item>\r\n");
			
 
				-/*  178 */     sb.append("\t\t\t<el-button type=\"primary\" @click=\"onSubmit\">{{edit?'淇濆瓨':'绔嬪嵆鍒涘缓'}}</el-button>\r\n");
			
 
				-/*  179 */     sb.append("\t\t\t<el-button>鍙栨秷</el-button>\r\n");
			
 
				-/*  180 */     sb.append("\t</el-form-item>\r\n");
			
 
				-/*  181 */     sb.append("\t</el-form>\r\n");
			
 
				-/*  182 */     sb.append("</template>\r\n");
			
 
				-/*      */ 
			
 
				-/*  185 */     sb.append("<jsp:include page=\"contentAfter.jsp\"/>\r\n");
			
 
				-/*  186 */     sb.append("</body>\r\n");
			
 
				-/*      */ 
			
 
				-/*  189 */     sb.append("<script>\r\n");
			
 
				-/*      */ 
			
 
				-/*  191 */     sb.append("\tfunction getQueryString(name) {\r\n");
			
 
				-/*  192 */     sb.append("\t\tvar reg = new RegExp(\"(^|&)\" + name + \"=([^&]*)(&|$)\", \"i\");\r\n");
			
 
				-/*  193 */     sb.append("\t\tvar r = window.location.search.substr(1).match(reg);\r\n");
			
 
				-/*  194 */     sb.append("\t\tif (r != null) return unescape(r[2]);\r\n");
			
 
				-/*  195 */     sb.append("\t\treturn null;\r\n");
			
 
				-/*  196 */     sb.append("\t}\r\n");
			
 
				-/*      */ 
			
 
				-/*  198 */     sb.append("\tnew Vue({\r\n");
			
 
				-/*  199 */     sb.append("\t\tel: '#app',\r\n");
			
 
				-/*  200 */     sb.append("\t\tcreated: function () {\r\n");
			
 
				-/*  201 */     sb.append("\t\t\tvar " + StringUtil.underlineToCamel(pkName) + " = getQueryString('" + StringUtil.underlineToCamel(pkName) + "');\r\n");
			
 
				-/*  202 */     sb.append("\t\t\tif (" + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				-/*  203 */     sb.append("\t\t\t\t$.get({\r\n");
			
 
				-/*  204 */     sb.append("\t\t\t\t\turl: '../" + downTableName + "/get" + upTableName + "',\r\n");
			
 
				-/*  205 */     sb.append("\t\t\t\t\tdata: {\r\n");
			
 
				-/*  206 */     sb.append("\t\t\t\t\t\t" + StringUtil.underlineToCamel(pkName) + ": " + StringUtil.underlineToCamel(pkName) + "\r\n");
			
 
				-/*  207 */     sb.append("\t\t\t\t\t}\r\n");
			
 
				-/*  208 */     sb.append("\t\t\t\t}).then(function (res) {\r\n");
			
 
				-/*  209 */     sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				-/*  210 */     sb.append("\t\t\t\t\t\tthis.edit = true;\r\n");
			
 
				-/*  211 */     sb.append("\t\t\t\t\t\tthis.row_info = res.data;\r\n");
			
 
				-/*  212 */     sb.append("\t\t\t\t\t}\r\n");
			
 
				-/*  213 */     sb.append("\t\t\t\t}.bind(this));\r\n");
			
 
				-/*  214 */     sb.append("\t\t\t}\r\n");
			
 
				-/*  215 */     sb.append("\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  217 */     sb.append("\t\tdata: function () {\r\n");
			
 
				-/*  218 */     sb.append("\t\t\treturn {\r\n");
			
 
				-/*  219 */     sb.append("\t\t\t\tmenu: '0-0',\r\n");
			
 
				-/*  220 */     sb.append("\t\t\t\tuser: {\r\n");
			
 
				-/*  221 */     sb.append("\t\t\t\t\tid: '',\n\r\n");
			
 
				-/*  222 */     sb.append("\t\t\t\t\tusername: 'admin',\r\n");
			
 
				-/*  223 */     sb.append("\t\t\t\t\tavatar: ''\r\n");
			
 
				-/*  224 */     sb.append("\t\t\t\t},\r\n");
			
 
				-/*  225 */     sb.append("\t\t\t\tloading: false,\r\n");
			
 
				-/*  226 */     sb.append("\t\t\t\tedit: false,\r\n");
			
 
				-/*  227 */     sb.append("\t\t\t\ttab: 1,\r\n");
			
 
				-/*  228 */     sb.append("\t\t\t\trow_info : {},\r\n");
			
 
				-/*  229 */     sb.append("\t\t\t};\r\n");
			
 
				-/*  230 */     sb.append("\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  233 */     sb.append("\t\tmethods: {\r\n");
			
 
				-/*  234 */     sb.append("\t\t\tlogout: function () {\r\n");
			
 
				-/*  235 */     sb.append("\t\t\t\tthis.$confirm('纭畾瑕佹敞閿�鍚�?', '鎻愮ず', {\r\n");
			
 
				-/*  236 */     sb.append("\t\t\t\t\tconfirmButtonText: '纭畾',\r\n");
			
 
				-/*  237 */     sb.append("\t\t\t\t\tcancelButtonText: '鍙栨秷',\r\n");
			
 
				-/*  238 */     sb.append("\t\t\t\t\ttype: 'info'\r\n");
			
 
				-/*  239 */     sb.append("\t\t\t\t}).then(function () {\r\n");
			
 
				-/*  240 */     sb.append("\t\t\t\t\tlocalStorage.removeItem('user');\r\n");
			
 
				-/*  241 */     sb.append("\t\t\t\t\tthis.$router.push({path: '/login'});\r\n");
			
 
				-/*  242 */     sb.append("\t\t\t\t}.bind(this)).catch(function (e) {\r\n");
			
 
				-/*  243 */     sb.append("\r\n");
			
 
				-/*  244 */     sb.append("\t\t\t\t});\r\n");
			
 
				-/*  245 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  247 */     sb.append("\t\t\tonSubmit: function () {\r\n");
			
 
				-/*  248 */     sb.append("\t\t\t\tvar data = JSON.parse(JSON.stringify(this.row_info));\r\n");
			
 
				-/*  249 */     sb.append("\t\t\t\t$.post({\r\n");
			
 
				-/*  250 */     sb.append("\t\t\t\t\turl: this.edit ? '../" + downTableName + "/update' : '../" + downTableName + "/save',\r\n");
			
 
				-/*  251 */     sb.append("\t\t\t\t\tdata: data\r\n");
			
 
				-/*  252 */     sb.append("\t\t\t\t}).then(function (res) {\r\n");
			
 
				-/*  253 */     sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				-/*  254 */     sb.append("\t\t\t\t\t\tif (!this.edit) {\r\n");
			
 
				-/*  255 */     sb.append("\t\t\t\t\t\t\tthis.row_info." + StringUtil.underlineToCamel(pkName) + " = res.data;\r\n");
			
 
				-/*  256 */     sb.append("\t\t\t\t\t\t}\r\n");
			
 
				-/*  257 */     sb.append("\t\t\t\t\t\tthis.edit = true;\r\n");
			
 
				-/*  258 */     sb.append("\t\t\t\t\t\tthis.$message.success(this.edit ? '淇濆瓨鎴愬姛' : '鍒涘缓鎴愬姛');\r\n");
			
 
				-/*  259 */     sb.append("\t\t\t\t\t} else {\r\n");
			
 
				-/*  260 */     sb.append("\t\t\t\t\t\tthis.$message.error(this.edit ? '淇濆瓨澶辫触' : '鍒涘缓澶辫触');\r\n");
			
 
				-/*  261 */     sb.append("\t\t\t\t\t}\r\n");
			
 
				-/*  262 */     sb.append("\t\t\t\t}.bind(this))\r\n");
			
 
				-/*  263 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  265 */     sb.append("\t\t}\r\n");
			
 
				-/*  266 */     sb.append("\t})\r\n");
			
 
				-/*  267 */     sb.append("</script>\r\n");
			
 
				-/*  268 */     sb.append("</html>\r\n");
			
 
				-/*      */ 
			
 
				-/*  271 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createJspByPageFile(TableParams tableParams, String pkName, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  278 */     String jspByPageContent = parseJspByPage(tableParams.getTabelName(), pkName, colnames);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/*  281 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/*  283 */       String fileName = directory.getAbsolutePath() + "/" + changeToFolder(tableParams.getJspTargetPackage()) + StringUtil.underlineToCamel(tableParams.getTabelName()) + "s.jsp";
			
 
				-/*  284 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/*  285 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/*  286 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/*  287 */       pw.println(jspByPageContent);
			
 
				-/*  288 */       pw.flush();
			
 
				-/*  289 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/*  291 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseJspByPage(String tabelName, String pkName, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  297 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/*  300 */     String downTableName = StringUtil.underlineToCamel(tabelName);
			
 
				-/*      */ 
			
 
				-/*  303 */     sb.append("<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %>\r\n");
			
 
				-/*  304 */     sb.append("<html>\r\n");
			
 
				-/*      */ 
			
 
				-/*  306 */     sb.append("<head>\r\n");
			
 
				-/*  307 */     sb.append("\t<jsp:include page=\"head.jsp\"/>\r\n");
			
 
				-/*      */ 
			
 
				-/*  310 */     sb.append("\t<title>zouma.frame</title>\r\n");
			
 
				-/*      */ 
			
 
				-/*  312 */     sb.append("</head>\r\n");
			
 
				-/*      */ 
			
 
				-/*  314 */     sb.append("<body>\r\n");
			
 
				-/*      */ 
			
 
				-/*  316 */     sb.append("<jsp:include page=\"contentBefore.jsp\"/>\r\n");
			
 
				-/*  317 */     sb.append("<template>\r\n");
			
 
				-/*      */ 
			
 
				-/*  319 */     sb.append("\t<div class=\"filters\">\r\n");
			
 
				-/*  320 */     sb.append("\t\t<el-button type=\"primary\" @click=\"create()\">鍒涘缓</el-button>\r\n");
			
 
				-/*  321 */     sb.append("\t\t<div class=\"num\"> 鍏眥{totalNumber}}鏍囩</div>\r\n");
			
 
				-/*  322 */     sb.append("\t</div>\r\n");
			
 
				-/*  323 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  325 */     sb.append("\t<el-table :data=\"rows\"\r\n");
			
 
				-/*  326 */     sb.append("\t\t\tref=\"table\"\r\n");
			
 
				-/*  327 */     sb.append("\t\t\tstyle=\"width: 100%\"\r\n");
			
 
				-/*  328 */     sb.append("\t\t\telement-loading-text=\"鎷煎懡鍔犺浇涓璡\"\r\n");
			
 
				-/*  329 */     sb.append("\t\t\tstripe\r\n");
			
 
				-/*  330 */     sb.append("\t\t\tv-loading=\"loading\">\r\n");
			
 
				-/*      */ 
			
 
				-/*  332 */     sb.append("\t\t\t<el-table-column\r\n");
			
 
				-/*  333 */     sb.append("\t\t\t\ttype=\"index\"\r\n");
			
 
				-/*  334 */     sb.append("\t\t\t\twidth=\"70\"\r\n");
			
 
				-/*  335 */     sb.append("\t\t\t\talign=\"center\">\r\n");
			
 
				-/*  336 */     sb.append("\t\t\t</el-table-column>\r\n");
			
 
				-/*      */ 
			
 
				-/*  338 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  340 */       if (!pkName.equalsIgnoreCase(colnames[i]))
			
 
				-/*      */       {
			
 
				-/*  342 */         sb.append("\t\t<el-table-column\r\n");
			
 
				-/*  343 */         sb.append("\t\t\t\tprop=\"" + StringUtil.underlineToCamel(colnames[i]) + "\"\r\n");
			
 
				-/*  344 */         sb.append("\t\t\t\tlabel=\"" + StringUtil.underlineToCamel(colnames[i]) + "\"\r\n");
			
 
				-/*  345 */         sb.append("\t\t\t\talign=\"center\">\r\n");
			
 
				-/*  346 */         sb.append("\t\t</el-table-column>\r\n");
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  352 */     sb.append("\t\t<el-table-column\r\n");
			
 
				-/*  353 */     sb.append("\t\t\t\t:context=\"_self\"\r\n");
			
 
				-/*  354 */     sb.append("\t\t\t\twidth=\"150\"\r\n");
			
 
				-/*  355 */     sb.append("\t\t\t\tinline-template\r\n");
			
 
				-/*  356 */     sb.append("\t\t\t\tlabel=\"鎿嶄綔\"\r\n");
			
 
				-/*  357 */     sb.append("\t\t\t\talign=\"center\">\r\n");
			
 
				-/*  358 */     sb.append("\t\t\t<div>\r\n");
			
 
				-/*  359 */     sb.append("\t\t\t\t<el-button size=\"small\" @click=\"editRow(row)\">缂栬緫</el-button>\r\n");
			
 
				-/*  360 */     sb.append("\t\t\t\t<el-button size=\"small\" type=\"danger\" @click=\"deleteRow(row)\">鍒犻櫎</el-button>\r\n");
			
 
				-/*  361 */     sb.append("\t\t\t</div>\r\n");
			
 
				-/*  362 */     sb.append("\t\t</el-table-column>\r\n");
			
 
				-/*      */ 
			
 
				-/*  364 */     sb.append("\t</el-table>\r\n");
			
 
				-/*      */ 
			
 
				-/*  366 */     sb.append("\t<div class=\"pagination-wrapper\" v-show=\"!loading\">\r\n");
			
 
				-/*  367 */     sb.append("\t\t<el-pagination layout=\"sizes, prev, pager, next\" :page-size=\"pageSize\" :total=\"totalNumber\"\r\n");
			
 
				-/*  368 */     sb.append("\t\t\t\t\t:page-size=\"pageSize\"\r\n");
			
 
				-/*  369 */     sb.append("\t\t\t\t\t:current-page=\"currentPage\" @current-change=\"pageChange\" @size-change=\"sizeChange\">\r\n");
			
 
				-/*  370 */     sb.append("\t\t</el-pagination>\r\n");
			
 
				-/*  371 */     sb.append("\t</div>\r\n");
			
 
				-/*      */ 
			
 
				-/*  373 */     sb.append("</template>\r\n");
			
 
				-/*      */ 
			
 
				-/*  376 */     sb.append("<jsp:include page=\"contentAfter.jsp\"/>\r\n");
			
 
				-/*  377 */     sb.append("</body>\r\n");
			
 
				-/*      */ 
			
 
				-/*  380 */     sb.append("<script>\r\n");
			
 
				-/*      */ 
			
 
				-/*  382 */     sb.append("\tfunction getQueryString(name) {\r\n");
			
 
				-/*  383 */     sb.append("\t\tvar reg = new RegExp(\"(^|&)\" + name + \"=([^&]*)(&|$)\", \"i\");\r\n");
			
 
				-/*  384 */     sb.append("\t\tvar r = window.location.search.substr(1).match(reg);\r\n");
			
 
				-/*  385 */     sb.append("\t\tif (r != null) return unescape(r[2]);\r\n");
			
 
				-/*  386 */     sb.append("\t\treturn null;\r\n");
			
 
				-/*  387 */     sb.append("\t}\r\n");
			
 
				-/*      */ 
			
 
				-/*  389 */     sb.append("\tnew Vue({\r\n");
			
 
				-/*  390 */     sb.append("\t\tel: '#app',\r\n");
			
 
				-/*  391 */     sb.append("\t\tcreated: function () {\r\n");
			
 
				-/*  392 */     sb.append("\t\t\tthis.getRows();\r\n");
			
 
				-/*  393 */     sb.append("\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  395 */     sb.append("\t\tdata: function () {\r\n");
			
 
				-/*  396 */     sb.append("\t\t\treturn {\r\n");
			
 
				-/*  397 */     sb.append("\t\t\t\tmenu: '0-0',\r\n");
			
 
				-/*  398 */     sb.append("\t\t\t\tuser: {\r\n");
			
 
				-/*  399 */     sb.append("\t\t\t\t\tid: '',\n\r\n");
			
 
				-/*  400 */     sb.append("\t\t\t\t\tusername: 'admin',\r\n");
			
 
				-/*  401 */     sb.append("\t\t\t\t\tavatar: ''\r\n");
			
 
				-/*  402 */     sb.append("\t\t\t\t},\r\n");
			
 
				-/*  403 */     sb.append("\t\t\t\tloading: false,\r\n");
			
 
				-/*  404 */     sb.append("\t\t\t\ttotalNumber: 0,\r\n");
			
 
				-/*  405 */     sb.append("\t\t\t\ttotalPage: 10,\r\n");
			
 
				-/*  406 */     sb.append("\t\t\t\tcurrentPage: 1,\r\n");
			
 
				-/*  407 */     sb.append("\t\t\t\tpageSize: 20,\r\n");
			
 
				-/*  408 */     sb.append("\t\t\t\trows: []\r\n");
			
 
				-/*  409 */     sb.append("\t\t\t};\r\n");
			
 
				-/*  410 */     sb.append("\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  413 */     sb.append("\t\tmethods: {\r\n");
			
 
				-/*  414 */     sb.append("\t\t\tlogout: function () {\r\n");
			
 
				-/*  415 */     sb.append("\t\t\t\tthis.$confirm('纭畾瑕佹敞閿�鍚�?', '鎻愮ず', {\r\n");
			
 
				-/*  416 */     sb.append("\t\t\t\t\tconfirmButtonText: '纭畾',\r\n");
			
 
				-/*  417 */     sb.append("\t\t\t\t\tcancelButtonText: '鍙栨秷',\r\n");
			
 
				-/*  418 */     sb.append("\t\t\t\t\ttype: 'info'\r\n");
			
 
				-/*  419 */     sb.append("\t\t\t\t}).then(function () {\r\n");
			
 
				-/*  420 */     sb.append("\t\t\t\t\tlocalStorage.removeItem('user');\r\n");
			
 
				-/*  421 */     sb.append("\t\t\t\t\tthis.$router.push({path: '/login'});\r\n");
			
 
				-/*  422 */     sb.append("\t\t\t\t}.bind(this)).catch(function (e) {\r\n");
			
 
				-/*  423 */     sb.append("\r\n");
			
 
				-/*  424 */     sb.append("\t\t\t\t});\r\n");
			
 
				-/*  425 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  427 */     sb.append("\t\t\tgetRows: function () {\r\n");
			
 
				-/*  428 */     sb.append("\t\t\t\t$.get({\r\n");
			
 
				-/*  429 */     sb.append("\t\t\t\t\turl: '../" + downTableName + "/page',\r\n");
			
 
				-/*  430 */     sb.append("\t\t\t\t\tdata: {\r\n");
			
 
				-/*  431 */     sb.append("\t\t\t\t\t\tcurrentPage: this.currentPage,\r\n");
			
 
				-/*  432 */     sb.append("\t\t\t\t\t\tpageNumber: this.pageSize\r\n");
			
 
				-/*  433 */     sb.append("\t\t\t\t\t}\r\n");
			
 
				-/*  434 */     sb.append("\t\t\t\t}).then(function (res) {\r\n");
			
 
				-/*  435 */     sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				-/*  436 */     sb.append("\t\t\t\t\t\tthis.totalNumber = res.data.page.totalNumber;\r\n");
			
 
				-/*  437 */     sb.append("\t\t\t\t\t\tthis.rows = res.data.pp;\r\n");
			
 
				-/*  438 */     sb.append("\t\t\t\t\t}\r\n");
			
 
				-/*  439 */     sb.append("\t\t\t\t}.bind(this))\r\n");
			
 
				-/*  440 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  443 */     sb.append("\t\t\tpageChange: function (page) {\r\n");
			
 
				-/*  444 */     sb.append("\t\t\t\tthis.currentPage = page;\r\n");
			
 
				-/*  445 */     sb.append("\t\t\t\tthis.getRows();\r\n");
			
 
				-/*  446 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  448 */     sb.append("\t\t\tsizeChange: function (size) {\r\n");
			
 
				-/*  449 */     sb.append("\t\t\t\tthis.pageSize = size;\r\n");
			
 
				-/*  450 */     sb.append("\t\t\t\tthis.getRows();\r\n");
			
 
				-/*  451 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  453 */     sb.append("\t\t\teditRow: function (row) {\r\n");
			
 
				-/*  454 */     sb.append("\t\t\t\twindow.location = '" + downTableName + "?" + StringUtil.underlineToCamel(pkName) + "=' + row." + StringUtil.underlineToCamel(pkName) + ";\r\n");
			
 
				-/*  455 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  458 */     sb.append("\t\t\tdeleteRow: function (row) {\r\n");
			
 
				-/*  459 */     sb.append("\t\t\t\tthis.$confirm('纭畾瑕佸垹闄ゅ悧?', '鎻愮ず', {\r\n");
			
 
				-/*  460 */     sb.append("\t\t\t\t\tconfirmButtonText: '鍒犻櫎',\r\n");
			
 
				-/*  461 */     sb.append("\t\t\t\t\tcancelButtonText: '鍙栨秷',\r\n");
			
 
				-/*  462 */     sb.append("\t\t\t\t\ttype: 'warning'\r\n");
			
 
				-/*  463 */     sb.append("\t\t\t\t}).then(function () {\r\n");
			
 
				-/*  464 */     sb.append("\t\t\t\t\treturn $.post({\r\n");
			
 
				-/*  465 */     sb.append("\t\t\t\t\t\turl: '../" + downTableName + "/del',\r\n");
			
 
				-/*  466 */     sb.append("\t\t\t\t\t\tdata: {\r\n");
			
 
				-/*  467 */     sb.append("\t\t\t\t\t\t\t" + StringUtil.underlineToCamel(pkName) + ": row." + StringUtil.underlineToCamel(pkName) + "\r\n");
			
 
				-/*  468 */     sb.append("\t\t\t\t\t\t}\r\n");
			
 
				-/*  469 */     sb.append("\t\t\t\t\t})\r\n");
			
 
				-/*  470 */     sb.append("\t\t\t\t}.bind(this)).then(function (res) {\r\n");
			
 
				-/*  471 */     sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				-/*  472 */     sb.append("\t\t\t\t\t\tthis.$message.success('鍒犻櫎鎴愬姛');\r\n");
			
 
				-/*  473 */     sb.append("\t\t\t\t\t\tthis.getRows();\r\n");
			
 
				-/*  474 */     sb.append("\t\t\t\t\t} else {\r\n");
			
 
				-/*  475 */     sb.append("\t\t\t\t\t\tthis.$message.error('鍒犻櫎澶辫触');\r\n");
			
 
				-/*  476 */     sb.append("\t\t\t\t\t}\r\n");
			
 
				-/*  477 */     sb.append("\t\t\t\t}.bind(this)).catch(function () {\r\n");
			
 
				-/*  478 */     sb.append("\r\n");
			
 
				-/*  479 */     sb.append("\t\t\t\t});\r\n");
			
 
				-/*  480 */     sb.append("\t\t\t},\r\n");
			
 
				-/*      */ 
			
 
				-/*  483 */     sb.append("\t\t\tcreate: function () {\r\n");
			
 
				-/*  484 */     sb.append("\t\t\t\twindow.location = '" + downTableName + "';\r\n");
			
 
				-/*  485 */     sb.append("\t\t\t}\r\n");
			
 
				-/*      */ 
			
 
				-/*  488 */     sb.append("\t\t}\r\n");
			
 
				-/*  489 */     sb.append("\t})\r\n");
			
 
				-/*  490 */     sb.append("</script>\r\n");
			
 
				-/*  491 */     sb.append("</html>\r\n");
			
 
				-/*      */ 
			
 
				-/*  494 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createDaoClassFile(TableParams tableParams)
			
 
				-/*      */   {
			
 
				-/*  500 */     String daoClassContent = parseDaoClass(tableParams);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/*  503 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/*  505 */       String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getDaoTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Mapper.java";
			
 
				-/*  506 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/*  507 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/*  508 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/*  509 */       pw.println(daoClassContent);
			
 
				-/*  510 */       pw.flush();
			
 
				-/*  511 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/*  513 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseDaoClass(TableParams tableParams)
			
 
				-/*      */   {
			
 
				-/*  519 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/*  522 */     sb.append("package " + tableParams.getDaoTargetPackage() + ";\r\n");
			
 
				-/*  523 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  525 */     sb.append("import java.util.List;\r\n");
			
 
				-/*  526 */     sb.append("import java.util.Map;\r\n");
			
 
				-/*      */ 
			
 
				-/*  529 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  531 */     sb.append("import org.springframework.stereotype.Repository;\r\n");
			
 
				-/*      */ 
			
 
				-/*  533 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  535 */     sb.append("import " + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + ";\r\n");
			
 
				-/*  536 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  538 */     sb.append("/**\r\n");
			
 
				-/*  539 */     sb.append(" * " + tableParams.getTabelName() + " Dao鎺ュ彛\r\n");
			
 
				-/*  540 */     sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				-/*  541 */     sb.append(" */ \r\n");
			
 
				-/*      */ 
			
 
				-/*  544 */     sb.append("@Repository(\"" + tableParams.getDaoTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "Mapper\")\r\n");
			
 
				-/*      */ 
			
 
				-/*  547 */     sb.append("public interface " + StringUtil.initcap(tableParams.getTabelName()) + "Mapper {\r\n");
			
 
				-/*      */ 
			
 
				-/*  549 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  552 */     sb.append("\tint deleteByPrimaryKey(Integer id);\r\n");
			
 
				-/*  553 */     sb.append("\r\n");
			
 
				-/*  554 */     sb.append("\tint insertSelective(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  555 */     sb.append("\r\n");
			
 
				-/*  556 */     sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " selectByPrimaryKey(Integer id);\r\n");
			
 
				-/*  557 */     sb.append("\r\n");
			
 
				-/*  558 */     sb.append("\tint updateByPrimaryKeySelective(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  559 */     sb.append("\r\n");
			
 
				-/*  560 */     sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> queryAll" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  561 */     sb.append("\r\n");
			
 
				-/*  562 */     sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> query" + StringUtil.initcap(tableParams.getTabelName()) + "sByPage(Map <String, Object> parameter);\r\n");
			
 
				-/*  563 */     sb.append("\r\n");
			
 
				-/*  564 */     sb.append("\tint delete(String id);\r\n");
			
 
				-/*  565 */     sb.append("\r\n");
			
 
				-/*  566 */     sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " query" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*      */ 
			
 
				-/*  569 */     sb.append("}\r\n");
			
 
				-/*      */ 
			
 
				-/*  572 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createDaoXmlFile(TableParams tableParams, String[] colnames, String[] colTypes, String pkName)
			
 
				-/*      */   {
			
 
				-/*  585 */     String daoXmlContent = parseDaoXml(colnames, colTypes, tableParams, pkName);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/*  588 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/*  590 */       String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getDaoTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Mapper.xml";
			
 
				-/*  591 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/*  592 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/*  593 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/*  594 */       pw.println(daoXmlContent);
			
 
				-/*  595 */       pw.flush();
			
 
				-/*  596 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/*  598 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseDaoXml(String[] colnames, String[] colTypes, TableParams tableParams, String pkName)
			
 
				-/*      */   {
			
 
				-/*  612 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/*  615 */     sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n");
			
 
				-/*  616 */     sb.append("<!DOCTYPE mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\" >\r\n");
			
 
				-/*      */ 
			
 
				-/*  618 */     sb.append("<mapper namespace=\"" + tableParams.getDaoTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "Mapper\" >\r\n");
			
 
				-/*      */ 
			
 
				-/*  621 */     parseDaoBaseResultMap(sb, colnames, colTypes, pkName, tableParams);
			
 
				-/*  622 */     parseDaoBaseColumnList(sb, colnames);
			
 
				-/*  623 */     parseDaoSelectByPrimaryKey(sb, pkName, tableParams.getTabelName());
			
 
				-/*  624 */     parseDaoDeleteByPrimaryKey(sb, pkName, tableParams.getTabelName());
			
 
				-/*  625 */     parseDaoInsertSelective(sb, pkName, tableParams, colnames, colTypes);
			
 
				-/*  626 */     parseDaoUpdateByPrimaryKeySelective(sb, pkName, tableParams, colnames, colTypes);
			
 
				-/*  627 */     parseDaoQueryByPage(sb, pkName, tableParams, colnames);
			
 
				-/*  628 */     parseDaoQueryAll(sb, pkName, tableParams, colnames);
			
 
				-/*  629 */     parseDaoQueryOne(sb, tableParams, colnames);
			
 
				-/*  630 */     parseDaoDelete(sb, tableParams.getTabelName(), pkName);
			
 
				-/*      */ 
			
 
				-/*  632 */     sb.append("</mapper>\r\n");
			
 
				-/*  633 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoDelete(StringBuffer sb, String tabelName, String pkName)
			
 
				-/*      */   {
			
 
				-/*  644 */     sb.append("\t<update id=\"delete\">\r\n");
			
 
				-/*  645 */     sb.append("\t\tUPDATE " + tabelName + " SET del_flag = 'Y'\r\n");
			
 
				-/*  646 */     sb.append("\t\t<where>\r\n");
			
 
				-/*  647 */     sb.append("\t\t\tAND " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + "}\r\n");
			
 
				-/*  648 */     sb.append("\t\t</where>\r\n");
			
 
				-/*  649 */     sb.append("\t</update>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoQueryOne(StringBuffer sb, TableParams tableParams, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  661 */     sb.append("\t<select id=\"query" + StringUtil.initcap(tableParams.getTabelName()) + "\" parameterType=\"java.util.Map\" resultType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\">\r\n");
			
 
				-/*  662 */     sb.append("\t\tselect <include refid=\"Base_Column_List\"/> from " + tableParams.getTabelName() + "\r\n");
			
 
				-/*  663 */     sb.append("\t\t<where>\r\n");
			
 
				-/*  664 */     sb.append("\t\t\tand del_flag = 'N'\r\n");
			
 
				-/*      */ 
			
 
				-/*  667 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  670 */       sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null and !&quot;&quot;.equals(" + StringUtil.underlineToCamel(colnames[i]) + ")\">\r\n");
			
 
				-/*  671 */       sb.append("\t\t\t\tand " + colnames[i] + " = #{" + StringUtil.underlineToCamel(colnames[i]) + "}\t\n");
			
 
				-/*  672 */       sb.append("\t\t\t</if>\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  677 */     sb.append("\t\t</where>\r\n");
			
 
				-/*  678 */     sb.append("\t\tLIMIT 1\r\n");
			
 
				-/*  679 */     sb.append("\t</select>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoQueryAll(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  692 */     sb.append("\t<select id=\"queryAll" + StringUtil.initcap(tableParams.getTabelName()) + "\" parameterType=\"java.util.Map\" resultType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\">\r\n");
			
 
				-/*  693 */     sb.append("\t\tselect <include refid=\"Base_Column_List\"/> from " + tableParams.getTabelName() + "\r\n");
			
 
				-/*  694 */     sb.append("\t\t<where>\r\n");
			
 
				-/*  695 */     sb.append("\t\t\tand del_flag = 'N'\r\n");
			
 
				-/*      */ 
			
 
				-/*  698 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  701 */       sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null and !&quot;&quot;.equals(" + StringUtil.underlineToCamel(colnames[i]) + ")\">\r\n");
			
 
				-/*  702 */       sb.append("\t\t\t\tand " + colnames[i] + " = #{" + StringUtil.underlineToCamel(colnames[i]) + "}\t\n");
			
 
				-/*  703 */       sb.append("\t\t\t</if>\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  708 */     sb.append("\t\t</where>\r\n");
			
 
				-/*  709 */     sb.append("\t\torder by " + pkName + " desc\r\n");
			
 
				-/*  710 */     sb.append("\t</select>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoQueryByPage(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  723 */     sb.append("\t<select id=\"query" + StringUtil.initcap(tableParams.getTabelName()) + "sByPage\" parameterType=\"java.util.Map\" resultType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\">\r\n");
			
 
				-/*  724 */     sb.append("\t\tselect <include refid=\"Base_Column_List\"/> from " + tableParams.getTabelName() + "\r\n");
			
 
				-/*  725 */     sb.append("\t\t<where>\r\n");
			
 
				-/*  726 */     sb.append("\t\t\tand del_flag = 'N'\r\n");
			
 
				-/*      */ 
			
 
				-/*  729 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  732 */       sb.append("\t\t\t<if test=\"record." + StringUtil.underlineToCamel(colnames[i]) + " != null and !&quot;&quot;.equals(record." + StringUtil.underlineToCamel(colnames[i]) + ")\">\r\n");
			
 
				-/*  733 */       sb.append("\t\t\t\tand " + colnames[i] + " = #{record." + StringUtil.underlineToCamel(colnames[i]) + "}\t\n");
			
 
				-/*  734 */       sb.append("\t\t\t</if>\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  739 */     sb.append("\t\t</where>\r\n");
			
 
				-/*  740 */     sb.append("\t\torder by " + pkName + " desc\r\n");
			
 
				-/*  741 */     sb.append("\t</select>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoUpdateByPrimaryKeySelective(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames, String[] colTypes)
			
 
				-/*      */   {
			
 
				-/*  755 */     sb.append("\t<update id=\"updateByPrimaryKeySelective\" parameterType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\" >\r\n");
			
 
				-/*  756 */     sb.append("\t\tupdate " + tableParams.getTabelName() + "\r\n");
			
 
				-/*  757 */     sb.append("\t\t<set >\r\n");
			
 
				-/*      */ 
			
 
				-/*  760 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  762 */       if (!pkName.equalsIgnoreCase(colnames[i]))
			
 
				-/*      */       {
			
 
				-/*  764 */         sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null\" >\r\n");
			
 
				-/*  765 */         sb.append("\t\t\t\t" + colnames[i] + " = #{" + StringUtil.underlineToCamel(colnames[i]) + ",jdbcType=" + StringUtil.sqlType2JdbcType(colTypes[i]) + "},\t\n");
			
 
				-/*  766 */         sb.append("\t\t\t</if>\r\n");
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  771 */     sb.append("\t\t</set>\r\n");
			
 
				-/*  772 */     sb.append("\t\twhere " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + ",jdbcType=INTEGER}\r\n");
			
 
				-/*  773 */     sb.append("\t</update>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoInsertSelective(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames, String[] colTypes)
			
 
				-/*      */   {
			
 
				-/*  786 */     sb.append("\t<insert id=\"insertSelective\" parameterType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\" useGeneratedKeys=\"true\" keyProperty=\"" + StringUtil.underlineToCamel(pkName) + "\">\r\n");
			
 
				-/*  787 */     sb.append("\t\tinsert into " + tableParams.getTabelName() + "\r\n");
			
 
				-/*  788 */     sb.append("\t\t<trim prefix=\"(\" suffix=\")\" suffixOverrides=\",\" >\r\n");
			
 
				-/*      */ 
			
 
				-/*  791 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  793 */       sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null\" >\r\n");
			
 
				-/*  794 */       sb.append("\t\t\t\t" + colnames[i] + ",\t\n");
			
 
				-/*  795 */       sb.append("\t\t\t</if>\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  799 */     sb.append("\t\t</trim>\r\n");
			
 
				-/*  800 */     sb.append("\t\t<trim prefix=\"values (\" suffix=\")\" suffixOverrides=\",\" >\r\n");
			
 
				-/*  801 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  803 */       sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null\" >\r\n");
			
 
				-/*  804 */       sb.append("\t\t\t\t#{" + StringUtil.underlineToCamel(colnames[i]) + ",jdbcType=" + StringUtil.sqlType2JdbcType(colTypes[i]) + "},\t\n");
			
 
				-/*  805 */       sb.append("\t\t\t</if>\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  809 */     sb.append("\t\t</trim>\r\n");
			
 
				-/*  810 */     sb.append("\t</insert>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoDeleteByPrimaryKey(StringBuffer sb, String pkName, String tabelName)
			
 
				-/*      */   {
			
 
				-/*  823 */     sb.append("\t<delete id=\"deleteByPrimaryKey\" parameterType=\"java.lang.Integer\" >\r\n");
			
 
				-/*  824 */     sb.append("\t\tdelete from " + tabelName + "\r\n");
			
 
				-/*  825 */     sb.append("\t\twhere " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + ",jdbcType=INTEGER}\r\n");
			
 
				-/*  826 */     sb.append("\t</delete>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoSelectByPrimaryKey(StringBuffer sb, String pkName, String tabelName)
			
 
				-/*      */   {
			
 
				-/*  837 */     sb.append("\t<select id=\"selectByPrimaryKey\" resultMap=\"BaseResultMap\" parameterType=\"java.lang.Integer\" >\r\n");
			
 
				-/*  838 */     sb.append("\t\tselect\r\n");
			
 
				-/*  839 */     sb.append("\t\t<include refid=\"Base_Column_List\" />\r\n");
			
 
				-/*  840 */     sb.append("\t\tfrom " + tabelName + "\r\n");
			
 
				-/*  841 */     sb.append("\t\twhere " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + ",jdbcType=INTEGER}\r\n");
			
 
				-/*  842 */     sb.append("\t</select>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoBaseColumnList(StringBuffer sb, String[] colnames)
			
 
				-/*      */   {
			
 
				-/*  854 */     sb.append("\t<sql id=\"Base_Column_List\" >\r\n");
			
 
				-/*  855 */     sb.append("\t\t");
			
 
				-/*  856 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  859 */       if (i == colnames.length - 1)
			
 
				-/*      */       {
			
 
				-/*  861 */         sb.append(" " + colnames[i] + "\r\n");
			
 
				-/*      */       }
			
 
				-/*      */       else {
			
 
				-/*  864 */         sb.append(" " + colnames[i] + ",");
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  869 */     sb.append("\t</sql>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void parseDaoBaseResultMap(StringBuffer sb, String[] colnames, String[] colTypes, String pkName, TableParams tableParams)
			
 
				-/*      */   {
			
 
				-/*  883 */     sb.append("\t<resultMap id=\"BaseResultMap\" type=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\" >\r\n");
			
 
				-/*  884 */     sb.append("\t\t<id column=\"" + pkName + "\" property=\"" + StringUtil.underlineToCamel(pkName) + "\" jdbcType=\"INTEGER\" />\r\n");
			
 
				-/*  885 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/*      */     {
			
 
				-/*  887 */       if (!pkName.equalsIgnoreCase(colnames[i]))
			
 
				-/*      */       {
			
 
				-/*  889 */         sb.append("\t\t<result column=\"" + colnames[i] + "\" property=\"" + StringUtil.underlineToCamel(colnames[i]) + "\" jdbcType=\"" + StringUtil.sqlType2JdbcType(colTypes[i]) + "\" />\r\n");
			
 
				-/*      */       }
			
 
				-/*      */ 
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/*  894 */     sb.append("\t</resultMap>\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createServiceFile(TableParams tableParams, String pkName) {
			
 
				-/*  898 */     String serviceContent = parseService(tableParams, pkName);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/*  901 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/*  903 */       String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getServiceTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Service.java";
			
 
				-/*  904 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/*  905 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/*  906 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/*  907 */       pw.println(serviceContent);
			
 
				-/*  908 */       pw.flush();
			
 
				-/*  909 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/*  911 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseService(TableParams tableParams, String pkName)
			
 
				-/*      */   {
			
 
				-/*  917 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/*  920 */     sb.append("package " + tableParams.getServiceTargetPackage() + ";\r\n");
			
 
				-/*  921 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  923 */     sb.append("import java.util.List;\r\n");
			
 
				-/*      */ 
			
 
				-/*  925 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  927 */     sb.append("import " + tableParams.getBasePackage() + ".dto.Page;\r\n");
			
 
				-/*  928 */     sb.append("import " + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + ";\r\n");
			
 
				-/*      */ 
			
 
				-/*  930 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  933 */     sb.append("/**\r\n");
			
 
				-/*  934 */     sb.append(" * " + tableParams.getTabelName() + " service鎺ュ彛绫籠r\n");
			
 
				-/*  935 */     sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				-/*  936 */     sb.append(" */ \r\n");
			
 
				-/*      */ 
			
 
				-/*  939 */     sb.append("public interface " + StringUtil.initcap(tableParams.getTabelName()) + "Service {\r\n");
			
 
				-/*  940 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  943 */     sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> get" + StringUtil.initcap(tableParams.getTabelName()) + "List(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  944 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  946 */     sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> get" + StringUtil.initcap(tableParams.getTabelName()) + "ByPage(Page page, " + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  947 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  949 */     sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " get" + StringUtil.initcap(tableParams.getTabelName()) + "ById(String " + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				-/*  950 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  952 */     sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " get" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  953 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  955 */     sb.append("\tboolean create" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  956 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  958 */     sb.append("\tboolean delete" + StringUtil.initcap(tableParams.getTabelName()) + "(String " + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				-/*  959 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  961 */     sb.append("\tboolean update" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				-/*  962 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  964 */     sb.append("}\r\n");
			
 
				-/*      */ 
			
 
				-/*  966 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createServiceImplFile(TableParams tableParams, String pkName)
			
 
				-/*      */   {
			
 
				-/*  971 */     String serviceImplContent = parseServiceImpl(tableParams, pkName);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/*  974 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/*  976 */       String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getImplTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "ServiceImpl.java";
			
 
				-/*  977 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/*  978 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/*  979 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/*  980 */       pw.println(serviceImplContent);
			
 
				-/*  981 */       pw.flush();
			
 
				-/*  982 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/*  984 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseServiceImpl(TableParams tableParams, String pkName) {
			
 
				-/*  989 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/*  991 */     String upTableName = StringUtil.initcap(tableParams.getTabelName());
			
 
				-/*  992 */     String downTableName = StringUtil.underlineToCamel(tableParams.getTabelName());
			
 
				-/*      */ 
			
 
				-/*  994 */     sb.append("package " + tableParams.getImplTargetPackage() + ";\r\n");
			
 
				-/*  995 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/*  997 */     sb.append("import java.util.HashMap;\r\n");
			
 
				-/*  998 */     sb.append("import java.util.List;\r\n");
			
 
				-/*  999 */     sb.append("import java.util.Map;\r\n");
			
 
				-/*      */ 
			
 
				-/* 1001 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1003 */     sb.append("import org.apache.log4j.Logger;\r\n");
			
 
				-/* 1004 */     sb.append("import org.springframework.beans.factory.annotation.Autowired;\r\n");
			
 
				-/* 1005 */     sb.append("import org.springframework.stereotype.Service;\r\n");
			
 
				-/* 1006 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1009 */     sb.append("import " + tableParams.getBasePackage() + ".constant.AppConstant;\r\n");
			
 
				-/* 1010 */     sb.append("import " + tableParams.getDaoTargetPackage() + "." + upTableName + "Mapper;\r\n");
			
 
				-/* 1011 */     sb.append("import " + tableParams.getBasePackage() + ".dto.Page;\r\n");
			
 
				-/* 1012 */     sb.append("import " + tableParams.getModelTargetPackage() + "." + upTableName + ";\r\n");
			
 
				-/* 1013 */     sb.append("import " + tableParams.getServiceTargetPackage() + "." + upTableName + "Service;\r\n");
			
 
				-/*      */ 
			
 
				-/* 1015 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1018 */     sb.append("/**\r\n");
			
 
				-/* 1019 */     sb.append(" * " + tableParams.getTabelName() + " service鎺ュ彛瀹炵幇绫籠r\n");
			
 
				-/* 1020 */     sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				-/* 1021 */     sb.append(" */ \r\n");
			
 
				-/*      */ 
			
 
				-/* 1024 */     sb.append("@Service\r\n");
			
 
				-/* 1025 */     sb.append("public class " + upTableName + "ServiceImpl implements " + upTableName + "Service {\r\n");
			
 
				-/* 1026 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1030 */     sb.append("\tprivate static Logger   logger = Logger.getLogger(" + upTableName + "ServiceImpl.class);\r\n");
			
 
				-/* 1031 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1035 */     sb.append("\t@Autowired\r\n");
			
 
				-/* 1036 */     sb.append("\tprivate " + upTableName + "Mapper " + downTableName + "Mapper;\r\n");
			
 
				-/* 1037 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1041 */     sb.append("\t@Override\r\n");
			
 
				-/* 1042 */     sb.append("\tpublic List <" + upTableName + "> get" + upTableName + "List(" + upTableName + " record) {\r\n");
			
 
				-/* 1043 */     sb.append("\r\n");
			
 
				-/* 1044 */     sb.append("\t\tlogger.info(\"get" + upTableName + "List\");\r\n");
			
 
				-/* 1045 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1046 */     sb.append("\r\n");
			
 
				-/* 1047 */     sb.append("\t\t\treturn " + downTableName + "Mapper.queryAll" + upTableName + "(record);\r\n");
			
 
				-/* 1048 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1049 */     sb.append("\t\t\tlogger.error(\"get" + upTableName + "List\", e);\r\n");
			
 
				-/* 1050 */     sb.append("\t\t}\r\n");
			
 
				-/* 1051 */     sb.append("\r\n");
			
 
				-/* 1052 */     sb.append("\t\treturn null;\r\n");
			
 
				-/* 1053 */     sb.append("\t}\r\n");
			
 
				-/* 1054 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1057 */     sb.append("\t@Override\r\n");
			
 
				-/* 1058 */     sb.append("\tpublic List <" + upTableName + "> get" + upTableName + "ByPage(Page page, " + upTableName + " record) {\r\n");
			
 
				-/* 1059 */     sb.append("\r\n");
			
 
				-/* 1060 */     sb.append("\t\tlogger.info(\"get" + upTableName + "ByPage\");\r\n");
			
 
				-/* 1061 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1062 */     sb.append("\r\n");
			
 
				-/* 1063 */     sb.append("\t\t\tMap <String, Object> parameter = new HashMap <String, Object>();\r\n");
			
 
				-/* 1064 */     sb.append("\t\t\tparameter.put(\"record\", record);\r\n");
			
 
				-/* 1065 */     sb.append("\t\t\tparameter.put(AppConstant.PAGE, page);\r\n");
			
 
				-/* 1066 */     sb.append("\r\n");
			
 
				-/* 1067 */     sb.append("\t\t\treturn " + downTableName + "Mapper.query" + upTableName + "sByPage(parameter);\r\n");
			
 
				-/* 1068 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1069 */     sb.append("\t\t\tlogger.error(\"get" + upTableName + "ByPage\", e);\r\n");
			
 
				-/* 1070 */     sb.append("\t\t}\r\n");
			
 
				-/* 1071 */     sb.append("\r\n");
			
 
				-/* 1072 */     sb.append("\t\treturn null;\r\n");
			
 
				-/* 1073 */     sb.append("\t}\r\n");
			
 
				-/* 1074 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1078 */     sb.append("\t@Override\r\n");
			
 
				-/* 1079 */     sb.append("\tpublic " + upTableName + " get" + upTableName + "ById(String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				-/* 1080 */     sb.append("\r\n");
			
 
				-/* 1081 */     sb.append("\t\tlogger.info(\"get" + upTableName + "ById\");\r\n");
			
 
				-/* 1082 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1083 */     sb.append("\r\n");
			
 
				-/* 1084 */     sb.append("\t\t\treturn " + downTableName + "Mapper.selectByPrimaryKey(Integer.valueOf(" + StringUtil.underlineToCamel(pkName) + "));\r\n");
			
 
				-/* 1085 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1086 */     sb.append("\t\t\tlogger.error(\"get" + upTableName + "ById\", e);\r\n");
			
 
				-/* 1087 */     sb.append("\t\t}\r\n");
			
 
				-/* 1088 */     sb.append("\r\n");
			
 
				-/* 1089 */     sb.append("\t\treturn null;\r\n");
			
 
				-/* 1090 */     sb.append("\t}\r\n");
			
 
				-/* 1091 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1095 */     sb.append("\t@Override\r\n");
			
 
				-/* 1096 */     sb.append("\tpublic " + upTableName + " get" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				-/* 1097 */     sb.append("\r\n");
			
 
				-/* 1098 */     sb.append("\t\tlogger.info(\"get" + upTableName + "\");\r\n");
			
 
				-/* 1099 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1100 */     sb.append("\r\n");
			
 
				-/* 1101 */     sb.append("\t\t\treturn " + downTableName + "Mapper.query" + upTableName + "(record);\r\n");
			
 
				-/* 1102 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1103 */     sb.append("\t\t\tlogger.error(\"get" + upTableName + "\", e);\r\n");
			
 
				-/* 1104 */     sb.append("\t\t}\r\n");
			
 
				-/* 1105 */     sb.append("\r\n");
			
 
				-/* 1106 */     sb.append("\t\treturn null;\r\n");
			
 
				-/* 1107 */     sb.append("\t}\r\n");
			
 
				-/* 1108 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1112 */     sb.append("\t@Override\r\n");
			
 
				-/* 1113 */     sb.append("\tpublic boolean create" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				-/* 1114 */     sb.append("\r\n");
			
 
				-/* 1115 */     sb.append("\t\tlogger.info(\"create" + upTableName + "\");\r\n");
			
 
				-/* 1116 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1117 */     sb.append("\r\n");
			
 
				-/* 1118 */     sb.append("\t\t\tint updates = " + downTableName + "Mapper.insertSelective(record);\r\n");
			
 
				-/* 1119 */     sb.append("\r\n");
			
 
				-/* 1120 */     sb.append("\t\t\tif (updates > 0) {\r\n");
			
 
				-/* 1121 */     sb.append("\t\t\t\treturn true;\r\n");
			
 
				-/* 1122 */     sb.append("\t\t\t}\r\n");
			
 
				-/* 1123 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1124 */     sb.append("\t\t\tlogger.error(\"create" + upTableName + "\", e);\r\n");
			
 
				-/* 1125 */     sb.append("\t\t}\r\n");
			
 
				-/* 1126 */     sb.append("\r\n");
			
 
				-/* 1127 */     sb.append("\t\treturn false;\r\n");
			
 
				-/* 1128 */     sb.append("\t}\r\n");
			
 
				-/* 1129 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1133 */     sb.append("\t@Override\r\n");
			
 
				-/* 1134 */     sb.append("\tpublic boolean delete" + upTableName + "(String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				-/* 1135 */     sb.append("\r\n");
			
 
				-/* 1136 */     sb.append("\t\tlogger.info(\"delete" + upTableName + "\");\r\n");
			
 
				-/* 1137 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1138 */     sb.append("\r\n");
			
 
				-/* 1139 */     sb.append("\t\t\tint updates = " + downTableName + "Mapper.delete(" + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				-/* 1140 */     sb.append("\r\n");
			
 
				-/* 1141 */     sb.append("\t\t\tif (updates > 0) {\r\n");
			
 
				-/* 1142 */     sb.append("\t\t\t\treturn true;\r\n");
			
 
				-/* 1143 */     sb.append("\t\t\t}\r\n");
			
 
				-/* 1144 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1145 */     sb.append("\t\t\tlogger.error(\"delete" + upTableName + "\", e);\r\n");
			
 
				-/* 1146 */     sb.append("\t\t}\r\n");
			
 
				-/* 1147 */     sb.append("\r\n");
			
 
				-/* 1148 */     sb.append("\t\treturn false;\r\n");
			
 
				-/* 1149 */     sb.append("\t}\r\n");
			
 
				-/* 1150 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1154 */     sb.append("\t@Override\r\n");
			
 
				-/* 1155 */     sb.append("\tpublic boolean update" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				-/* 1156 */     sb.append("\r\n");
			
 
				-/* 1157 */     sb.append("\t\tlogger.info(\"update" + upTableName + "\");\r\n");
			
 
				-/* 1158 */     sb.append("\t\ttry {\r\n");
			
 
				-/* 1159 */     sb.append("\r\n");
			
 
				-/* 1160 */     sb.append("\t\t\tint updates = " + downTableName + "Mapper.updateByPrimaryKeySelective(record);\r\n");
			
 
				-/* 1161 */     sb.append("\r\n");
			
 
				-/* 1162 */     sb.append("\t\t\tif (updates > 0) {\r\n");
			
 
				-/* 1163 */     sb.append("\t\t\t\treturn true;\r\n");
			
 
				-/* 1164 */     sb.append("\t\t\t}\r\n");
			
 
				-/* 1165 */     sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				-/* 1166 */     sb.append("\t\t\tlogger.error(\"update" + upTableName + "\", e);\r\n");
			
 
				-/* 1167 */     sb.append("\t\t}\r\n");
			
 
				-/* 1168 */     sb.append("\r\n");
			
 
				-/* 1169 */     sb.append("\t\treturn false;\r\n");
			
 
				-/* 1170 */     sb.append("\t}\r\n");
			
 
				-/* 1171 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1173 */     sb.append("}\r\n");
			
 
				-/*      */ 
			
 
				-/* 1175 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createControllerFile(TableParams tableParams, String pkName) {
			
 
				-/* 1179 */     String controllerContent = parseController(tableParams, pkName);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/* 1182 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/* 1184 */       String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getControllerTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Controller.java";
			
 
				-/* 1185 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/* 1186 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/* 1187 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/* 1188 */       pw.println(controllerContent);
			
 
				-/* 1189 */       pw.flush();
			
 
				-/* 1190 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/* 1192 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static String parseController(TableParams tableParams, String pkName)
			
 
				-/*      */   {
			
 
				-/* 1198 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/* 1200 */     String upTableName = StringUtil.initcap(tableParams.getTabelName());
			
 
				-/* 1201 */     String downTableName = StringUtil.underlineToCamel(tableParams.getTabelName());
			
 
				-/*      */ 
			
 
				-/* 1203 */     sb.append("package " + tableParams.getControllerTargetPackage() + ";\r\n");
			
 
				-/* 1204 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1206 */     sb.append("import java.util.HashMap;\r\n");
			
 
				-/* 1207 */     sb.append("import java.util.List;\r\n");
			
 
				-/* 1208 */     sb.append("import java.util.Map;\r\n");
			
 
				-/*      */ 
			
 
				-/* 1210 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1212 */     sb.append("import org.springframework.beans.factory.annotation.Autowired;\r\n");
			
 
				-/* 1213 */     sb.append("import org.springframework.stereotype.Controller;\r\n");
			
 
				-/* 1214 */     sb.append("import org.springframework.web.bind.annotation.RequestMapping;\r\n");
			
 
				-/* 1215 */     sb.append("import org.springframework.web.bind.annotation.RequestMethod;\r\n");
			
 
				-/* 1216 */     sb.append("import org.springframework.web.bind.annotation.RequestParam;\r\n");
			
 
				-/* 1217 */     sb.append("import org.springframework.web.bind.annotation.ResponseBody;\r\n");
			
 
				-/* 1218 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1221 */     sb.append("import " + tableParams.getBasePackage() + ".constant.AppConstant;\r\n");
			
 
				-/* 1222 */     sb.append("import " + tableParams.getBasePackage() + ".dto.Page;\r\n");
			
 
				-/* 1223 */     sb.append("import " + tableParams.getBasePackage() + ".dto.Result;\r\n");
			
 
				-/* 1224 */     sb.append("import " + tableParams.getModelTargetPackage() + "." + upTableName + ";\r\n");
			
 
				-/* 1225 */     sb.append("import " + tableParams.getServiceTargetPackage() + "." + upTableName + "Service;\r\n");
			
 
				-/*      */ 
			
 
				-/* 1227 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1230 */     sb.append("/**\r\n");
			
 
				-/* 1231 */     sb.append(" * " + tableParams.getTabelName() + " controller绫籠r\n");
			
 
				-/* 1232 */     sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				-/* 1233 */     sb.append(" */ \r\n");
			
 
				-/*      */ 
			
 
				-/* 1236 */     sb.append("@Controller\r\n");
			
 
				-/* 1237 */     sb.append("@RequestMapping(\"/" + downTableName + "\")\r\n");
			
 
				-/* 1238 */     sb.append("public class " + upTableName + "Controller extends BaseController  {\r\n");
			
 
				-/* 1239 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1243 */     sb.append("\t@Autowired\r\n");
			
 
				-/* 1244 */     sb.append("\tprivate " + upTableName + "Service " + downTableName + "Service;\r\n");
			
 
				-/* 1245 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1249 */     sb.append("\t/**\r\n");
			
 
				-/* 1250 */     sb.append("\t * <p>鑾峰彇鍏ㄩ儴璁板綍銆�</p>\r\n");
			
 
				-/* 1251 */     sb.append("\t */ \r\n");
			
 
				-/* 1252 */     sb.append("\t@RequestMapping(value = \"/all\", method = RequestMethod.GET)\r\n");
			
 
				-/* 1253 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1254 */     sb.append("\tpublic Result all(" + upTableName + " record) {\r\n");
			
 
				-/* 1255 */     sb.append("\r\n");
			
 
				-/* 1256 */     sb.append("\t\tList <" + upTableName + "> pp = " + downTableName + "Service.get" + upTableName + "List(record);\r\n");
			
 
				-/* 1257 */     sb.append("\t\treturn new Result(true, pp);\r\n");
			
 
				-/* 1258 */     sb.append("\t}\r\n");
			
 
				-/* 1259 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1263 */     sb.append("\t/**\r\n");
			
 
				-/* 1264 */     sb.append("\t * <p>鏍规嵁Id銆�</p>\r\n");
			
 
				-/* 1265 */     sb.append("\t */ \r\n");
			
 
				-/* 1266 */     sb.append("\t@RequestMapping(value = \"/get" + upTableName + "\", method = RequestMethod.GET)\r\n");
			
 
				-/* 1267 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1268 */     sb.append("\tpublic Result get" + upTableName + "(@RequestParam(required = false, value = \"" + StringUtil.underlineToCamel(pkName) + "\") String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				-/* 1269 */     sb.append("\r\n");
			
 
				-/* 1270 */     sb.append("\t\t" + upTableName + " data = " + downTableName + "Service.get" + upTableName + "ById(" + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				-/* 1271 */     sb.append("\t\treturn new Result(true, data);\r\n");
			
 
				-/* 1272 */     sb.append("\t}\r\n");
			
 
				-/* 1273 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1277 */     sb.append("\t/**\r\n");
			
 
				-/* 1278 */     sb.append("\t * <p>鏍规嵁鏉′欢鑾峰彇銆�</p>\r\n");
			
 
				-/* 1279 */     sb.append("\t */ \r\n");
			
 
				-/* 1280 */     sb.append("\t@RequestMapping(value = \"/getOne\", method = RequestMethod.GET)\r\n");
			
 
				-/* 1281 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1282 */     sb.append("\tpublic Result getOne(" + upTableName + " record) {\r\n");
			
 
				-/* 1283 */     sb.append("\r\n");
			
 
				-/* 1284 */     sb.append("\t\t" + upTableName + " data = " + downTableName + "Service.get" + upTableName + "(record);\r\n");
			
 
				-/* 1285 */     sb.append("\t\treturn new Result(true, data);\r\n");
			
 
				-/* 1286 */     sb.append("\t}\r\n");
			
 
				-/* 1287 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1291 */     sb.append("\t/**\r\n");
			
 
				-/* 1292 */     sb.append("\t * <p>鍒嗛〉鏌ヨ銆�</p>\r\n");
			
 
				-/* 1293 */     sb.append("\t */ \r\n");
			
 
				-/* 1294 */     sb.append("\t@RequestMapping(value = \"/page\", method = RequestMethod.GET)\r\n");
			
 
				-/* 1295 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1296 */     sb.append("\tpublic Result page(Page page, " + upTableName + " record) {\r\n");
			
 
				-/* 1297 */     sb.append("\r\n");
			
 
				-/* 1298 */     sb.append("\t\tMap <String, Object> result = new HashMap <>();\r\n");
			
 
				-/* 1299 */     sb.append("\r\n");
			
 
				-/* 1300 */     sb.append("\t\tList <" + upTableName + "> pp = " + downTableName + "Service.get" + upTableName + "ByPage(page, record);\r\n");
			
 
				-/* 1301 */     sb.append("\r\n");
			
 
				-/* 1302 */     sb.append("\t\tresult.put(AppConstant.PAGE, page);\r\n");
			
 
				-/* 1303 */     sb.append("\t\tresult.put(\"pp\", pp);\r\n");
			
 
				-/* 1304 */     sb.append("\t\treturn new Result(true, result);\r\n");
			
 
				-/* 1305 */     sb.append("\t}\r\n");
			
 
				-/* 1306 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1310 */     sb.append("\t/**\r\n");
			
 
				-/* 1311 */     sb.append("\t * <p>淇濆瓨銆�</p>\r\n");
			
 
				-/* 1312 */     sb.append("\t */ \r\n");
			
 
				-/* 1313 */     sb.append("\t@RequestMapping(value = \"/save\", method = RequestMethod.POST)\r\n");
			
 
				-/* 1314 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1315 */     sb.append("\tpublic Result save(" + upTableName + " record) {\r\n");
			
 
				-/* 1316 */     sb.append("\r\n");
			
 
				-/* 1317 */     sb.append("\t\tboolean num = " + downTableName + "Service.create" + upTableName + "(record);\r\n");
			
 
				-/* 1318 */     sb.append("\t\tif (num) {\r\n");
			
 
				-/* 1319 */     sb.append("\t\t\treturn new Result(true, record.get" + StringUtil.initcap(pkName) + "());\r\n");
			
 
				-/* 1320 */     sb.append("\t\t}\r\n");
			
 
				-/* 1321 */     sb.append("\t\treturn new Result(false, \"淇濆瓨寮傚父\");\r\n");
			
 
				-/* 1322 */     sb.append("\t}\r\n");
			
 
				-/* 1323 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1326 */     sb.append("\t/**\r\n");
			
 
				-/* 1327 */     sb.append("\t * <p>鏇存柊淇℃伅銆�</p>\r\n");
			
 
				-/* 1328 */     sb.append("\t */ \r\n");
			
 
				-/* 1329 */     sb.append("\t@RequestMapping(value = \"/update\", method = RequestMethod.POST)\r\n");
			
 
				-/* 1330 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1331 */     sb.append("\tpublic Result update" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				-/* 1332 */     sb.append("\r\n");
			
 
				-/* 1333 */     sb.append("\t\tboolean num = " + downTableName + "Service.update" + upTableName + "(record);\r\n");
			
 
				-/* 1334 */     sb.append("\t\tif (num) {\r\n");
			
 
				-/* 1335 */     sb.append("\t\t\treturn new Result(true, \"淇濆瓨鎴愬姛\");\r\n");
			
 
				-/* 1336 */     sb.append("\t\t}\r\n");
			
 
				-/* 1337 */     sb.append("\t\treturn new Result(false, \"淇濆瓨寮傚父\");\r\n");
			
 
				-/* 1338 */     sb.append("\t}\r\n");
			
 
				-/* 1339 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1343 */     sb.append("\t/**\r\n");
			
 
				-/* 1344 */     sb.append("\t * <p>鍒犻櫎銆�</p>\r\n");
			
 
				-/* 1345 */     sb.append("\t */ \r\n");
			
 
				-/* 1346 */     sb.append("\t@RequestMapping(value = \"/del\", method = RequestMethod.POST)\r\n");
			
 
				-/* 1347 */     sb.append("\t@ResponseBody\r\n");
			
 
				-/* 1348 */     sb.append("\tpublic Result delete" + upTableName + "(@RequestParam(required = true, value = \"" + StringUtil.underlineToCamel(pkName) + "\") String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				-/* 1349 */     sb.append("\r\n");
			
 
				-/* 1350 */     sb.append("\t\tboolean num = " + downTableName + "Service.delete" + upTableName + "(" + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				-/* 1351 */     sb.append("\t\tif (num) {\r\n");
			
 
				-/* 1352 */     sb.append("\t\t\treturn new Result(true, \"鍒犻櫎鎴愬姛\");\r\n");
			
 
				-/* 1353 */     sb.append("\t\t}\r\n");
			
 
				-/* 1354 */     sb.append("\t\treturn new Result(false, \"鍒犻櫎寮傚父\");\r\n");
			
 
				-/* 1355 */     sb.append("\t}\r\n");
			
 
				-/* 1356 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1359 */     sb.append("}\r\n");
			
 
				-/*      */ 
			
 
				-/* 1361 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   private static void createModelFile(TableParams tableParams, String[] colnames, String[] colTypes)
			
 
				-/*      */   {
			
 
				-/* 1367 */     String modelContent = parseModel(colnames, colTypes, tableParams);
			
 
				-/*      */     try
			
 
				-/*      */     {
			
 
				-/* 1370 */       File directory = new File("");
			
 
				-/*      */ 
			
 
				-/* 1372 */       String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getModelTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + ".java";
			
 
				-/* 1373 */       System.out.println("鏂囦欢璺緞锛�" + fileName);
			
 
				-/* 1374 */       FileWriter fw = new FileWriter(fileName);
			
 
				-/* 1375 */       PrintWriter pw = new PrintWriter(fw);
			
 
				-/* 1376 */       pw.println(modelContent);
			
 
				-/* 1377 */       pw.flush();
			
 
				-/* 1378 */       pw.close();
			
 
				-/*      */     } catch (IOException e) {
			
 
				-/* 1380 */       e.printStackTrace();
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   public static String changeToFolder(String packageName)
			
 
				-/*      */   {
			
 
				-/* 1386 */     return packageName.replaceAll("\\.", "\\/") + "/";
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   public static String parseModel(String[] colnames, String[] colTypes, TableParams tableParams)
			
 
				-/*      */   {
			
 
				-/* 1395 */     StringBuffer sb = new StringBuffer();
			
 
				-/*      */ 
			
 
				-/* 1398 */     sb.append("package " + tableParams.getModelTargetPackage() + ";\r\n");
			
 
				-/* 1399 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1402 */     if (f_util) {
			
 
				-/* 1403 */       sb.append("import java.util.*;\r\n");
			
 
				-/*      */     }
			
 
				-/* 1405 */     if (f_sql) {
			
 
				-/* 1406 */       sb.append("import java.sql.*;\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/* 1409 */     if (f_math) {
			
 
				-/* 1410 */       sb.append("import java.math.*;\r\n");
			
 
				-/*      */     }
			
 
				-/*      */ 
			
 
				-/* 1413 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1415 */     sb.append("import org.codehaus.jackson.annotate.JsonAutoDetect;\r\n");
			
 
				-/* 1416 */     sb.append("import org.codehaus.jackson.map.annotate.JsonSerialize;\r\n");
			
 
				-/*      */ 
			
 
				-/* 1418 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1421 */     sb.append("/**\r\n");
			
 
				-/* 1422 */     sb.append(" * " + tableParams.getTabelName() + " 瀹炰綋绫籠r\n");
			
 
				-/* 1423 */     sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				-/* 1424 */     sb.append(" */ \r\n");
			
 
				-/*      */ 
			
 
				-/* 1427 */     sb.append("@JsonAutoDetect\r\n");
			
 
				-/* 1428 */     sb.append("@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)\r\n");
			
 
				-/*      */ 
			
 
				-/* 1431 */     sb.append("public class " + StringUtil.initcap(tableParams.getTabelName()) + "{\r\n");
			
 
				-/* 1432 */     sb.append("\r\n");
			
 
				-/*      */ 
			
 
				-/* 1434 */     processModelAllAttrs(sb, colnames, colTypes);
			
 
				-/* 1435 */     processModelAllMethod(sb, colnames, colTypes);
			
 
				-/* 1436 */     sb.append("}\r\n");
			
 
				-/*      */ 
			
 
				-/* 1439 */     return sb.toString();
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   public static void processModelAllAttrs(StringBuffer sb, String[] colnames, String[] colTypes)
			
 
				-/*      */   {
			
 
				-/* 1449 */     for (int i = 0; i < colnames.length; i++)
			
 
				-/* 1450 */       sb.append("\tprivate " + StringUtil.sqlType2JavaType(colTypes[i]) + " " + StringUtil.underlineToCamel(colnames[i]) + ";\r\n\r\n");
			
 
				-/*      */   }
			
 
				-/*      */ 
			
 
				-/*      */   public static void processModelAllMethod(StringBuffer sb, String[] colnames, String[] colTypes)
			
 
				-/*      */   {
			
 
				-/* 1462 */     for (int i = 0; i < colnames.length; i++) {
			
 
				-/* 1463 */       sb.append("\tpublic void set" + StringUtil.initcap(colnames[i]) + "(" + StringUtil.sqlType2JavaType(colTypes[i]) + " " + 
			
 
				-/* 1464 */         StringUtil.underlineToCamel(colnames[i]) + "){\r\n");
			
 
				-/* 1465 */       sb.append("\t\tthis." + StringUtil.underlineToCamel(colnames[i]) + "=" + StringUtil.underlineToCamel(colnames[i]) + ";\r\n");
			
 
				-/* 1466 */       sb.append("\t}\r\n\r\n");
			
 
				-/* 1467 */       sb.append("\tpublic " + StringUtil.sqlType2JavaType(colTypes[i]) + " get" + StringUtil.initcap(colnames[i]) + "(){\r\n");
			
 
				-/* 1468 */       sb.append("\t\treturn " + StringUtil.underlineToCamel(colnames[i]) + ";\r\n");
			
 
				-/* 1469 */       sb.append("\t}\r\n\r\n");
			
 
				-/*      */     }
			
 
				-/*      */   }
			
 
				-/*      */ }
			
 
				-
			
 
				-/* Location:           C:\Users\Administrator\Desktop\新建文件夹\WEB-INF\classes\
			
 
				- * Qualified Name:     zouma.frame.gen.GenEntity
			
 
				- * JD-Core Version:    0.6.2
			
 
				- */
			
 
				+package zouma.frame.gen;
			
 
				+
			
 
				+import zouma.frame.util.StringUtil;
			
 
				+
			
 
				+import java.io.File;
			
 
				+import java.io.FileWriter;
			
 
				+import java.io.IOException;
			
 
				+import java.io.PrintWriter;
			
 
				+import java.sql.*;
			
 
				+import java.util.Date;
			
 
				+
			
 
				+
			
 
				+public class GenEntity {
			
 
				+
			
 
				+    private static boolean f_util = false; // 是否需要导入包java.util.*
			
 
				+    private static boolean f_sql  = false; // 是否需要导入包java.sql.*
			
 
				+    private static boolean f_math = false;//是否需要导入包 java.math.BigDecimal
			
 
				+
			
 
				+
			
 
				+    public static void GenAll(TableParams tableParams) {
			
 
				+
			
 
				+        String[] colnames; // 列名数组
			
 
				+        String[] colTypes; //列名类型数组
			
 
				+        int[] colSizes; //列名大小数组
			
 
				+
			
 
				+        String PK_NAME = "id";//主键名
			
 
				+        Connection con = null;
			
 
				+
			
 
				+        //查要生成实体类的表
			
 
				+        String sql = "select * from " + tableParams.getTabelName();
			
 
				+        PreparedStatement pStemt = null;
			
 
				+        try {
			
 
				+            try {
			
 
				+                Class.forName(JdbcConfig.DRIVER);
			
 
				+            } catch (ClassNotFoundException e1) {
			
 
				+                // TODO Auto-generated catch block
			
 
				+                e1.printStackTrace();
			
 
				+            }
			
 
				+            con = DriverManager.getConnection(JdbcConfig.URL, JdbcConfig.NAME, JdbcConfig.PASS);
			
 
				+            pStemt = con.prepareStatement(sql);
			
 
				+            ResultSetMetaData rsmd = pStemt.getMetaData();
			
 
				+
			
 
				+            ResultSet pkRSet = con.getMetaData().getPrimaryKeys(con.getCatalog().toUpperCase(),
			
 
				+                    null, tableParams.getTabelName());
			
 
				+
			
 
				+            while (pkRSet.next()) {
			
 
				+                System.out.println(pkRSet.getString("COLUMN_NAME"));
			
 
				+                PK_NAME = pkRSet.getString("COLUMN_NAME");
			
 
				+            }
			
 
				+
			
 
				+            int size = rsmd.getColumnCount();   //统计列
			
 
				+            colnames = new String[size];
			
 
				+            colTypes = new String[size];
			
 
				+            colSizes = new int[size];
			
 
				+            for (int i = 0; i < size; i++) {
			
 
				+                colnames[i] = rsmd.getColumnName(i + 1);
			
 
				+                colTypes[i] = rsmd.getColumnTypeName(i + 1);
			
 
				+
			
 
				+                if (colTypes[i].equalsIgnoreCase("datetime") || colTypes[i].equalsIgnoreCase("timestamp")) {
			
 
				+                    f_util = true;
			
 
				+                }
			
 
				+                if (colTypes[i].equalsIgnoreCase("image") || colTypes[i].equalsIgnoreCase("text")) {
			
 
				+                    f_sql = true;
			
 
				+                }
			
 
				+                if (colTypes[i].equalsIgnoreCase("decimal") || colTypes[i].equalsIgnoreCase("numeric")
			
 
				+                        || colTypes[i].equalsIgnoreCase("real") || colTypes[i].equalsIgnoreCase("money")
			
 
				+                        || colTypes[i].equalsIgnoreCase("smallmoney")) {
			
 
				+                    f_math = true;
			
 
				+                }
			
 
				+                colSizes[i] = rsmd.getColumnDisplaySize(i + 1);
			
 
				+            }
			
 
				+
			
 
				+            //如果生成实体
			
 
				+            if (tableParams.isModelFlag()) {
			
 
				+
			
 
				+                createModelFile(tableParams, colnames, colTypes);
			
 
				+            }
			
 
				+
			
 
				+            //如果生成数据层
			
 
				+            if (tableParams.isDaoFlag()) {
			
 
				+
			
 
				+                createDaoClassFile(tableParams);
			
 
				+                createDaoXmlFile(tableParams, colnames, colTypes, PK_NAME);
			
 
				+            }
			
 
				+
			
 
				+            //如果生成服务层
			
 
				+            if (tableParams.isServiceFlag()) {
			
 
				+
			
 
				+                createServiceFile(tableParams, PK_NAME);
			
 
				+                createServiceImplFile(tableParams, PK_NAME);
			
 
				+            }
			
 
				+
			
 
				+            //如果生成控制层
			
 
				+            if (tableParams.isControllerFlag()) {
			
 
				+
			
 
				+                createControllerFile(tableParams, PK_NAME);
			
 
				+            }
			
 
				+
			
 
				+
			
 
				+            //如果生成JSP
			
 
				+            if (tableParams.isJspFlag()) {
			
 
				+                createJspByPageFile(tableParams, PK_NAME, colnames);
			
 
				+                createJspEditFile(tableParams, PK_NAME, colnames);
			
 
				+            }
			
 
				+
			
 
				+            //关闭链接
			
 
				+            pStemt.close();
			
 
				+            pkRSet.close();
			
 
				+            con.close();
			
 
				+
			
 
				+        } catch (SQLException e) {
			
 
				+            e.printStackTrace();
			
 
				+        } finally {
			
 
				+
			
 
				+
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static void createJspEditFile(TableParams tableParams, String pk_name, String[] colnames) {
			
 
				+        String jspEditContent = parseJspEdit(tableParams.getTabelName(), pk_name, colnames);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/" + changeToFolder(tableParams.getJspTargetPackage()) + StringUtil.underlineToCamel(tableParams.getTabelName()) + ".jsp";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(jspEditContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static String parseJspEdit(String tabelName, String pkName, String[] colnames) {
			
 
				+
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+
			
 
				+        String upTableName = StringUtil.initcap(tabelName);
			
 
				+        String downTableName = StringUtil.underlineToCamel(tabelName);
			
 
				+
			
 
				+
			
 
				+        sb.append("<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %>\r\n");
			
 
				+        sb.append("<html>\r\n");
			
 
				+
			
 
				+        sb.append("<head>\r\n");
			
 
				+        sb.append("\t<jsp:include page=\"head.jsp\"/>\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t<title>牧场溯源</title>\r\n");
			
 
				+
			
 
				+        sb.append("</head>\r\n");
			
 
				+
			
 
				+        sb.append("<body>\r\n");
			
 
				+
			
 
				+        sb.append("<jsp:include page=\"contentBefore.jsp\"/>\r\n");
			
 
				+        sb.append("<template>\r\n");
			
 
				+
			
 
				+        sb.append("\t<el-form ref=\"form\" :model=\"row_info\" label-width=\"80px\">\r\n");
			
 
				+
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+            if (!pkName.equalsIgnoreCase(colnames[i])) {
			
 
				+
			
 
				+                sb.append("\t\t<el-form-item label=\"" + StringUtil.underlineToCamel(colnames[i]) + "\">\r\n");
			
 
				+                sb.append("\t\t\t<el-input v-model=\"row_info." + StringUtil.underlineToCamel(colnames[i]) + "\"></el-input>\r\n");
			
 
				+                sb.append("\t\t</el-form-item>\r\n");
			
 
				+            }
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t<el-form-item>\r\n");
			
 
				+        sb.append("\t\t\t<el-button type=\"primary\" @click=\"onSubmit\">{{edit?'保存':'立即创建'}}</el-button>\r\n");
			
 
				+        sb.append("\t\t\t<el-button>取消</el-button>\r\n");
			
 
				+        sb.append("\t</el-form-item>\r\n");
			
 
				+        sb.append("\t</el-form>\r\n");
			
 
				+        sb.append("</template>\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("<jsp:include page=\"contentAfter.jsp\"/>\r\n");
			
 
				+        sb.append("</body>\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("<script>\r\n");
			
 
				+
			
 
				+        sb.append("\tfunction getQueryString(name) {\r\n");
			
 
				+        sb.append("\t\tvar reg = new RegExp(\"(^|&)\" + name + \"=([^&]*)(&|$)\", \"i\");\r\n");
			
 
				+        sb.append("\t\tvar r = window.location.search.substr(1).match(reg);\r\n");
			
 
				+        sb.append("\t\tif (r != null) return unescape(r[2]);\r\n");
			
 
				+        sb.append("\t\treturn null;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+
			
 
				+        sb.append("\tnew Vue({\r\n");
			
 
				+        sb.append("\t\tel: '#app',\r\n");
			
 
				+        sb.append("\t\tcreated: function () {\r\n");
			
 
				+        sb.append("\t\t\tvar " + StringUtil.underlineToCamel(pkName) + " = getQueryString('" + StringUtil.underlineToCamel(pkName) + "');\r\n");
			
 
				+        sb.append("\t\t\tif (" + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				+        sb.append("\t\t\t\t$.get({\r\n");
			
 
				+        sb.append("\t\t\t\t\turl: '../" + downTableName + "/get" + upTableName + "',\r\n");
			
 
				+        sb.append("\t\t\t\t\tdata: {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\t" + StringUtil.underlineToCamel(pkName) + ": " + StringUtil.underlineToCamel(pkName) + "\r\n");
			
 
				+        sb.append("\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t}).then(function (res) {\r\n");
			
 
				+        sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.edit = true;\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.row_info = res.data;\r\n");
			
 
				+        sb.append("\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this));\r\n");
			
 
				+        sb.append("\t\t\t}\r\n");
			
 
				+        sb.append("\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\tdata: function () {\r\n");
			
 
				+        sb.append("\t\t\treturn {\r\n");
			
 
				+        sb.append("\t\t\t\tmenu: '0-0',\r\n");
			
 
				+        sb.append("\t\t\t\tuser: {\r\n");
			
 
				+        sb.append("\t\t\t\t\tid: '',\n\r\n");
			
 
				+        sb.append("\t\t\t\t\tusername: 'admin',\r\n");
			
 
				+        sb.append("\t\t\t\t\tavatar: ''\r\n");
			
 
				+        sb.append("\t\t\t\t},\r\n");
			
 
				+        sb.append("\t\t\t\tloading: false,\r\n");
			
 
				+        sb.append("\t\t\t\tedit: false,\r\n");
			
 
				+        sb.append("\t\t\t\ttab: 1,\r\n");
			
 
				+        sb.append("\t\t\t\trow_info : {},\r\n");
			
 
				+        sb.append("\t\t\t};\r\n");
			
 
				+        sb.append("\t\t},\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\tmethods: {\r\n");
			
 
				+        sb.append("\t\t\tlogout: function () {\r\n");
			
 
				+        sb.append("\t\t\t\tthis.$confirm('确定要注销吗?', '提示', {\r\n");
			
 
				+        sb.append("\t\t\t\t\tconfirmButtonText: '确定',\r\n");
			
 
				+        sb.append("\t\t\t\t\tcancelButtonText: '取消',\r\n");
			
 
				+        sb.append("\t\t\t\t\ttype: 'info'\r\n");
			
 
				+        sb.append("\t\t\t\t}).then(function () {\r\n");
			
 
				+        sb.append("\t\t\t\t\tlocalStorage.removeItem('user');\r\n");
			
 
				+        sb.append("\t\t\t\t\tthis.$router.push({path: '/login'});\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this)).catch(function (e) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\t\t});\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\t\tonSubmit: function () {\r\n");
			
 
				+        sb.append("\t\t\t\tvar data = JSON.parse(JSON.stringify(this.row_info));\r\n");
			
 
				+        sb.append("\t\t\t\t$.post({\r\n");
			
 
				+        sb.append("\t\t\t\t\turl: this.edit ? '../" + downTableName + "/update' : '../" + downTableName + "/save',\r\n");
			
 
				+        sb.append("\t\t\t\t\tdata: data\r\n");
			
 
				+        sb.append("\t\t\t\t}).then(function (res) {\r\n");
			
 
				+        sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tif (!this.edit) {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\t\tthis.row_info." + StringUtil.underlineToCamel(pkName) + " = res.data;\r\n");
			
 
				+        sb.append("\t\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.edit = true;\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.$message.success(this.edit ? '保存成功' : '创建成功');\r\n");
			
 
				+        sb.append("\t\t\t\t\t} else {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.$message.error(this.edit ? '保存失败' : '创建失败');\r\n");
			
 
				+        sb.append("\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this))\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\t})\r\n");
			
 
				+        sb.append("</script>\r\n");
			
 
				+        sb.append("</html>\r\n");
			
 
				+
			
 
				+
			
 
				+        return sb.toString();
			
 
				+
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    private static void createJspByPageFile(TableParams tableParams, String pkName, String[] colnames) {
			
 
				+        String jspByPageContent = parseJspByPage(tableParams.getTabelName(), pkName, colnames);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/" + changeToFolder(tableParams.getJspTargetPackage()) + StringUtil.underlineToCamel(tableParams.getTabelName()) + "s.jsp";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(jspByPageContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static String parseJspByPage(String tabelName, String pkName, String[] colnames) {
			
 
				+
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+
			
 
				+        String downTableName = StringUtil.underlineToCamel(tabelName);
			
 
				+
			
 
				+
			
 
				+        sb.append("<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %>\r\n");
			
 
				+        sb.append("<html>\r\n");
			
 
				+
			
 
				+        sb.append("<head>\r\n");
			
 
				+        sb.append("\t<jsp:include page=\"head.jsp\"/>\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t<title>牧场溯源</title>\r\n");
			
 
				+
			
 
				+        sb.append("</head>\r\n");
			
 
				+
			
 
				+        sb.append("<body>\r\n");
			
 
				+
			
 
				+        sb.append("<jsp:include page=\"contentBefore.jsp\"/>\r\n");
			
 
				+        sb.append("<template>\r\n");
			
 
				+
			
 
				+        sb.append("\t<div class=\"filters\">\r\n");
			
 
				+        sb.append("\t\t<el-button type=\"primary\" @click=\"create()\">创建</el-button>\r\n");
			
 
				+        sb.append("\t\t<div class=\"num\"> 共{{totalNumber}}记录</div>\r\n");
			
 
				+        sb.append("\t</div>\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\t<el-table :data=\"rows\"\r\n");
			
 
				+        sb.append("\t\t\tref=\"table\"\r\n");
			
 
				+        sb.append("\t\t\tstyle=\"width: 100%\"\r\n");
			
 
				+        sb.append("\t\t\telement-loading-text=\"拼命加载中\"\r\n");
			
 
				+        sb.append("\t\t\tstripe\r\n");
			
 
				+        sb.append("\t\t\tv-loading=\"loading\">\r\n");
			
 
				+
			
 
				+        sb.append("\t\t\t<el-table-column\r\n");
			
 
				+        sb.append("\t\t\t\ttype=\"index\"\r\n");
			
 
				+        sb.append("\t\t\t\twidth=\"70\"\r\n");
			
 
				+        sb.append("\t\t\t\talign=\"center\">\r\n");
			
 
				+        sb.append("\t\t\t</el-table-column>\r\n");
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+            if (!pkName.equalsIgnoreCase(colnames[i])) {
			
 
				+
			
 
				+                sb.append("\t\t<el-table-column\r\n");
			
 
				+                sb.append("\t\t\t\tprop=\"" + StringUtil.underlineToCamel(colnames[i]) + "\"\r\n");
			
 
				+                sb.append("\t\t\t\tlabel=\"" + StringUtil.underlineToCamel(colnames[i]) + "\"\r\n");
			
 
				+                sb.append("\t\t\t\talign=\"center\">\r\n");
			
 
				+                sb.append("\t\t</el-table-column>\r\n");
			
 
				+            }
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t<el-table-column\r\n");
			
 
				+        sb.append("\t\t\t\t:context=\"_self\"\r\n");
			
 
				+        sb.append("\t\t\t\twidth=\"150\"\r\n");
			
 
				+        sb.append("\t\t\t\tinline-template\r\n");
			
 
				+        sb.append("\t\t\t\tlabel=\"操作\"\r\n");
			
 
				+        sb.append("\t\t\t\talign=\"center\">\r\n");
			
 
				+        sb.append("\t\t\t<div>\r\n");
			
 
				+        sb.append("\t\t\t\t<el-button size=\"small\" @click=\"editRow(row)\">编辑</el-button>\r\n");
			
 
				+        sb.append("\t\t\t\t<el-button size=\"small\" type=\"danger\" @click=\"deleteRow(row)\">删除</el-button>\r\n");
			
 
				+        sb.append("\t\t\t</div>\r\n");
			
 
				+        sb.append("\t\t</el-table-column>\r\n");
			
 
				+
			
 
				+        sb.append("\t</el-table>\r\n");
			
 
				+
			
 
				+        sb.append("\t<div class=\"pagination-wrapper\" v-show=\"!loading\">\r\n");
			
 
				+        sb.append("\t\t<el-pagination layout=\"sizes, prev, pager, next\" :page-size=\"pageSize\" :total=\"totalNumber\"\r\n");
			
 
				+        sb.append("\t\t\t\t\t:page-size=\"pageSize\"\r\n");
			
 
				+        sb.append("\t\t\t\t\t:current-page=\"currentPage\" @current-change=\"pageChange\" @size-change=\"sizeChange\">\r\n");
			
 
				+        sb.append("\t\t</el-pagination>\r\n");
			
 
				+        sb.append("\t</div>\r\n");
			
 
				+
			
 
				+        sb.append("</template>\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("<jsp:include page=\"contentAfter.jsp\"/>\r\n");
			
 
				+        sb.append("</body>\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("<script>\r\n");
			
 
				+
			
 
				+        sb.append("\tfunction getQueryString(name) {\r\n");
			
 
				+        sb.append("\t\tvar reg = new RegExp(\"(^|&)\" + name + \"=([^&]*)(&|$)\", \"i\");\r\n");
			
 
				+        sb.append("\t\tvar r = window.location.search.substr(1).match(reg);\r\n");
			
 
				+        sb.append("\t\tif (r != null) return unescape(r[2]);\r\n");
			
 
				+        sb.append("\t\treturn null;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+
			
 
				+        sb.append("\tnew Vue({\r\n");
			
 
				+        sb.append("\t\tel: '#app',\r\n");
			
 
				+        sb.append("\t\tcreated: function () {\r\n");
			
 
				+        sb.append("\t\t\tthis.getRows();\r\n");
			
 
				+        sb.append("\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\tdata: function () {\r\n");
			
 
				+        sb.append("\t\t\treturn {\r\n");
			
 
				+        sb.append("\t\t\t\tmenu: '0-0',\r\n");
			
 
				+        sb.append("\t\t\t\tuser: {\r\n");
			
 
				+        sb.append("\t\t\t\t\tid: '',\n\r\n");
			
 
				+        sb.append("\t\t\t\t\tusername: 'admin',\r\n");
			
 
				+        sb.append("\t\t\t\t\tavatar: ''\r\n");
			
 
				+        sb.append("\t\t\t\t},\r\n");
			
 
				+        sb.append("\t\t\t\tloading: false,\r\n");
			
 
				+        sb.append("\t\t\t\ttotalNumber: 0,\r\n");
			
 
				+        sb.append("\t\t\t\ttotalPage: 10,\r\n");
			
 
				+        sb.append("\t\t\t\tcurrentPage: 1,\r\n");
			
 
				+        sb.append("\t\t\t\tpageSize: 20,\r\n");
			
 
				+        sb.append("\t\t\t\trows: []\r\n");
			
 
				+        sb.append("\t\t\t};\r\n");
			
 
				+        sb.append("\t\t},\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\tmethods: {\r\n");
			
 
				+        sb.append("\t\t\tlogout: function () {\r\n");
			
 
				+        sb.append("\t\t\t\tthis.$confirm('确定要注销吗?', '提示', {\r\n");
			
 
				+        sb.append("\t\t\t\t\tconfirmButtonText: '确定',\r\n");
			
 
				+        sb.append("\t\t\t\t\tcancelButtonText: '取消',\r\n");
			
 
				+        sb.append("\t\t\t\t\ttype: 'info'\r\n");
			
 
				+        sb.append("\t\t\t\t}).then(function () {\r\n");
			
 
				+        sb.append("\t\t\t\t\tlocalStorage.removeItem('user');\r\n");
			
 
				+        sb.append("\t\t\t\t\tthis.$router.push({path: '/login'});\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this)).catch(function (e) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\t\t});\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\t\tgetRows: function () {\r\n");
			
 
				+        sb.append("\t\t\t\t$.get({\r\n");
			
 
				+        sb.append("\t\t\t\t\turl: '../" + downTableName + "/page',\r\n");
			
 
				+        sb.append("\t\t\t\t\tdata: {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tcurrentPage: this.currentPage,\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tpageNumber: this.pageSize\r\n");
			
 
				+        sb.append("\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t}).then(function (res) {\r\n");
			
 
				+        sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.totalNumber = res.data.page.totalNumber;\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.rows = res.data.pp;\r\n");
			
 
				+        sb.append("\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this))\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t\tpageChange: function (page) {\r\n");
			
 
				+        sb.append("\t\t\t\tthis.currentPage = page;\r\n");
			
 
				+        sb.append("\t\t\t\tthis.getRows();\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\t\tsizeChange: function (size) {\r\n");
			
 
				+        sb.append("\t\t\t\tthis.pageSize = size;\r\n");
			
 
				+        sb.append("\t\t\t\tthis.getRows();\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+        sb.append("\t\t\teditRow: function (row) {\r\n");
			
 
				+        sb.append("\t\t\t\twindow.location = '" + downTableName + "?" + StringUtil.underlineToCamel(pkName) + "=' + row." + StringUtil.underlineToCamel(pkName) + ";\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t\tdeleteRow: function (row) {\r\n");
			
 
				+        sb.append("\t\t\t\tthis.$confirm('确定要删除吗?', '提示', {\r\n");
			
 
				+        sb.append("\t\t\t\t\tconfirmButtonText: '删除',\r\n");
			
 
				+        sb.append("\t\t\t\t\tcancelButtonText: '取消',\r\n");
			
 
				+        sb.append("\t\t\t\t\ttype: 'warning'\r\n");
			
 
				+        sb.append("\t\t\t\t}).then(function () {\r\n");
			
 
				+        sb.append("\t\t\t\t\treturn $.post({\r\n");
			
 
				+        sb.append("\t\t\t\t\t\turl: '../" + downTableName + "/del',\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tdata: {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\t\t" + StringUtil.underlineToCamel(pkName) + ": row." + StringUtil.underlineToCamel(pkName) + "\r\n");
			
 
				+        sb.append("\t\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t\t})\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this)).then(function (res) {\r\n");
			
 
				+        sb.append("\t\t\t\t\tif (res.success) {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.$message.success('删除成功');\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.getRows();\r\n");
			
 
				+        sb.append("\t\t\t\t\t} else {\r\n");
			
 
				+        sb.append("\t\t\t\t\t\tthis.$message.error('删除失败');\r\n");
			
 
				+        sb.append("\t\t\t\t\t}\r\n");
			
 
				+        sb.append("\t\t\t\t}.bind(this)).catch(function () {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\t\t});\r\n");
			
 
				+        sb.append("\t\t\t},\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t\tcreate: function () {\r\n");
			
 
				+        sb.append("\t\t\t\twindow.location = '" + downTableName + "';\r\n");
			
 
				+        sb.append("\t\t\t}\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\t})\r\n");
			
 
				+        sb.append("</script>\r\n");
			
 
				+        sb.append("</html>\r\n");
			
 
				+
			
 
				+
			
 
				+        return sb.toString();
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    private static void createDaoClassFile(TableParams tableParams) {
			
 
				+
			
 
				+        String daoClassContent = parseDaoClass(tableParams);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getDaoTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Mapper.java";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(daoClassContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static String parseDaoClass(TableParams tableParams) {
			
 
				+
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+
			
 
				+        sb.append("package " + tableParams.getDaoTargetPackage() + ";\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import java.util.List;\r\n");
			
 
				+        sb.append("import java.util.Map;\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import org.springframework.stereotype.Repository;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import " + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + ";\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        //注释部分
			
 
				+        sb.append("/**\r\n");
			
 
				+        sb.append(" * " + tableParams.getTabelName() + " Dao接口\r\n");
			
 
				+        sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				+        sb.append(" */ \r\n");
			
 
				+
			
 
				+        //注解
			
 
				+        sb.append("@Repository(\"" + tableParams.getDaoTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "Mapper\")\r\n");
			
 
				+
			
 
				+        //实体部分
			
 
				+        sb.append("public interface " + StringUtil.initcap(tableParams.getTabelName()) + "Mapper {\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\tint deleteByPrimaryKey(Integer id);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\tint insertSelective(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " selectByPrimaryKey(Integer id);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\tint updateByPrimaryKeySelective(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> queryAll" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> query" + StringUtil.initcap(tableParams.getTabelName()) + "sByPage(Map <String, Object> parameter);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\tint delete(String id);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " query" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("}\r\n");
			
 
				+
			
 
				+        //System.out.println(sb.toString());
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 生成 dao XML
			
 
				+     *
			
 
				+     * @param tableParams
			
 
				+     * @param colnames
			
 
				+     * @param colTypes
			
 
				+     * @param pkName
			
 
				+     */
			
 
				+    private static void createDaoXmlFile(TableParams tableParams, String[] colnames, String[] colTypes, String pkName) {
			
 
				+
			
 
				+        String daoXmlContent = parseDaoXml(colnames, colTypes, tableParams, pkName);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getDaoTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Mapper.xml";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(daoXmlContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析 数据层 xml
			
 
				+     *
			
 
				+     * @param colnames
			
 
				+     * @param colTypes
			
 
				+     * @param tableParams
			
 
				+     * @param pkName
			
 
				+     * @return
			
 
				+     */
			
 
				+    private static String parseDaoXml(String[] colnames, String[] colTypes, TableParams tableParams, String pkName) {
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+
			
 
				+        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n");
			
 
				+        sb.append("<!DOCTYPE mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\" >\r\n");
			
 
				+
			
 
				+        sb.append("<mapper namespace=\"" + tableParams.getDaoTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "Mapper\" >\r\n");
			
 
				+
			
 
				+
			
 
				+        parseDaoBaseResultMap(sb, colnames, colTypes, pkName, tableParams);
			
 
				+        parseDaoBaseColumnList(sb, colnames);
			
 
				+        parseDaoSelectByPrimaryKey(sb, pkName, tableParams.getTabelName());
			
 
				+        parseDaoDeleteByPrimaryKey(sb, pkName, tableParams.getTabelName());
			
 
				+        parseDaoInsertSelective(sb, pkName, tableParams, colnames, colTypes);
			
 
				+        parseDaoUpdateByPrimaryKeySelective(sb, pkName, tableParams, colnames, colTypes);
			
 
				+        parseDaoQueryByPage(sb, pkName, tableParams, colnames);
			
 
				+        parseDaoQueryAll(sb, pkName, tableParams, colnames);
			
 
				+        parseDaoQueryOne(sb, tableParams, colnames);
			
 
				+        parseDaoDelete(sb, tableParams.getTabelName(), pkName);
			
 
				+
			
 
				+        sb.append("</mapper>\r\n");
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 逻辑删除
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param tabelName
			
 
				+     * @param pkName
			
 
				+     */
			
 
				+    private static void parseDaoDelete(StringBuffer sb, String tabelName, String pkName) {
			
 
				+        sb.append("\t<update id=\"delete\">\r\n");
			
 
				+        sb.append("\t\tUPDATE " + tabelName + " SET del_flag = 'Y'\r\n");
			
 
				+        sb.append("\t\t<where>\r\n");
			
 
				+        sb.append("\t\t\tAND " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + "}\r\n");
			
 
				+        sb.append("\t\t</where>\r\n");
			
 
				+        sb.append("\t</update>\r\n");
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析，查询一个
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param tableParams
			
 
				+     * @param colnames
			
 
				+     */
			
 
				+    private static void parseDaoQueryOne(StringBuffer sb, TableParams tableParams, String[] colnames) {
			
 
				+        sb.append("\t<select id=\"query" + StringUtil.initcap(tableParams.getTabelName()) + "\" parameterType=\"java.util.Map\" resultType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\">\r\n");
			
 
				+        sb.append("\t\tselect <include refid=\"Base_Column_List\"/> from " + tableParams.getTabelName() + "\r\n");
			
 
				+        sb.append("\t\t<where>\r\n");
			
 
				+        sb.append("\t\t\tand del_flag = 'N'\r\n");
			
 
				+
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+
			
 
				+            sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null and !&quot;&quot;.equals(" + StringUtil.underlineToCamel(colnames[i]) + ")\">\r\n");
			
 
				+            sb.append("\t\t\t\tand " + colnames[i] + " = #{" + StringUtil.underlineToCamel(colnames[i]) + "}\t\n");
			
 
				+            sb.append("\t\t\t</if>\r\n");
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t</where>\r\n");
			
 
				+        sb.append("\t\tLIMIT 1\r\n");
			
 
				+        sb.append("\t</select>\r\n");
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析，查询所有
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param pkName
			
 
				+     * @param tableParams
			
 
				+     * @param colnames
			
 
				+     */
			
 
				+    private static void parseDaoQueryAll(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames) {
			
 
				+
			
 
				+        sb.append("\t<select id=\"queryAll" + StringUtil.initcap(tableParams.getTabelName()) + "\" parameterType=\"java.util.Map\" resultType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\">\r\n");
			
 
				+        sb.append("\t\tselect <include refid=\"Base_Column_List\"/> from " + tableParams.getTabelName() + "\r\n");
			
 
				+        sb.append("\t\t<where>\r\n");
			
 
				+        sb.append("\t\t\tand del_flag = 'N'\r\n");
			
 
				+
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+
			
 
				+            sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null and !&quot;&quot;.equals(" + StringUtil.underlineToCamel(colnames[i]) + ")\">\r\n");
			
 
				+            sb.append("\t\t\t\tand " + colnames[i] + " = #{" + StringUtil.underlineToCamel(colnames[i]) + "}\t\n");
			
 
				+            sb.append("\t\t\t</if>\r\n");
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t</where>\r\n");
			
 
				+        sb.append("\t\torder by " + pkName + " desc\r\n");
			
 
				+        sb.append("\t</select>\r\n");
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析，翻页查询
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param pkName
			
 
				+     * @param tableParams
			
 
				+     * @param colnames
			
 
				+     */
			
 
				+    private static void parseDaoQueryByPage(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames) {
			
 
				+
			
 
				+        sb.append("\t<select id=\"query" + StringUtil.initcap(tableParams.getTabelName()) + "sByPage\" parameterType=\"java.util.Map\" resultType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\">\r\n");
			
 
				+        sb.append("\t\tselect <include refid=\"Base_Column_List\"/> from " + tableParams.getTabelName() + "\r\n");
			
 
				+        sb.append("\t\t<where>\r\n");
			
 
				+        sb.append("\t\t\tand del_flag = 'N'\r\n");
			
 
				+
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+
			
 
				+            sb.append("\t\t\t<if test=\"record." + StringUtil.underlineToCamel(colnames[i]) + " != null and !&quot;&quot;.equals(record." + StringUtil.underlineToCamel(colnames[i]) + ")\">\r\n");
			
 
				+            sb.append("\t\t\t\tand " + colnames[i] + " = #{record." + StringUtil.underlineToCamel(colnames[i]) + "}\t\n");
			
 
				+            sb.append("\t\t\t</if>\r\n");
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        sb.append("\t\t</where>\r\n");
			
 
				+        sb.append("\t\torder by " + pkName + " desc\r\n");
			
 
				+        sb.append("\t</select>\r\n");
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析，根据主键更新字段
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param pkName
			
 
				+     * @param tableParams
			
 
				+     * @param colnames
			
 
				+     * @param colTypes
			
 
				+     */
			
 
				+    private static void parseDaoUpdateByPrimaryKeySelective(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames, String[] colTypes) {
			
 
				+        sb.append("\t<update id=\"updateByPrimaryKeySelective\" parameterType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\" >\r\n");
			
 
				+        sb.append("\t\tupdate " + tableParams.getTabelName() + "\r\n");
			
 
				+        sb.append("\t\t<set >\r\n");
			
 
				+
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+            if (!pkName.equalsIgnoreCase(colnames[i])) {
			
 
				+
			
 
				+                sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null\" >\r\n");
			
 
				+                sb.append("\t\t\t\t" + colnames[i] + " = #{" + StringUtil.underlineToCamel(colnames[i]) + ",jdbcType=" + StringUtil.sqlType2JdbcType(colTypes[i]) + "},\t\n");
			
 
				+                sb.append("\t\t\t</if>\r\n");
			
 
				+            }
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+        sb.append("\t\t</set>\r\n");
			
 
				+        sb.append("\t\twhere " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + ",jdbcType=INTEGER}\r\n");
			
 
				+        sb.append("\t</update>\r\n");
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析，插入数据
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param pkName
			
 
				+     * @param tableParams
			
 
				+     * @param colnames
			
 
				+     * @param colTypes
			
 
				+     */
			
 
				+    private static void parseDaoInsertSelective(StringBuffer sb, String pkName, TableParams tableParams, String[] colnames, String[] colTypes) {
			
 
				+        sb.append("\t<insert id=\"insertSelective\" parameterType=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\" useGeneratedKeys=\"true\" keyProperty=\"" + StringUtil.underlineToCamel(pkName) + "\">\r\n");
			
 
				+        sb.append("\t\tinsert into " + tableParams.getTabelName() + "\r\n");
			
 
				+        sb.append("\t\t<trim prefix=\"(\" suffix=\")\" suffixOverrides=\",\" >\r\n");
			
 
				+
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+            sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null\" >\r\n");
			
 
				+            sb.append("\t\t\t\t" + colnames[i] + ",\t\n");
			
 
				+            sb.append("\t\t\t</if>\r\n");
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+        sb.append("\t\t</trim>\r\n");
			
 
				+        sb.append("\t\t<trim prefix=\"values (\" suffix=\")\" suffixOverrides=\",\" >\r\n");
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+            sb.append("\t\t\t<if test=\"" + StringUtil.underlineToCamel(colnames[i]) + " != null\" >\r\n");
			
 
				+            sb.append("\t\t\t\t#{" + StringUtil.underlineToCamel(colnames[i]) + ",jdbcType=" + StringUtil.sqlType2JdbcType(colTypes[i]) + "},\t\n");
			
 
				+            sb.append("\t\t\t</if>\r\n");
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+        sb.append("\t\t</trim>\r\n");
			
 
				+        sb.append("\t</insert>\r\n");
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析，根据主键删除
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param pkName
			
 
				+     * @param tabelName
			
 
				+     */
			
 
				+    private static void parseDaoDeleteByPrimaryKey(StringBuffer sb, String pkName, String tabelName) {
			
 
				+
			
 
				+        sb.append("\t<delete id=\"deleteByPrimaryKey\" parameterType=\"java.lang.Integer\" >\r\n");
			
 
				+        sb.append("\t\tdelete from " + tabelName + "\r\n");
			
 
				+        sb.append("\t\twhere " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + ",jdbcType=INTEGER}\r\n");
			
 
				+        sb.append("\t</delete>\r\n");
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析根据主键查询
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param pkName
			
 
				+     * @param tabelName
			
 
				+     */
			
 
				+    private static void parseDaoSelectByPrimaryKey(StringBuffer sb, String pkName, String tabelName) {
			
 
				+        sb.append("\t<select id=\"selectByPrimaryKey\" resultMap=\"BaseResultMap\" parameterType=\"java.lang.Integer\" >\r\n");
			
 
				+        sb.append("\t\tselect\r\n");
			
 
				+        sb.append("\t\t<include refid=\"Base_Column_List\" />\r\n");
			
 
				+        sb.append("\t\tfrom " + tabelName + "\r\n");
			
 
				+        sb.append("\t\twhere " + pkName + " = #{" + StringUtil.underlineToCamel(pkName) + ",jdbcType=INTEGER}\r\n");
			
 
				+        sb.append("\t</select>\r\n");
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析baseColumnList
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param colnames
			
 
				+     */
			
 
				+    private static void parseDaoBaseColumnList(StringBuffer sb, String[] colnames) {
			
 
				+
			
 
				+        sb.append("\t<sql id=\"Base_Column_List\" >\r\n");
			
 
				+        sb.append("\t\t");
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+
			
 
				+            if (i == colnames.length - 1) {
			
 
				+
			
 
				+                sb.append(" " + colnames[i] + "\r\n");
			
 
				+            } else {
			
 
				+
			
 
				+                sb.append(" " + colnames[i] + ",");
			
 
				+            }
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+        sb.append("\t</sql>\r\n");
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 解析BaseResultMap
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     * @param colnames
			
 
				+     * @param colTypes
			
 
				+     * @param pkName
			
 
				+     * @param tableParams
			
 
				+     */
			
 
				+    private static void parseDaoBaseResultMap(StringBuffer sb, String[] colnames, String[] colTypes, String pkName, TableParams tableParams) {
			
 
				+        sb.append("\t<resultMap id=\"BaseResultMap\" type=\"" + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + "\" >\r\n");
			
 
				+        sb.append("\t\t<id column=\"" + pkName + "\" property=\"" + StringUtil.underlineToCamel(pkName) + "\" jdbcType=\"INTEGER\" />\r\n");
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+
			
 
				+            if (!pkName.equalsIgnoreCase(colnames[i])) {
			
 
				+
			
 
				+                sb.append("\t\t<result column=\"" + colnames[i] + "\" property=\"" + StringUtil.underlineToCamel(colnames[i]) + "\" jdbcType=\"" + StringUtil.sqlType2JdbcType(colTypes[i]) + "\" />\r\n");
			
 
				+            }
			
 
				+
			
 
				+        }
			
 
				+
			
 
				+        sb.append("\t</resultMap>\r\n");
			
 
				+    }
			
 
				+
			
 
				+    private static void createServiceFile(TableParams tableParams, String pkName) {
			
 
				+        String serviceContent = parseService(tableParams, pkName);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getServiceTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Service.java";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(serviceContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static String parseService(TableParams tableParams, String pkName) {
			
 
				+
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+
			
 
				+        sb.append("package " + tableParams.getServiceTargetPackage() + ";\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import java.util.List;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import " + tableParams.getBasePackage() + ".dto.Page;\r\n");
			
 
				+        sb.append("import " + tableParams.getModelTargetPackage() + "." + StringUtil.initcap(tableParams.getTabelName()) + ";\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        //注释部分
			
 
				+        sb.append("/**\r\n");
			
 
				+        sb.append(" * " + tableParams.getTabelName() + " service接口类\r\n");
			
 
				+        sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				+        sb.append(" */ \r\n");
			
 
				+
			
 
				+        //实体部分
			
 
				+        sb.append("public interface " + StringUtil.initcap(tableParams.getTabelName()) + "Service {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> get" + StringUtil.initcap(tableParams.getTabelName()) + "List(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\tList <" + StringUtil.initcap(tableParams.getTabelName()) + "> get" + StringUtil.initcap(tableParams.getTabelName()) + "ByPage(Page page, " + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " get" + StringUtil.initcap(tableParams.getTabelName()) + "ById(String " + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\t" + StringUtil.initcap(tableParams.getTabelName()) + " get" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\tboolean create" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\tboolean delete" + StringUtil.initcap(tableParams.getTabelName()) + "(String " + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("\tboolean update" + StringUtil.initcap(tableParams.getTabelName()) + "(" + StringUtil.initcap(tableParams.getTabelName()) + " record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("}\r\n");
			
 
				+
			
 
				+        return sb.toString();
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    private static void createServiceImplFile(TableParams tableParams, String pkName) {
			
 
				+        String serviceImplContent = parseServiceImpl(tableParams, pkName);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getImplTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "ServiceImpl.java";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(serviceImplContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static String parseServiceImpl(TableParams tableParams, String pkName) {
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+        String upTableName = StringUtil.initcap(tableParams.getTabelName());
			
 
				+        String downTableName = StringUtil.underlineToCamel(tableParams.getTabelName());
			
 
				+
			
 
				+        sb.append("package " + tableParams.getImplTargetPackage() + ";\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import java.util.HashMap;\r\n");
			
 
				+        sb.append("import java.util.List;\r\n");
			
 
				+        sb.append("import java.util.Map;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import org.apache.log4j.Logger;\r\n");
			
 
				+        sb.append("import org.springframework.beans.factory.annotation.Autowired;\r\n");
			
 
				+        sb.append("import org.springframework.stereotype.Service;\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("import " + tableParams.getBasePackage() + ".constant.AppConstant;\r\n");
			
 
				+        sb.append("import " + tableParams.getDaoTargetPackage() + "." + upTableName + "Mapper;\r\n");
			
 
				+        sb.append("import " + tableParams.getBasePackage() + ".dto.Page;\r\n");
			
 
				+        sb.append("import " + tableParams.getModelTargetPackage() + "." + upTableName + ";\r\n");
			
 
				+        sb.append("import " + tableParams.getServiceTargetPackage() + "." + upTableName + "Service;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        //注释部分
			
 
				+        sb.append("/**\r\n");
			
 
				+        sb.append(" * " + tableParams.getTabelName() + " service接口实现类\r\n");
			
 
				+        sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				+        sb.append(" */ \r\n");
			
 
				+
			
 
				+        //实体部分
			
 
				+        sb.append("@Service\r\n");
			
 
				+        sb.append("public class " + upTableName + "ServiceImpl implements " + upTableName + "Service {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //日志部分
			
 
				+        sb.append("\tprivate static Logger   logger = Logger.getLogger(" + upTableName + "ServiceImpl.class);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //引入mapper
			
 
				+        sb.append("\t@Autowired\r\n");
			
 
				+        sb.append("\tprivate " + upTableName + "Mapper " + downTableName + "Mapper;\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //get ALL
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic List <" + upTableName + "> get" + upTableName + "List(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"get" + upTableName + "List\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\treturn " + downTableName + "Mapper.queryAll" + upTableName + "(record);\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"get" + upTableName + "List\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn null;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        //ByPage
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic List <" + upTableName + "> get" + upTableName + "ByPage(Page page, " + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"get" + upTableName + "ByPage\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tMap <String, Object> parameter = new HashMap <String, Object>();\r\n");
			
 
				+        sb.append("\t\t\tparameter.put(\"record\", record);\r\n");
			
 
				+        sb.append("\t\t\tparameter.put(AppConstant.PAGE, page);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\treturn " + downTableName + "Mapper.query" + upTableName + "sByPage(parameter);\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"get" + upTableName + "ByPage\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn null;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //selectByPrimaryKey
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic " + upTableName + " get" + upTableName + "ById(String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"get" + upTableName + "ById\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\treturn " + downTableName + "Mapper.selectByPrimaryKey(Integer.valueOf(" + StringUtil.underlineToCamel(pkName) + "));\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"get" + upTableName + "ById\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn null;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //getOne
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic " + upTableName + " get" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"get" + upTableName + "\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\treturn " + downTableName + "Mapper.query" + upTableName + "(record);\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"get" + upTableName + "\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn null;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //create
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic boolean create" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"create" + upTableName + "\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tint updates = " + downTableName + "Mapper.insertSelective(record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tif (updates > 0) {\r\n");
			
 
				+        sb.append("\t\t\t\treturn true;\r\n");
			
 
				+        sb.append("\t\t\t}\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"create" + upTableName + "\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn false;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //delete
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic boolean delete" + upTableName + "(String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"delete" + upTableName + "\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tint updates = " + downTableName + "Mapper.delete(" + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tif (updates > 0) {\r\n");
			
 
				+        sb.append("\t\t\t\treturn true;\r\n");
			
 
				+        sb.append("\t\t\t}\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"delete" + upTableName + "\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn false;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //update
			
 
				+        sb.append("\t@Override\r\n");
			
 
				+        sb.append("\tpublic boolean update" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tlogger.info(\"update" + upTableName + "\");\r\n");
			
 
				+        sb.append("\t\ttry {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tint updates = " + downTableName + "Mapper.updateByPrimaryKeySelective(record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t\tif (updates > 0) {\r\n");
			
 
				+        sb.append("\t\t\t\treturn true;\r\n");
			
 
				+        sb.append("\t\t\t}\r\n");
			
 
				+        sb.append("\t\t} catch (Exception e) {\r\n");
			
 
				+        sb.append("\t\t\tlogger.error(\"update" + upTableName + "\", e);\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\treturn false;\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("}\r\n");
			
 
				+
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    private static void createControllerFile(TableParams tableParams, String pkName) {
			
 
				+        String controllerContent = parseController(tableParams, pkName);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getControllerTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + "Controller.java";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(controllerContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    private static String parseController(TableParams tableParams, String pkName) {
			
 
				+
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+        String upTableName = StringUtil.initcap(tableParams.getTabelName());
			
 
				+        String downTableName = StringUtil.underlineToCamel(tableParams.getTabelName());
			
 
				+
			
 
				+        sb.append("package " + tableParams.getControllerTargetPackage() + ";\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import java.util.HashMap;\r\n");
			
 
				+        sb.append("import java.util.List;\r\n");
			
 
				+        sb.append("import java.util.Map;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import org.springframework.beans.factory.annotation.Autowired;\r\n");
			
 
				+        sb.append("import org.springframework.stereotype.Controller;\r\n");
			
 
				+        sb.append("import org.springframework.web.bind.annotation.RequestMapping;\r\n");
			
 
				+        sb.append("import org.springframework.web.bind.annotation.RequestMethod;\r\n");
			
 
				+        sb.append("import org.springframework.web.bind.annotation.RequestParam;\r\n");
			
 
				+        sb.append("import org.springframework.web.bind.annotation.ResponseBody;\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("import " + tableParams.getBasePackage() + ".constant.AppConstant;\r\n");
			
 
				+        sb.append("import " + tableParams.getBasePackage() + ".dto.Page;\r\n");
			
 
				+        sb.append("import " + tableParams.getBasePackage() + ".dto.Result;\r\n");
			
 
				+        sb.append("import " + tableParams.getModelTargetPackage() + "." + upTableName + ";\r\n");
			
 
				+        sb.append("import " + tableParams.getServiceTargetPackage() + "." + upTableName + "Service;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        //注释部分
			
 
				+        sb.append("/**\r\n");
			
 
				+        sb.append(" * " + tableParams.getTabelName() + " controller类\r\n");
			
 
				+        sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				+        sb.append(" */ \r\n");
			
 
				+
			
 
				+        //实体部分
			
 
				+        sb.append("@Controller\r\n");
			
 
				+        sb.append("@RequestMapping(\"/" + downTableName + "\")\r\n");
			
 
				+        sb.append("public class " + upTableName + "Controller extends BaseController  {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //引入
			
 
				+        sb.append("\t@Autowired\r\n");
			
 
				+        sb.append("\tprivate " + upTableName + "Service " + downTableName + "Service;\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //get ALL
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>获取全部记录。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/all\", method = RequestMethod.GET)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result all(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tList <" + upTableName + "> pp = " + downTableName + "Service.get" + upTableName + "List(record);\r\n");
			
 
				+        sb.append("\t\treturn new Result(true, pp);\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //get By id
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>根据Id。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/get" + upTableName + "\", method = RequestMethod.GET)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result get" + upTableName + "(@RequestParam(required = false, value = \"" + StringUtil.underlineToCamel(pkName) + "\") String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t" + upTableName + " data = " + downTableName + "Service.get" + upTableName + "ById(" + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				+        sb.append("\t\treturn new Result(true, data);\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //getOne
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>根据条件获取。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/getOne\", method = RequestMethod.GET)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result getOne(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\t" + upTableName + " data = " + downTableName + "Service.get" + upTableName + "(record);\r\n");
			
 
				+        sb.append("\t\treturn new Result(true, data);\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //page
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>分页查询。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/page\", method = RequestMethod.GET)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result page(Page page, " + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tMap <String, Object> result = new HashMap <>();\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tList <" + upTableName + "> pp = " + downTableName + "Service.get" + upTableName + "ByPage(page, record);\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tresult.put(AppConstant.PAGE, page);\r\n");
			
 
				+        sb.append("\t\tresult.put(\"pp\", pp);\r\n");
			
 
				+        sb.append("\t\treturn new Result(true, result);\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //save
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>保存。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/save\", method = RequestMethod.POST)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result save(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tboolean num = " + downTableName + "Service.create" + upTableName + "(record);\r\n");
			
 
				+        sb.append("\t\tif (num) {\r\n");
			
 
				+        sb.append("\t\t\treturn new Result(true, record.get" + StringUtil.initcap(pkName) + "());\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\t\treturn new Result(false, \"保存异常\");\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //update
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>更新信息。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/update\", method = RequestMethod.POST)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result update" + upTableName + "(" + upTableName + " record) {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tboolean num = " + downTableName + "Service.update" + upTableName + "(record);\r\n");
			
 
				+        sb.append("\t\tif (num) {\r\n");
			
 
				+        sb.append("\t\t\treturn new Result(true, \"保存成功\");\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\t\treturn new Result(false, \"保存异常\");\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        //del
			
 
				+        sb.append("\t/**\r\n");
			
 
				+        sb.append("\t * <p>删除。</p>\r\n");
			
 
				+        sb.append("\t */ \r\n");
			
 
				+        sb.append("\t@RequestMapping(value = \"/del\", method = RequestMethod.POST)\r\n");
			
 
				+        sb.append("\t@ResponseBody\r\n");
			
 
				+        sb.append("\tpublic Result delete" + upTableName + "(@RequestParam(required = true, value = \"" + StringUtil.underlineToCamel(pkName) + "\") String " + StringUtil.underlineToCamel(pkName) + ") {\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+        sb.append("\t\tboolean num = " + downTableName + "Service.delete" + upTableName + "(" + StringUtil.underlineToCamel(pkName) + ");\r\n");
			
 
				+        sb.append("\t\tif (num) {\r\n");
			
 
				+        sb.append("\t\t\treturn new Result(true, \"删除成功\");\r\n");
			
 
				+        sb.append("\t\t}\r\n");
			
 
				+        sb.append("\t\treturn new Result(false, \"删除异常\");\r\n");
			
 
				+        sb.append("\t}\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+
			
 
				+        sb.append("}\r\n");
			
 
				+
			
 
				+        return sb.toString();
			
 
				+
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    private static void createModelFile(TableParams tableParams, String[] colnames, String[] colTypes) {
			
 
				+        String modelContent = parseModel(colnames, colTypes, tableParams);
			
 
				+
			
 
				+        try {
			
 
				+            File directory = new File("");
			
 
				+
			
 
				+            String fileName = directory.getAbsolutePath() + "/src/" + changeToFolder(tableParams.getModelTargetPackage()) + StringUtil.initcap(tableParams.getTabelName()) + ".java";
			
 
				+            System.out.println("文件路径：" + fileName);
			
 
				+            FileWriter fw = new FileWriter(fileName);
			
 
				+            PrintWriter pw = new PrintWriter(fw);
			
 
				+            pw.println(modelContent);
			
 
				+            pw.flush();
			
 
				+            pw.close();
			
 
				+        } catch (IOException e) {
			
 
				+            e.printStackTrace();
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    public static String changeToFolder(String packageName) {
			
 
				+
			
 
				+        return packageName.replaceAll("\\.", "\\/") + "/";
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 功能：生成实体类主体代码
			
 
				+     *
			
 
				+     * @return
			
 
				+     */
			
 
				+    public static String parseModel(String[] colnames, String[] colTypes, TableParams tableParams) {
			
 
				+        StringBuffer sb = new StringBuffer();
			
 
				+
			
 
				+
			
 
				+        sb.append("package " + tableParams.getModelTargetPackage() + ";\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        //判断是否导入工具包
			
 
				+        if (f_util) {
			
 
				+            sb.append("import java.util.*;\r\n");
			
 
				+        }
			
 
				+        if (f_sql) {
			
 
				+            sb.append("import java.sql.*;\r\n");
			
 
				+        }
			
 
				+
			
 
				+        if (f_math) {
			
 
				+            sb.append("import java.math.*;\r\n");
			
 
				+        }
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        sb.append("import org.codehaus.jackson.annotate.JsonAutoDetect;\r\n");
			
 
				+        sb.append("import org.codehaus.jackson.map.annotate.JsonSerialize;\r\n");
			
 
				+
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        //注释部分
			
 
				+        sb.append("/**\r\n");
			
 
				+        sb.append(" * " + tableParams.getTabelName() + " 实体类\r\n");
			
 
				+        sb.append(" * " + new Date() + "  Suo Chen Cheng\r\n");
			
 
				+        sb.append(" */ \r\n");
			
 
				+
			
 
				+        //注解
			
 
				+        sb.append("@JsonAutoDetect\r\n");
			
 
				+        sb.append("@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)\r\n");
			
 
				+
			
 
				+        //实体部分
			
 
				+        sb.append("public class " + StringUtil.initcap(tableParams.getTabelName()) + "{\r\n");
			
 
				+        sb.append("\r\n");
			
 
				+
			
 
				+        processModelAllAttrs(sb, colnames, colTypes);//属性
			
 
				+        processModelAllMethod(sb, colnames, colTypes);//get set方法
			
 
				+        sb.append("}\r\n");
			
 
				+
			
 
				+        //System.out.println(sb.toString());
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 功能：生成所有属性
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     */
			
 
				+    public static void processModelAllAttrs(StringBuffer sb, String[] colnames, String[] colTypes) {
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+            sb.append("\tprivate " + StringUtil.sqlType2JavaType(colTypes[i]) + " " + StringUtil.underlineToCamel(colnames[i]) + ";\r\n\r\n");
			
 
				+        }
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 功能：生成所有方法
			
 
				+     *
			
 
				+     * @param sb
			
 
				+     */
			
 
				+    public static void processModelAllMethod(StringBuffer sb, String[] colnames, String[] colTypes) {
			
 
				+
			
 
				+        for (int i = 0; i < colnames.length; i++) {
			
 
				+            sb.append("\tpublic void set" + StringUtil.initcap(colnames[i]) + "(" + StringUtil.sqlType2JavaType(colTypes[i]) + " " +
			
 
				+                    StringUtil.underlineToCamel(colnames[i]) + "){\r\n");
			
 
				+            sb.append("\t\tthis." + StringUtil.underlineToCamel(colnames[i]) + "=" + StringUtil.underlineToCamel(colnames[i]) + ";\r\n");
			
 
				+            sb.append("\t}\r\n\r\n");
			
 
				+            sb.append("\tpublic " + StringUtil.sqlType2JavaType(colTypes[i]) + " get" + StringUtil.initcap(colnames[i]) + "(){\r\n");
			
 
				+            sb.append("\t\treturn " + StringUtil.underlineToCamel(colnames[i]) + ";\r\n");
			
 
				+            sb.append("\t}\r\n\r\n");
			
 
				+        }
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+}
			
--- a/src/zouma/frame/gen/JdbcConfig.java
+++ b/src/zouma/frame/gen/JdbcConfig.java
@@ -2,9 +2,13 @@ package zouma.frame.gen;
 
				 
			
 
				 public abstract interface JdbcConfig
			
 
				 {
			
 
				-  public static final String URL = "jdbc:mysql://rm-bp14x23t9lalb9ftio.mysql.rds.aliyuncs.com/house_source";
			
 
				-  public static final String NAME = "huabangyun";
			
 
				-  public static final String PASS = "NJhby2017";
			
 
				+//  public static final String URL = "jdbc:mysql://rm-bp14x23t9lalb9ftio.mysql.rds.aliyuncs.com/house_source";
			
 
				+//  public static final String NAME = "huabangyun";
			
 
				+//  public static final String PASS = "NJhby2017";
			
 
				+//  public static final String DRIVER = "com.mysql.jdbc.Driver";
			
 
				+  public static final String URL = "jdbc:mysql://120.55.61.140:3306/house_source?characterEncoding=utf-8";
			
 
				+  public static final String NAME = "root";
			
 
				+  public static final String PASS = "030503";
			
 
				   public static final String DRIVER = "com.mysql.jdbc.Driver";
			
 
				 }
			
 
				 
			
--- a/src/zouma/frame/gen/RunTool.java
+++ b/src/zouma/frame/gen/RunTool.java
@@ -1,50 +1,62 @@
 
				-/*    */ package zouma.frame.gen;
			
 
				-/*    */ 
			
 
				-/*    */ import java.util.ArrayList;
			
 
				-/*    */ import java.util.List;
			
 
				-/*    */ 
			
 
				-/*    */ public class RunTool
			
 
				-/*    */ {
			
 
				-/*    */   public static void main(String[] args)
			
 
				-/*    */   {
			
 
				-/* 18 */     List tableNames = new ArrayList();
			
 
				-/* 19 */     tableNames.add("rent_info");
			
 
				-/*    */ 
			
 
				-/* 22 */     for (int i = 0; i < tableNames.size(); i++) {
			
 
				-/* 23 */       TableParams tableParams = new TableParams();
			
 
				-/*    */ 
			
 
				-/* 25 */       tableParams.setTabelName((String)tableNames.get(i));
			
 
				-/*    */ 
			
 
				-/* 27 */       tableParams.setModelTargetPackage("com.suyuan.model");
			
 
				-/*    */ 
			
 
				-/* 29 */       tableParams.setDaoTargetPackage("com.suyuan.dao");
			
 
				-/*    */ 
			
 
				-/* 31 */       tableParams.setServiceTargetPackage("com.suyuan.service");
			
 
				-/*    */ 
			
 
				-/* 33 */       tableParams.setImplTargetPackage("com.suyuan.service.impl");
			
 
				-/*    */ 
			
 
				-/* 35 */       tableParams.setControllerTargetPackage("com.suyuan.web");
			
 
				-/*    */ 
			
 
				-/* 38 */       tableParams.setBasePackage("com.suyuan");
			
 
				-/*    */ 
			
 
				-/* 41 */       tableParams.setJspTargetPackage("Web.WEB-INF.jsp.newAdmin");
			
 
				-/*    */ 
			
 
				-/* 44 */       tableParams.setModelFlag(false);
			
 
				-/*    */ 
			
 
				-/* 46 */       tableParams.setDaoFlag(true);
			
 
				-/*    */ 
			
 
				-/* 48 */       tableParams.setServiceFlag(false);
			
 
				-/*    */ 
			
 
				-/* 51 */       tableParams.setControllerFlag(false);
			
 
				-/*    */ 
			
 
				-/* 54 */       tableParams.setJspFlag(false);
			
 
				-/*    */ 
			
 
				-/* 57 */       GenEntity.GenAll(tableParams);
			
 
				-/*    */     }
			
 
				-/*    */   }
			
 
				-/*    */ }
			
 
				-
			
 
				-/* Location:           C:\Users\Administrator\Desktop\新建文件夹\WEB-INF\classes\
			
 
				- * Qualified Name:     zouma.frame.gen.RunTool
			
 
				- * JD-Core Version:    0.6.2
			
 
				- */
			
 
				+package zouma.frame.gen;
			
 
				+
			
 
				+import java.util.ArrayList;
			
 
				+import java.util.List;
			
 
				+
			
 
				+public class RunTool {
			
 
				+
			
 
				+    /**
			
 
				+     * 出口
			
 
				+     * TODO
			
 
				+     *
			
 
				+     * @param args
			
 
				+     */
			
 
				+    public static void main(String[] args) {
			
 
				+
			
 
				+
			
 
				+        //表名
			
 
				+        List<String> tableNames = new ArrayList<>();
			
 
				+        tableNames.add("pay_type_info");
			
 
				+        //tableNames.add("gen_test_table");
			
 
				+
			
 
				+        for (int i = 0; i < tableNames.size(); i++) {
			
 
				+            TableParams tableParams = new TableParams();
			
 
				+
			
 
				+            tableParams.setTabelName(tableNames.get(i));
			
 
				+            //model路径
			
 
				+            tableParams.setModelTargetPackage("com.suyuan.model");
			
 
				+            //dao路径
			
 
				+            tableParams.setDaoTargetPackage("com.suyuan.dao");
			
 
				+            //service 路径
			
 
				+            tableParams.setServiceTargetPackage("com.suyuan.service");
			
 
				+            //service实现 路径
			
 
				+            tableParams.setImplTargetPackage("com.suyuan.service.impl");
			
 
				+            //controller 路径
			
 
				+            tableParams.setControllerTargetPackage("com.suyuan.web");
			
 
				+
			
 
				+            //base 路径
			
 
				+            tableParams.setBasePackage("com.suyuan");
			
 
				+
			
 
				+            //jsp 路径
			
 
				+            tableParams.setJspTargetPackage("WebRoot.WEB-INF.jsp.newAdmin");
			
 
				+
			
 
				+            //model 开关
			
 
				+            tableParams.setModelFlag(true);
			
 
				+            //dao 开关
			
 
				+            tableParams.setDaoFlag(true);
			
 
				+            //service 开关
			
 
				+            tableParams.setServiceFlag(true);
			
 
				+
			
 
				+            //controller开关
			
 
				+            tableParams.setControllerFlag(true);
			
 
				+
			
 
				+            //jsp开关
			
 
				+            tableParams.setJspFlag(true);
			
 
				+
			
 
				+            //执行方法
			
 
				+            GenEntity.GenAll(tableParams);
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+    }
			
 
				+}
			
--- a/src/zouma/frame/gen/TableParams.java
+++ b/src/zouma/frame/gen/TableParams.java
@@ -1,131 +1,170 @@
 
				-/*     */ package zouma.frame.gen;
			
 
				-/*     */ 
			
 
				-/*     */ public class TableParams
			
 
				-/*     */ {
			
 
				-/*     */   private String tabelName;
			
 
				-/*     */   private String modelTargetPackage;
			
 
				-/*     */   private String daoTargetPackage;
			
 
				-/*     */   private String serviceTargetPackage;
			
 
				-/*     */   private String implTargetPackage;
			
 
				-/*     */   private String controllerTargetPackage;
			
 
				-/*     */   private String jspTargetPackage;
			
 
				-/*     */   private String basePackage;
			
 
				-/*  48 */   private boolean modelFlag = true;
			
 
				-/*     */ 
			
 
				-/*  53 */   private boolean daoFlag = true;
			
 
				-/*     */ 
			
 
				-/*  58 */   private boolean serviceFlag = true;
			
 
				-/*     */ 
			
 
				-/*  63 */   private boolean controllerFlag = true;
			
 
				-/*     */ 
			
 
				-/*  65 */   private boolean jspFlag = true;
			
 
				-/*     */ 
			
 
				-/*     */   public String getTabelName() {
			
 
				-/*  68 */     return this.tabelName;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setTabelName(String tabelName) {
			
 
				-/*  72 */     this.tabelName = tabelName;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getModelTargetPackage() {
			
 
				-/*  76 */     return this.modelTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setModelTargetPackage(String modelTargetPackage) {
			
 
				-/*  80 */     this.modelTargetPackage = modelTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getDaoTargetPackage() {
			
 
				-/*  84 */     return this.daoTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setDaoTargetPackage(String daoTargetPackage) {
			
 
				-/*  88 */     this.daoTargetPackage = daoTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getServiceTargetPackage() {
			
 
				-/*  92 */     return this.serviceTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setServiceTargetPackage(String serviceTargetPackage) {
			
 
				-/*  96 */     this.serviceTargetPackage = serviceTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getImplTargetPackage() {
			
 
				-/* 100 */     return this.implTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setImplTargetPackage(String implTargetPackage) {
			
 
				-/* 104 */     this.implTargetPackage = implTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getControllerTargetPackage() {
			
 
				-/* 108 */     return this.controllerTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setControllerTargetPackage(String controllerTargetPackage) {
			
 
				-/* 112 */     this.controllerTargetPackage = controllerTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public boolean isModelFlag() {
			
 
				-/* 116 */     return this.modelFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setModelFlag(boolean modelFlag) {
			
 
				-/* 120 */     this.modelFlag = modelFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public boolean isDaoFlag() {
			
 
				-/* 124 */     return this.daoFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setDaoFlag(boolean daoFlag) {
			
 
				-/* 128 */     this.daoFlag = daoFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public boolean isServiceFlag() {
			
 
				-/* 132 */     return this.serviceFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setServiceFlag(boolean serviceFlag) {
			
 
				-/* 136 */     this.serviceFlag = serviceFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public boolean isControllerFlag() {
			
 
				-/* 140 */     return this.controllerFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setControllerFlag(boolean controllerFlag) {
			
 
				-/* 144 */     this.controllerFlag = controllerFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getBasePackage() {
			
 
				-/* 148 */     return this.basePackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setBasePackage(String basePackage) {
			
 
				-/* 152 */     this.basePackage = basePackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public String getJspTargetPackage() {
			
 
				-/* 156 */     return this.jspTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setJspTargetPackage(String jspTargetPackage) {
			
 
				-/* 160 */     this.jspTargetPackage = jspTargetPackage;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public boolean isJspFlag() {
			
 
				-/* 164 */     return this.jspFlag;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public void setJspFlag(boolean jspFlag) {
			
 
				-/* 168 */     this.jspFlag = jspFlag;
			
 
				-/*     */   }
			
 
				-/*     */ }
			
 
				-
			
 
				-/* Location:           C:\Users\Administrator\Desktop\新建文件夹\WEB-INF\classes\
			
 
				- * Qualified Name:     zouma.frame.gen.TableParams
			
 
				- * JD-Core Version:    0.6.2
			
 
				- */
			
 
				+package zouma.frame.gen;
			
 
				+
			
 
				+public class TableParams {
			
 
				+
			
 
				+    /**
			
 
				+     * 表名
			
 
				+     */
			
 
				+    private String tabelName;
			
 
				+
			
 
				+    /**
			
 
				+     * model 实例对象包名 （com.xxx.xxxx）
			
 
				+     */
			
 
				+    private String modelTargetPackage;
			
 
				+
			
 
				+    /**
			
 
				+     * dao 数据库层包名
			
 
				+     */
			
 
				+    private String daoTargetPackage;
			
 
				+
			
 
				+    /**
			
 
				+     * service 服务包名
			
 
				+     */
			
 
				+    private String serviceTargetPackage;
			
 
				+
			
 
				+    /**
			
 
				+     * service 实现包名
			
 
				+     */
			
 
				+    private String implTargetPackage;
			
 
				+
			
 
				+    /**
			
 
				+     * controller 控制类
			
 
				+     */
			
 
				+    private String controllerTargetPackage;
			
 
				+
			
 
				+    /**
			
 
				+     * 后台管理jsp
			
 
				+     */
			
 
				+    private String jspTargetPackage;
			
 
				+
			
 
				+    /**
			
 
				+     * 基础包  "com.xxx"
			
 
				+     */
			
 
				+    private String basePackage;
			
 
				+
			
 
				+    /**
			
 
				+     * model开个，默认开
			
 
				+     */
			
 
				+    private boolean modelFlag = true;
			
 
				+
			
 
				+    /**
			
 
				+     * dao开个，默认开
			
 
				+     */
			
 
				+    private boolean daoFlag = true;
			
 
				+
			
 
				+    /**
			
 
				+     * service开个，默认开
			
 
				+     */
			
 
				+    private boolean serviceFlag = true;
			
 
				+
			
 
				+    /**
			
 
				+     * controller开个，默认开
			
 
				+     */
			
 
				+    private boolean controllerFlag = true;
			
 
				+
			
 
				+    private boolean jspFlag = true;
			
 
				+
			
 
				+    public String getTabelName() {
			
 
				+        return tabelName;
			
 
				+    }
			
 
				+
			
 
				+    public void setTabelName(String tabelName) {
			
 
				+        this.tabelName = tabelName;
			
 
				+    }
			
 
				+
			
 
				+    public String getModelTargetPackage() {
			
 
				+        return modelTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setModelTargetPackage(String modelTargetPackage) {
			
 
				+        this.modelTargetPackage = modelTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public String getDaoTargetPackage() {
			
 
				+        return daoTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setDaoTargetPackage(String daoTargetPackage) {
			
 
				+        this.daoTargetPackage = daoTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public String getServiceTargetPackage() {
			
 
				+        return serviceTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setServiceTargetPackage(String serviceTargetPackage) {
			
 
				+        this.serviceTargetPackage = serviceTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public String getImplTargetPackage() {
			
 
				+        return implTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setImplTargetPackage(String implTargetPackage) {
			
 
				+        this.implTargetPackage = implTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public String getControllerTargetPackage() {
			
 
				+        return controllerTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setControllerTargetPackage(String controllerTargetPackage) {
			
 
				+        this.controllerTargetPackage = controllerTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public boolean isModelFlag() {
			
 
				+        return modelFlag;
			
 
				+    }
			
 
				+
			
 
				+    public void setModelFlag(boolean modelFlag) {
			
 
				+        this.modelFlag = modelFlag;
			
 
				+    }
			
 
				+
			
 
				+    public boolean isDaoFlag() {
			
 
				+        return daoFlag;
			
 
				+    }
			
 
				+
			
 
				+    public void setDaoFlag(boolean daoFlag) {
			
 
				+        this.daoFlag = daoFlag;
			
 
				+    }
			
 
				+
			
 
				+    public boolean isServiceFlag() {
			
 
				+        return serviceFlag;
			
 
				+    }
			
 
				+
			
 
				+    public void setServiceFlag(boolean serviceFlag) {
			
 
				+        this.serviceFlag = serviceFlag;
			
 
				+    }
			
 
				+
			
 
				+    public boolean isControllerFlag() {
			
 
				+        return controllerFlag;
			
 
				+    }
			
 
				+
			
 
				+    public void setControllerFlag(boolean controllerFlag) {
			
 
				+        this.controllerFlag = controllerFlag;
			
 
				+    }
			
 
				+
			
 
				+    public String getBasePackage() {
			
 
				+        return basePackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setBasePackage(String basePackage) {
			
 
				+        this.basePackage = basePackage;
			
 
				+    }
			
 
				+
			
 
				+    public String getJspTargetPackage() {
			
 
				+        return jspTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public void setJspTargetPackage(String jspTargetPackage) {
			
 
				+        this.jspTargetPackage = jspTargetPackage;
			
 
				+    }
			
 
				+
			
 
				+    public boolean isJspFlag() {
			
 
				+        return jspFlag;
			
 
				+    }
			
 
				+
			
 
				+    public void setJspFlag(boolean jspFlag) {
			
 
				+        this.jspFlag = jspFlag;
			
 
				+    }
			
 
				+}
			
--- a/src/zouma/frame/util/StringUtil.java
+++ b/src/zouma/frame/util/StringUtil.java
@@ -1,131 +1,158 @@
 
				-/*     */ package zouma.frame.util;
			
 
				-/*     */ 
			
 
				-/*     */ import java.io.PrintStream;
			
 
				-/*     */ import java.util.regex.Matcher;
			
 
				-/*     */ import java.util.regex.Pattern;
			
 
				-/*     */ 
			
 
				-/*     */ public class StringUtil
			
 
				-/*     */ {
			
 
				-/*     */   public static final char UNDERLINE = '_';
			
 
				-/*     */ 
			
 
				-/*     */   public static String camelToUnderline(String param)
			
 
				-/*     */   {
			
 
				-/*  17 */     if ((param == null) || ("".equals(param.trim()))) {
			
 
				-/*  18 */       return "";
			
 
				-/*     */     }
			
 
				-/*  20 */     int len = param.length();
			
 
				-/*  21 */     StringBuilder sb = new StringBuilder(len);
			
 
				-/*  22 */     for (int i = 0; i < len; i++) {
			
 
				-/*  23 */       char c = param.charAt(i);
			
 
				-/*  24 */       if (Character.isUpperCase(c)) {
			
 
				-/*  25 */         sb.append('_');
			
 
				-/*  26 */         sb.append(Character.toLowerCase(c));
			
 
				-/*     */       } else {
			
 
				-/*  28 */         sb.append(c);
			
 
				-/*     */       }
			
 
				-/*     */     }
			
 
				-/*  31 */     return sb.toString();
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public static String underlineToCamel(String param)
			
 
				-/*     */   {
			
 
				-/*  41 */     if ((param == null) || ("".equals(param.trim()))) {
			
 
				-/*  42 */       return "";
			
 
				-/*     */     }
			
 
				-/*  44 */     int len = param.length();
			
 
				-/*  45 */     StringBuilder sb = new StringBuilder(len);
			
 
				-/*  46 */     for (int i = 0; i < len; i++) {
			
 
				-/*  47 */       char c = param.charAt(i);
			
 
				-/*  48 */       if (c == '_') {
			
 
				-/*  49 */         i++; if (i < len)
			
 
				-/*  50 */           sb.append(Character.toUpperCase(param.charAt(i)));
			
 
				-/*     */       }
			
 
				-/*     */       else {
			
 
				-/*  53 */         sb.append(c);
			
 
				-/*     */       }
			
 
				-/*     */     }
			
 
				-/*  56 */     return sb.toString();
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public static String underlineToCamel2(String param)
			
 
				-/*     */   {
			
 
				-/*  66 */     if ((param == null) || ("".equals(param.trim()))) {
			
 
				-/*  67 */       return "";
			
 
				-/*     */     }
			
 
				-/*  69 */     StringBuilder sb = new StringBuilder(param);
			
 
				-/*  70 */     Matcher mc = Pattern.compile("_").matcher(param);
			
 
				-/*  71 */     int i = 0;
			
 
				-/*  72 */     while (mc.find()) {
			
 
				-/*  73 */       int position = mc.end() - i++;
			
 
				-/*  74 */       sb.replace(position - 1, position + 1, sb.substring(position, position + 1).toUpperCase());
			
 
				-/*     */     }
			
 
				-/*  76 */     return sb.toString();
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public static void main(String[] args) {
			
 
				-/*  80 */     String aaa = "app_version_fld";
			
 
				-/*  81 */     System.out.println(underlineToCamel(aaa));
			
 
				-/*  82 */     System.out.println(underlineToCamel2(aaa));
			
 
				-/*  83 */     aaa = "appVersionFld";
			
 
				-/*  84 */     System.out.println(camelToUnderline(aaa));
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public static String initcap(String str)
			
 
				-/*     */   {
			
 
				-/*  97 */     str = underlineToCamel(str);
			
 
				-/*  98 */     char[] ch = str.toCharArray();
			
 
				-/*  99 */     if ((ch[0] >= 'a') && (ch[0] <= 'z')) {
			
 
				-/* 100 */       ch[0] = ((char)(ch[0] - ' '));
			
 
				-/*     */     }
			
 
				-/*     */ 
			
 
				-/* 103 */     return new String(ch);
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public static String sqlType2JavaType(String sqlType)
			
 
				-/*     */   {
			
 
				-/* 115 */     if (sqlType.equalsIgnoreCase("bit"))
			
 
				-/* 116 */       return "Boolean";
			
 
				-/* 117 */     if (sqlType.equalsIgnoreCase("tinyint"))
			
 
				-/* 118 */       return "byte";
			
 
				-/* 119 */     if (sqlType.equalsIgnoreCase("smallint"))
			
 
				-/* 120 */       return "short";
			
 
				-/* 121 */     if (sqlType.equalsIgnoreCase("int"))
			
 
				-/* 122 */       return "Integer";
			
 
				-/* 123 */     if (sqlType.equalsIgnoreCase("bigint"))
			
 
				-/* 124 */       return "Long";
			
 
				-/* 125 */     if (sqlType.equalsIgnoreCase("float"))
			
 
				-/* 126 */       return "Double";
			
 
				-/* 127 */     if ((sqlType.equalsIgnoreCase("decimal")) || (sqlType.equalsIgnoreCase("numeric")) || 
			
 
				-/* 128 */       (sqlType.equalsIgnoreCase("real")) || (sqlType.equalsIgnoreCase("money")) || 
			
 
				-/* 129 */       (sqlType.equalsIgnoreCase("smallmoney"))) {
			
 
				-/* 130 */       return "BigDecimal";
			
 
				-/*     */     }
			
 
				-/* 132 */     if ((sqlType.equalsIgnoreCase("varchar")) || (sqlType.equalsIgnoreCase("char")) || 
			
 
				-/* 133 */       (sqlType.equalsIgnoreCase("nvarchar")) || (sqlType.equalsIgnoreCase("nchar")) || 
			
 
				-/* 134 */       (sqlType.equalsIgnoreCase("text")))
			
 
				-/* 135 */       return "String";
			
 
				-/* 136 */     if ((sqlType.equalsIgnoreCase("datetime")) || (sqlType.equalsIgnoreCase("timestamp"))) {
			
 
				-/* 137 */       return "Date";
			
 
				-/*     */     }
			
 
				-/* 139 */     if (sqlType.equalsIgnoreCase("image")) {
			
 
				-/* 140 */       return "Blod";
			
 
				-/*     */     }
			
 
				-/*     */ 
			
 
				-/* 143 */     return sqlType;
			
 
				-/*     */   }
			
 
				-/*     */ 
			
 
				-/*     */   public static String sqlType2JdbcType(String sqlType)
			
 
				-/*     */   {
			
 
				-/* 149 */     if (sqlType.equalsIgnoreCase("int"))
			
 
				-/* 150 */       return "INTEGER";
			
 
				-/* 151 */     if (sqlType.equalsIgnoreCase("datetime")) {
			
 
				-/* 152 */       return "TIMESTAMP";
			
 
				-/*     */     }
			
 
				-/* 154 */     return sqlType;
			
 
				-/*     */   }
			
 
				-/*     */ }
			
 
				-
			
 
				-/* Location:           C:\Users\Administrator\Desktop\新建文件夹\WEB-INF\classes\
			
 
				- * Qualified Name:     zouma.frame.util.StringUtil
			
 
				- * JD-Core Version:    0.6.2
			
 
				- */
			
 
				+package zouma.frame.util;
			
 
				+
			
 
				+import java.util.regex.Matcher;
			
 
				+import java.util.regex.Pattern;
			
 
				+
			
 
				+public class StringUtil {
			
 
				+
			
 
				+    public static final char UNDERLINE = '_';
			
 
				+
			
 
				+    /**
			
 
				+     * 驼峰格式字符串转换为下划线格式字符串
			
 
				+     *
			
 
				+     * @param param
			
 
				+     * @return
			
 
				+     */
			
 
				+    public static String camelToUnderline(String param) {
			
 
				+        if (param == null || "".equals(param.trim())) {
			
 
				+            return "";
			
 
				+        }
			
 
				+        int len = param.length();
			
 
				+        StringBuilder sb = new StringBuilder(len);
			
 
				+        for (int i = 0; i < len; i++) {
			
 
				+            char c = param.charAt(i);
			
 
				+            if (Character.isUpperCase(c)) {
			
 
				+                sb.append(UNDERLINE);
			
 
				+                sb.append(Character.toLowerCase(c));
			
 
				+            } else {
			
 
				+                sb.append(c);
			
 
				+            }
			
 
				+        }
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 下划线格式字符串转换为驼峰格式字符串
			
 
				+     *
			
 
				+     * @param param
			
 
				+     * @return
			
 
				+     */
			
 
				+    public static String underlineToCamel(String param) {
			
 
				+        if (param == null || "".equals(param.trim())) {
			
 
				+            return "";
			
 
				+        }
			
 
				+        int len = param.length();
			
 
				+        StringBuilder sb = new StringBuilder(len);
			
 
				+        for (int i = 0; i < len; i++) {
			
 
				+            char c = param.charAt(i);
			
 
				+            if (c == UNDERLINE) {
			
 
				+                if (++i < len) {
			
 
				+                    sb.append(Character.toUpperCase(param.charAt(i)));
			
 
				+                }
			
 
				+            } else {
			
 
				+                sb.append(c);
			
 
				+            }
			
 
				+        }
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    /**
			
 
				+     * 下划线格式字符串转换为驼峰格式字符串2
			
 
				+     *
			
 
				+     * @param param
			
 
				+     * @return
			
 
				+     */
			
 
				+    public static String underlineToCamel2(String param) {
			
 
				+        if (param == null || "".equals(param.trim())) {
			
 
				+            return "";
			
 
				+        }
			
 
				+        StringBuilder sb = new StringBuilder(param);
			
 
				+        Matcher mc = Pattern.compile("_").matcher(param);
			
 
				+        int i = 0;
			
 
				+        while (mc.find()) {
			
 
				+            int position = mc.end() - (i++);
			
 
				+            sb.replace(position - 1, position + 1, sb.substring(position, position + 1).toUpperCase());
			
 
				+        }
			
 
				+        return sb.toString();
			
 
				+    }
			
 
				+
			
 
				+    public static void main(String[] args) {
			
 
				+        String aaa = "app_version_fld";
			
 
				+        System.out.println(underlineToCamel(aaa));
			
 
				+        System.out.println(underlineToCamel2(aaa));
			
 
				+        aaa = "appVersionFld";
			
 
				+        System.out.println(camelToUnderline(aaa));
			
 
				+
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /**
			
 
				+     * 功能：将输入字符串的首字母改成大写
			
 
				+     *
			
 
				+     * @param str
			
 
				+     * @return
			
 
				+     */
			
 
				+    public static String initcap(String str) {
			
 
				+
			
 
				+        str = underlineToCamel(str);
			
 
				+        char[] ch = str.toCharArray();
			
 
				+        if (ch[0] >= 'a' && ch[0] <= 'z') {
			
 
				+            ch[0] = (char) (ch[0] - 32);
			
 
				+        }
			
 
				+
			
 
				+        return new String(ch);
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    /**
			
 
				+     * 功能：获得列的数据类型
			
 
				+     *
			
 
				+     * @param sqlType
			
 
				+     * @return
			
 
				+     */
			
 
				+    public static String sqlType2JavaType(String sqlType) {
			
 
				+
			
 
				+        if (sqlType.equalsIgnoreCase("bit")) {
			
 
				+            return "Boolean";
			
 
				+        } else if (sqlType.equalsIgnoreCase("tinyint")) {
			
 
				+            return "byte";
			
 
				+        } else if (sqlType.equalsIgnoreCase("smallint")) {
			
 
				+            return "short";
			
 
				+        } else if (sqlType.equalsIgnoreCase("int")) {
			
 
				+            return "Integer";
			
 
				+        } else if (sqlType.equalsIgnoreCase("bigint")) {
			
 
				+            return "Long";
			
 
				+        } else if (sqlType.equalsIgnoreCase("float")) {
			
 
				+            return "Double";
			
 
				+        } else if (sqlType.equalsIgnoreCase("decimal") || sqlType.equalsIgnoreCase("numeric")
			
 
				+                || sqlType.equalsIgnoreCase("real") || sqlType.equalsIgnoreCase("money")
			
 
				+                || sqlType.equalsIgnoreCase("smallmoney")) {
			
 
				+            return "BigDecimal";
			
 
				+
			
 
				+        } else if (sqlType.equalsIgnoreCase("varchar") || sqlType.equalsIgnoreCase("char")
			
 
				+                || sqlType.equalsIgnoreCase("nvarchar") || sqlType.equalsIgnoreCase("nchar")
			
 
				+                || sqlType.equalsIgnoreCase("text")) {
			
 
				+            return "String";
			
 
				+        } else if (sqlType.equalsIgnoreCase("datetime") || sqlType.equalsIgnoreCase("timestamp")) {
			
 
				+            return "Date";
			
 
				+
			
 
				+        } else if (sqlType.equalsIgnoreCase("image")) {
			
 
				+            return "Blod";
			
 
				+        }
			
 
				+
			
 
				+        return sqlType;
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    public static String sqlType2JdbcType(String sqlType) {
			
 
				+
			
 
				+        if (sqlType.equalsIgnoreCase("int")) {
			
 
				+            return "INTEGER";
			
 
				+        } else if (sqlType.equalsIgnoreCase("datetime")) {
			
 
				+            return "TIMESTAMP";
			
 
				+        }
			
 
				+        return sqlType;
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+}