shiyj
2019-07-16 6d8a43de07062234a05716fcbb94273709cab21e
Merge branch 'master' of https://github.com/java110/MicroCommunity
11个文件已添加
62个文件已修改
1个文件已删除
1158 ■■■■ 已修改文件
OrderService/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/app-manage/appManage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/breadcrumb/breadcrumb.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/breadcrumb/breadcrumb.js 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/community-manage/communityManage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/enter-community/enterCommunity.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/floor/listFloor.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/list-demo/listDemo.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/list-owner-member/listOwnerMember.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/list-owner/listOwner.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/list-parking-space/listParkingSpace.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/list_business_type/listBusinessType.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/mapping-manage/mappingManage.html 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/mapping-manage/mappingManage.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/menu/menu.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/notice-manage/noticeManage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/owner-parking-space/ownerParkingSpace.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/owner-room/ownerRoom.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/parkingSpace-fee/parkingSpaceFee.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/property-fee/propertyFee.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/room/room.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/sell-car/sellCar.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/sell-room/sellRoom.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/service-binding/serviceBinding.css 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/service-binding/serviceBinding.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/service-binding/serviceBinding.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/service-manage/serviceManage.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/service-manage/serviceManage.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/staff-privilege/staffPrivilege.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/unit/unit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/view-app-info/viewAppInfo.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/view-app-info/viewAppInfo.js 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/static/css/common.css 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/static/css/jquery.step.css 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/static/js/core.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/static/js/jquery.step.min.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/appFlow.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/businessTypeFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/communityFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/demoFlow.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/demoStudyFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/enterCommunity.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/floorFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/hireParkingSpaceFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/mappingFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/noticeFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/ownerFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/ownerMemberFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/ownerParkingSpaceFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/ownerRoomFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/parkingSpaceFeeConfigFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/parkingSpaceFeeFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/parkingSpaceFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/privilege.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/propertyFeeConfigFlow.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/propertyFeeFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/roomFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/sellOwnerCarFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/sellRoomFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/serviceBindingFlow.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/serviceFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/staff.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/staffPrivilege.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/views/unitFlow.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/java/com/java110/code/BaseGenerator.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/resources/web/manage/manage.html 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/resources/web/manage/manage.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/resources/web/template_1.json 150 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/resources/web/template_mapping.json 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-code-generator/src/main/resources/web/template_service.json 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/mapping/MappingServiceDaoImplMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OrderService/pom.xml
@@ -11,7 +11,7 @@
    <artifactId>OrderService</artifactId>
    <name>CenterService</name>
    <name>OrderService</name>
    <!-- FIXME change it to the project's website -->
    <url>http://maven.apache.org</url>
WebService/src/main/resources/components/app-manage/appManage.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/breadcrumb/breadcrumb.html
New file
@@ -0,0 +1,19 @@
<div id="breadcrumb" class="border-bottom white-bg page-heading">
    <div class="row">
        <div class="col-lg-12" style="margin-left: 5px;">
            <h2>{{breadCrumbs.length > 0 ? breadCrumbs[breadCrumbs.length-1].pageName : ''}}</h2>
            <ol class="breadcrumb">
                <li class="breadcrumb-item">
                    <a href="/">首页</a>
                </li>
                <li class="breadcrumb-item" v-for="breadCrumb in breadCrumbs">
                    <span v-if="breadCrumb.parentPageName == ''">
                        {{breadCrumb.pageName}}
                    </span>
                    <strong v-if="breadCrumb.parentPageName != ''">{{breadCrumb.pageName}}</strong>
                </li>
            </ol>
        </div>
    </div>
</div>
WebService/src/main/resources/components/breadcrumb/breadcrumb.js
New file
@@ -0,0 +1,68 @@
/**
    菜单 处理
**/
(function(vc){
    var vm = new Vue({
       el:'#breadcrumb',
       data:{
                breadCrumbs:[]
       },
       mounted:function(){
           this._freshBreadCrumbByUrl();
       },
       methods:{
           _freshBreadCrumbByUrl:function(){
                var _tmpMenus = vc.getMenus();
                var _url = vc.getUrl();
                /**
                    正常情况下是走不到这里的,
                    因为系统登录时,就已经加载菜单信息缓存到本地了
                **/
                if(_tmpMenus == null || _tmpMenus == undefined){
                    return ;
                }
                for(var menuIndex =0 ; menuIndex < _tmpMenus.length;menuIndex ++){
                    //两层结构的情况
                    if(_tmpMenus[menuIndex].hasOwnProperty('childs')){
                        var _childs = _tmpMenus[menuIndex].childs;
                        for(var _childIndex = 0; _childIndex < _childs.length; _childIndex ++){
                            if(this._getRealUrl(_childs[_childIndex].href) == _url){
                                var _tmpBreadCrumbInf = {
                                    parentPageName: "",
                                    pageName: _tmpMenus[menuIndex].name
                                };
                                this.breadCrumbs.push(_tmpBreadCrumbInf);
                                _tmpBreadCrumbInf = {
                                    parentPageName: _tmpMenus[menuIndex].name,
                                    pageName: _childs[_childIndex].name
                                };
                               this.breadCrumbs.push(_tmpBreadCrumbInf);
                                break;
                            }
                        }
                    }else{
                        if(this._getRealUrl(_tmpMenus[menuIndex].href) == url){
                            var _tmpBreadCrumbInf = {
                                parentPageName: "首页",
                                pageName: _tmpMenus[menuIndex].name
                            };
                            this.breadCrumbs.push(_tmpBreadCrumbInf);
                        }
                    }
                }
           },
            _getRealUrl:function(_url){
                if(_url.indexOf('?') != -1){
                    return _url.substring(0, _url.indexOf('?'));
                }
                return _url;
            }
       },
    });
})(window.vc)
WebService/src/main/resources/components/community-manage/communityManage.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component">
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/enter-community/enterCommunity.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/floor/listFloor.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="addCar"
               callBackComponent="hireParkingSpace"
@@ -59,7 +59,7 @@
        </div>
    </div>
    <div class="">
    <div style="height:50px">
        <button class="btn btn-primary float-right" type="button" v-on:click="doHireParkingSpace()" ><i class="fa fa-check"></i>&nbsp;我要出租</button>
    </div>
WebService/src/main/resources/components/list-demo/listDemo.html
@@ -1,4 +1,5 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <!-- class="wrapper wrapper-content animated fadeInRight ecommerce" -->
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/list-owner-member/listOwnerMember.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="memberSelectOwner"></vc:create>
    <div class="row">
        <div class="col-lg-12">
WebService/src/main/resources/components/list-owner/listOwner.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/list-parking-space/listParkingSpace.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/list_business_type/listBusinessType.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/mapping-manage/mappingManage.html
@@ -1,41 +1,60 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
                <div class="ibox-title">
                    <h5>编码映射信息</h5>
                    <div class="ibox-tools" style="top:10px;">
                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddMappingModal()">
                            <i class="glyphicon glyphicon-plus"></i>
                            添加编码映射
                        </button>
                        <form>
                            <div class="form-row">
                                <div class="col-8 input-group input-group-sm">
                                    <input type="text" placeholder="请填写名称" class=" form-control" v-model="mappingManageInfo.name">
                                    <div class="input-group-prepend">
                                        <button type="button" class="btn btn-primary btn-sm"  v-on:click="_queryMappingMethod()">
                                            <i class="glyphicon glyphicon-search"></i> 马上查询</button>
                                    </div>
                                </div>
                                <div class="col">
                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddMappingModal()">
                                        <i class="glyphicon glyphicon-plus"></i>
                                        添加编码映射
                                    </button>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
                <div class="ibox-content">
                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                    <table class="footable table table-stripped toggle-arrow-tiny"
                           data-page-size="15"
                           style="table-layout: fixed;word-break:break-all;"
                    >
                        <thead>
                        <tr>
                                                        <th>编码ID</th>
                            <th>域</th>
                            <th>名称</th>
                            <th>键</th>
                            <th>值</th>
                            <th>备注</th>
                            <th class="text-right">操作</th>
                            <th class="text-center">编码ID</th>
                            <th class="text-center">域</th>
                            <th class="text-center">名称</th>
                            <th class="text-center">键</th>
                            <th class="text-center">值</th>
                            <th class="text-center">备注</th>
                            <th class="text-center">操作</th>
                        </tr>
                        </thead>
                        <tbody>
                            <tr v-for="mapping in mappingManageInfo.mappings">
                                                            <td>{{mapping.id}}</td>
                            <td>{{mapping.domain}}</td>
                            <td>{{mapping.name}}</td>
                            <td>{{mapping.key}}</td>
                            <td>{{mapping.value}}</td>
                            <td>{{mapping.remark}}</td>
                            <td><div class="btn-group">
                            <td class="text-center">{{mapping.id}}</td>
                            <td class="text-center">{{mapping.domain}}</td>
                            <td class="text-center">{{mapping.name}}</td>
                            <td class="text-center">{{mapping.key}}</td>
                            <td class="text-center">{{mapping.value}}</td>
                            <td class="text-center">{{mapping.remark}}</td>
                            <td class="text-center"><div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openEditMappingModel(mapping)">修改</button>
                                </div>
                                <div class="btn-group">
WebService/src/main/resources/components/mapping-manage/mappingManage.js
@@ -8,6 +8,7 @@
        data:{
            mappingManageInfo:{
                mappings:[],
                name:'',
                total:0,
                records:1
            }
@@ -28,7 +29,8 @@
                var param = {
                    params:{
                        page:_page,
                        row:_rows
                        row:_rows,
                        name:vc.component.mappingManageInfo.name
                    }
               }
@@ -58,6 +60,10 @@
            },
            _openDeleteMappingModel:function(_mapping){
                vc.emit('deleteMapping','openDeleteMappingModal',_mapping);
            },
            _queryMappingMethod:function(){
                vc.component._listMappings(DEFAULT_PAGE, DEFAULT_ROWS);
            }
        }
    });
WebService/src/main/resources/components/menu/menu.js
@@ -16,6 +16,7 @@
                var _tmpMenus = vc.getMenus();
                //浏览器缓存中能获取到
                if(_tmpMenus != null && _tmpMenus != undefined){
                    this.miniMenu();
                    this.menus = _tmpMenus;
                    return ;
                }
@@ -41,6 +42,7 @@
                                var _currentMenusId = vc.getCurrentMenu() == null?_menus[0].id:vc.getCurrentMenu();
                                vm.menus = vm.refreshMenuActive(_menus,_currentMenusId);
                                vc.setMenus(vm.menus);
                                vm.miniMenu();
                             },function(errInfo,error){
                                console.log('请求失败处理');
                             }
@@ -78,7 +80,12 @@
                vc.setCurrentMenu(_id);
                vm.menus = vm.refreshMenuActive(vm.menus,_id);
                vc.setMenus(vm.menus);
           },
           miniMenu:function(){
                $("body").toggleClass("mini-navbar");
                //SmoothlyMenu();
           }
       },
    });
WebService/src/main/resources/components/notice-manage/noticeManage.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
WebService/src/main/resources/components/owner-parking-space/ownerParkingSpace.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="sellRoomSelectOwner"
               callBackComponent = "showOwnerParkingSpace"
    ></vc:create>
WebService/src/main/resources/components/owner-room/ownerRoom.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="sellRoomSelectOwner"
               callBackComponent = "showOwnerRoom"
    ></vc:create>
WebService/src/main/resources/components/parkingSpace-fee/parkingSpaceFee.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="viewMainParkingSpaceFee"
               feeName="停车费"
               payName="propertyPay"
WebService/src/main/resources/components/property-fee/propertyFee.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="viewMainFee"
               feeName="物业费"
               feeTypeCd="888800010001"
WebService/src/main/resources/components/room/room.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component">
    <vc:create name="roomSelectFloor"
               openAddRoomModelName="addRoom"
    ></vc:create>
WebService/src/main/resources/components/sell-car/sellCar.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="addCar"
               callBackComponent="sellCar"
@@ -42,7 +42,7 @@
        </div>
    </div>
    <div class="">
    <div style="height:50px">
        <button class="btn btn-primary float-right" type="button" v-on:click="doSellCar()" ><i class="fa fa-check"></i>&nbsp;我要售卖</button>
    </div>
WebService/src/main/resources/components/sell-room/sellRoom.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="sellRoomSelectOwner"
               callBackComponent = "sellRoom"
    ></vc:create>
@@ -9,7 +9,7 @@
    <vc:create name="sellRoomOther"
    ></vc:create>
    <div class="">
    <div style="height:50px">
        <button class="btn btn-primary float-right" type="button" v-on:click="doSellRoom()" ><i class="fa fa-check"></i>&nbsp;我要售卖</button>
    </div>
WebService/src/main/resources/components/service-binding/serviceBinding.css
New file
@@ -0,0 +1,8 @@
.wizard > .steps > ul > li {
    width: 33.33%;
}
.java110_step{
    width:80%;
    margin: 20px auto 50px auto;
}
WebService/src/main/resources/components/service-binding/serviceBinding.html
New file
@@ -0,0 +1,22 @@
<div id="component" >
    <div class="java110_step">
        <div id="step" ></div>
    </div>
    <!-- 选择 应用信息 -->
    <vc:create name="sellRoomSelectOwner"
               callBackComponent = "sellCar"
    ></vc:create>
    <div class="row">
        <div class="col-md-10"></div>
        <div class="col-md-2">
            <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
            <button type="button" class="btn btn-primary" style="margin-left:10px" v-on:click="_nextStep()">下一步</button>
        </div>
    </div>
</div>
WebService/src/main/resources/components/service-binding/serviceBinding.js
New file
@@ -0,0 +1,39 @@
/**
    入驻小区
**/
(function(vc){
    var DEFAULT_PAGE = 1;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data:{
            serviceBindingInfo:{
                $step:'',
            }
        },
        _initMethod:function(){
            vc.component._initStep();
        },
        _initEvent:function(){
        },
        methods:{
            _initStep:function(){
                vc.component.serviceBindingInfo.$step = $("#step");
                vc.component.serviceBindingInfo.$step.step({
                    index: 0,
                    time: 500,
                    title: ["选择应用", "选择服务", "确认绑定"]
                });
                //vc.component.serviceBindingInfo.step = $step.getIndex();
            },
            _prevStep:function(){
                vc.component.serviceBindingInfo.$step.prevStep();
                //vc.component.serviceBindingInfo.step = $step.getIndex();
            },
            _nextStep:function(){
                vc.component.serviceBindingInfo.$step.nextStep();
                //vc.component.serviceBindingInfo.step = $step.getIndex();
            }
        }
    });
})(window.vc);
WebService/src/main/resources/components/service-manage/serviceManage.html
@@ -1,60 +1,78 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <div class="row">
        <div class="col-lg-12">
            <div class="ibox">
                <div class="ibox-title">
                    <h5>服务信息</h5>
                    <div class="ibox-tools" style="top:10px;">
                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddServiceModal()">
                            <i class="glyphicon glyphicon-plus"></i>
                            添加服务
                        </button>
                        <form>
                            <div class="form-row">
                                <div class="col-8 input-group input-group-sm">
                                    <input type="text" placeholder="请填写服务名称" class=" form-control" v-model="serviceManageInfo.name">
                                    <div class="input-group-prepend">
                                        <button type="button" class="btn btn-primary btn-sm"  v-on:click="_queryServiceMethod()">
                                            <i class="glyphicon glyphicon-search"></i> 马上查询</button>
                                    </div>
                                </div>
                                <div class="col">
                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddServiceModal()">
                                        <i class="glyphicon glyphicon-plus"></i>
                                        添加服务
                                    </button>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
                <div class="ibox-content">
                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                    <table class="footable table table-stripped toggle-arrow-tiny"
                           data-page-size="15"
                           style="table-layout: fixed;word-break:break-all;"
                    >
                        <thead>
                        <tr>
                                                        <th>服务ID</th>
                            <th>服务名称</th>
                            <th>服务编码</th>
                            <th>秘钥</th>
                            <th>序列</th>
                            <th>消息队列</th>
                            <th>是否实例</th>
                            <th>调用地址</th>
                            <th>调用方式</th>
                            <th>超时时间</th>
                            <th>重试次数</th>
                            <th>提供服务</th>
                            <th class="text-right">操作</th>
                            <th class="text-center">服务ID</th>
                            <th class="text-center">服务名称</th>
                            <th class="text-center">服务编码</th>
                            <th class="text-center">秘钥</th>
                            <th class="text-center">序列</th>
                            <th class="text-center">消息队列</th>
                            <th class="text-center">是否实例</th>
                            <th class="text-center">调用地址</th>
                            <th class="text-center">调用方式</th>
                            <th class="text-center">超时时间</th>
                            <th class="text-center">重试次数</th>
                            <th class="text-center">提供服务</th>
                            <th class="text-center">操作</th>
                        </tr>
                        </thead>
                        <tbody>
                            <tr v-for="service in serviceManageInfo.services">
                                                            <td>{{service.serviceId}}</td>
                            <td>{{service.name}}</td>
                            <td>{{service.serviceCode}}</td>
                            <td>{{service.businessTypeCd}}</td>
                            <td>{{service.seq}}</td>
                            <td>{{service.messageQueueName}}</td>
                            <td>{{service.isInstance}}</td>
                            <td>{{service.url}}</td>
                            <td>{{service.method}}</td>
                            <td>{{service.timeout}}</td>
                            <td>{{service.retryCount}}</td>
                            <td>{{service.provideAppId}}</td>
                            <td><div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openEditServiceModel(service)">修改</button>
                                </div>
                        <tr v-for="service in serviceManageInfo.services">
                            <td class="text-center">{{service.serviceId}}</td>
                            <td class="text-center">{{service.name}}</td>
                            <td class="text-center">{{service.serviceCode}}</td>
                            <td class="text-center">{{service.businessTypeCd}}</td>
                            <td class="text-center">{{service.seq}}</td>
                            <td class="text-center">{{service.messageQueueName}}</td>
                            <td class="text-center">{{service.isInstance}}</td>
                            <td class="text-center">{{service.url}}</td>
                            <td class="text-center">{{service.method}}</td>
                            <td class="text-center">{{service.timeout}}</td>
                            <td class="text-center">{{service.retryCount}}</td>
                            <td class="text-center">{{service.provideAppId}}</td>
                            <td class="text-center"><div class="btn-group">
                                <button class="btn-white btn btn-xs" v-on:click="_openEditServiceModel(service)">修改</button>
                            </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteServiceModel(service)">删除</button>
                                </div></td>
                            </tr>
                        </tr>
                        </tbody>
                        <tfoot>
                        <tr>
WebService/src/main/resources/components/service-manage/serviceManage.js
@@ -9,7 +9,8 @@
            serviceManageInfo:{
                services:[],
                total:0,
                records:1
                records:1,
                name:''
            }
        },
        _initMethod:function(){
@@ -28,7 +29,8 @@
                var param = {
                    params:{
                        page:_page,
                        row:_rows
                        row:_rows,
                        name:vc.component.serviceManageInfo.name
                    }
               }
@@ -58,6 +60,10 @@
            },
            _openDeleteServiceModel:function(_service){
                vc.emit('deleteService','openDeleteServiceModal',_service);
            },
            _queryServiceMethod:function(){
                vc.component._listServices(DEFAULT_PAGE, DEFAULT_ROWS);
            }
        }
    });
WebService/src/main/resources/components/staff-privilege/staffPrivilege.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="privilegeStaffInfo"></vc:create>
    <div class="row">
        <div class="col-lg-12">
WebService/src/main/resources/components/unit/unit.html
@@ -1,4 +1,4 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="unitSelectFloor"></vc:create>
    <div class="row">
        <div class="col-lg-12">
WebService/src/main/resources/components/view-app-info/viewAppInfo.html
New file
@@ -0,0 +1,63 @@
<div class="row">
    <div class="col-lg-12">
        <div class="ibox ">
            <div class="ibox-title">
                <h5>应用信息</h5>
                <div class="ibox-tools" style="top:10px;">
                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchOwnerModel()">
                        <i class="glyphicon glyphicon-search"></i> 选择应用</button>
                </div>
            </div>
            <div class="ibox-content">
                <div class="row">
                    <div class="col-sm-4">
                        <div class="form-group">
                            <label class="col-form-label" >应用ID:</label>
                            <label class="">{{ownerInfo.ownerId}}</label>
                        </div>
                    </div>
                    <div class="col-sm-4">
                        <div class="form-group">
                            <label class="col-form-label">应用名称:</label>
                            <label class="">{{ownerInfo.name}}</label>
                        </div>
                    </div>
                    <div class="col-sm-4">
                        <div class="form-group">
                            <label class="col-form-label" >秘钥:</label>
                            <label class="">{{ownerInfo.sex == 0 ? '男' : '女'}}</label>
                        </div>
                    </div>
                </div>
                <div class="row">
                    <div class="col-sm-4">
                        <div class="form-group">
                            <label class="col-form-label" >白名单:</label>
                            <label class="">{{ownerInfo.age}}</label>
                        </div>
                    </div>
                    <div class="col-sm-4">
                        <div class="form-group">
                            <label class="col-form-label" >黑名单:</label>
                            <label class="">{{ownerInfo.link}}</label>
                        </div>
                    </div>
                    <div class="col-sm-4">
                        <div class="form-group">
                            <label class="col-form-label">备注:</label>
                            <label class="">{{ownerInfo.userName}}</label>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
    <vc:create name="searchOwner"
               emitChooseOwner="sellRoomSelectOwner"
               emitLoadData="sellRoomOther"
    ></vc:create>
</div>
WebService/src/main/resources/components/view-app-info/viewAppInfo.js
New file
@@ -0,0 +1,52 @@
/**
    权限组
**/
(function(vc){
    vc.extends({
        propTypes: {
            callBackComponent:vc.propTypes.string
        },
        data:{
            ownerInfo:{
                ownerId:"",
                name:"",
                age:"",
                sex:"",
                userName:"",
                remark:"",
                link:"",
            }
        },
        _initMethod:function(){
            //根据请求参数查询 查询 业主信息
            vc.component.loadOwnerData();
        },
        _initEvent:function(){
            vc.on('sellRoomSelectOwner','chooseOwner',function(_owner){
                vc.component.ownerInfo = _owner;
                vc.emit($props.callBackComponent,'notify',_owner);
            });
        },
        methods:{
            openSearchOwnerModel(){
                vc.emit('searchOwner','openSearchOwnerModel',{});
            },
            loadOwnerData:function(){
               vc.component.ownerInfo.ownerId = vc.getParam("ownerId");
               vc.component.ownerInfo.name = vc.getParam("name");
               vc.component.ownerInfo.age = vc.getParam("age");
               vc.component.ownerInfo.sex = vc.getParam("sex");
               vc.component.ownerInfo.userName = vc.getParam("userName");
               vc.component.ownerInfo.link = vc.getParam("link");
               if(vc.component.ownerInfo.ownerId != ''){
                  vc.emit($props.callBackComponent,'notify',vc.component.ownerInfo);
               }
            }
        }
    });
})(window.vc);
WebService/src/main/resources/static/css/common.css
@@ -31,4 +31,21 @@
}
.java110_loading>div{
    margin: 70px auto;
}
.wizard > .actions .vc_disabled a,
.wizard > .actions .vc_disabled a:hover,
.wizard > .actions .vc_disabled a:active
{
    background: #fff;
    color: #888;
}
.wizard > .steps .vc_disabled a,
.wizard > .steps .vc_disabled a:hover,
.wizard > .steps .vc_disabled a:active
{
    background: #fff;
    color: #888;
    cursor: default;
}
WebService/src/main/resources/static/css/jquery.step.css
New file
@@ -0,0 +1,71 @@
body,
div,
ul,
li {
    margin: 0;
    padding: 0;
}
body {
    font-family: "微软雅黑";
}
.ui-step-wrap {
    position: relative;
}
.ui-step-wrap .ui-step-bg,
.ui-step-wrap .ui-step-progress {
    height: 6px;
    position: absolute;
    top: 50px;
    left: 0;
}
.ui-step-wrap .ui-step-bg {
    width: 100%;
    background: #ddd;
}
.ui-step-wrap .ui-step-progress {
    width: 0;
    background: #64BD2E;
}
.ui-step-wrap .ui-step {
    position: relative;
    z-index: 1;
    list-style: none;
}
.ui-step-wrap .ui-step:after {
    content: '';
    display: table;
    clear: both;
}
.ui-step-wrap .ui-step .ui-step-item {
    float: left;
}
.ui-step-wrap .ui-step .ui-step-item div {
    text-align: center;
    color: #625454;
}
.ui-step-wrap .ui-step .ui-step-item .ui-step-item-num {
    margin-top: 18px;
}
.ui-step-wrap .ui-step .ui-step-item .ui-step-item-num span {
    display: inline-block;
    width: 26px;
    height: 26px;
    border-radius: 50%;
    background: #dad9d9;
}
.ui-step-wrap .ui-step .ui-step-item.active .ui-step-item-num span {
    color: #fff;
    background: #64BD2E;
}
WebService/src/main/resources/static/js/core.js
@@ -225,6 +225,12 @@
        return "";
    };
    //查询url
    vc.getUrl = function(){
        //返回当前 URL 的查询部分(问号 ? 之后的部分)。
        var urlParameters = location.pathname;
        return urlParameters;
    };
    //对象转get参数
    vc.objToGetParam =function(obj){
         var str = [];
WebService/src/main/resources/static/js/jquery.step.min.js
New file
@@ -0,0 +1 @@
!function(i){i.fn.step=function(e){var t=this,n={index:0,time:400,title:[]},s=(e=i.extend({},n,e)).title,d=s.length,u=e.time,p=(1/d)*100;t.index=e.index;var a=function(){var e="";s.length>0&&(e+='<div class="ui-step-wrap"><div class="ui-step-bg"></div><div class="ui-step-progress"></div><ul class="ui-step">',i.each(s,function(i,t){e+='<li class="ui-step-item"><div class="ui-step-item-title">'+t+'</div><div class="ui-step-item-num"><span>'+(i+1)+"</span></div></li>"}),e+="</ul></div>"),t.append(e),t.find(".ui-step").children(".ui-step-item").width(p+'%'),t.toStep(t.index)};return t.toStep=function(e){var n=t.find(".ui-step").children(".ui-step-item");t.index=e,t.find(".ui-step-progress").animate({width:p*(e+1)+'%'},u,function(){i.each(n,function(t){t>e?i(this).removeClass("active"):i(this).addClass("active")})})},t.getIndex=function(){return t.index},t.nextStep=function(){t.index>d-2||(t.index++,t.toStep(t.index))},t.prevStep=function(){t.index<1||(t.index--,t.toStep(t.index))},a(),this}}(jQuery);
WebService/src/main/resources/views/appFlow.html
@@ -18,6 +18,10 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="appManage"></vc:create>
WebService/src/main/resources/views/businessTypeFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listBusinessType"></vc:create>
WebService/src/main/resources/views/communityFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="communityManage"></vc:create>
WebService/src/main/resources/views/demoFlow.html
@@ -5,7 +5,7 @@
      xmlns:vc="http://www.thymeleaf.org">
<head>
    <meta charset="UTF-8"/>
    <title>小区楼初始化|java110</title>
    <title>demo学习|java110</title>
    <vc:create name="commonTop"></vc:create>
</head>
<body>
@@ -18,6 +18,11 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listDemo"></vc:create>
WebService/src/main/resources/views/demoStudyFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listDemoStudy"></vc:create>
WebService/src/main/resources/views/enterCommunity.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="enterCommunity"></vc:create>
WebService/src/main/resources/views/floorFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listFloor"></vc:create>
WebService/src/main/resources/views/hireParkingSpaceFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="hireParkingSpace"></vc:create>
WebService/src/main/resources/views/mappingFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="mappingManage"></vc:create>
WebService/src/main/resources/views/noticeFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="noticeManage"></vc:create>
WebService/src/main/resources/views/ownerFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listOwner"></vc:create>
WebService/src/main/resources/views/ownerMemberFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listOwnerMember"></vc:create>
WebService/src/main/resources/views/ownerParkingSpaceFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="ownerParkingSpace"></vc:create>
WebService/src/main/resources/views/ownerRoomFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="ownerRoom"></vc:create>
WebService/src/main/resources/views/parkingSpaceFeeConfigFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="viewParkingSpaceFeeConfig"></vc:create>
WebService/src/main/resources/views/parkingSpaceFeeFlow.html
@@ -19,6 +19,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="parkingSpaceFee"></vc:create>
WebService/src/main/resources/views/parkingSpaceFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="listParkingSpace"></vc:create>
WebService/src/main/resources/views/privilege.html
@@ -19,6 +19,9 @@
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <div class="wrapper wrapper-content">
            <vc:create name="privilege"></vc:create>
        </div>
WebService/src/main/resources/views/propertyFeeConfigFlow.html
@@ -18,6 +18,10 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="viewPropertyFeeConfig"></vc:create>
WebService/src/main/resources/views/propertyFeeFlow.html
@@ -19,6 +19,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="propertyFee"></vc:create>
WebService/src/main/resources/views/roomFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="room"></vc:create>
WebService/src/main/resources/views/sellOwnerCarFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="sellCar"></vc:create>
WebService/src/main/resources/views/sellRoomFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="sellRoom"></vc:create>
WebService/src/main/resources/views/serviceBindingFlow.html
New file
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="en"
      xmlns="http://www.w3.org/1999/xhtml"
      xmlns:th="http://www.thymeleaf.org"
      xmlns:vc="http://www.thymeleaf.org">
<head>
    <meta charset="UTF-8"/>
    <title>服务绑定|java110</title>
    <vc:create name="commonTop"></vc:create>
    <link href="/css/jquery.step.css" rel="stylesheet"/>
    <script src="/js/jquery.step.min.js" ></script>
</head>
<body>
<vc:create name="bodyTop"></vc:create>
<div id="wrapper">
    <vc:create name="menu"></vc:create>
    <div id="page-wrapper" class="gray-bg dashbard-1">
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="serviceBinding"></vc:create>
        </div>
        <vc:create name="copyright"></vc:create>
    </div>
</div>
<vc:create name="commonBottom"></vc:create>
</body>
</html>
WebService/src/main/resources/views/serviceFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="serviceManage"></vc:create>
WebService/src/main/resources/views/staff.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div id="component" class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="staff"></vc:create>
WebService/src/main/resources/views/staffPrivilege.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div  class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="staffPrivilege"></vc:create>
WebService/src/main/resources/views/unitFlow.html
@@ -18,6 +18,9 @@
        <div class="row border-bottom">
            <vc:create name="nav"></vc:create>
        </div>
        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
            <vc:create name="breadcrumb"></vc:create>
        </div>
        <!-- id="component" -->
        <div  class="wrapper wrapper-content animated fadeInRight">
            <vc:create name="unit"></vc:create>
java110-code-generator/src/main/java/com/java110/code/BaseGenerator.java
@@ -75,6 +75,8 @@
                .replace("@@templateKey@@", data.getString("templateKey"))
                .replace("@@TemplateKey@@", toUpperCaseFirstOne(data.getString("templateKey")))
                .replace("@@templateKeyName@@", data.getString("templateKeyName"))
                .replace("@@TEMPLATECODE@@", data.getString("templateCode").toUpperCase());
                .replace("@@TEMPLATECODE@@", data.getString("templateCode").toUpperCase())
                .replace("@@searchCode@@", data.getString("searchCode"))
                .replace("@@searchName@@", data.getString("searchName"));
    }
}
java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java
@@ -39,19 +39,19 @@
        StringBuffer thSb = new StringBuffer();
        StringBuffer tdSb = new StringBuffer();
        thSb.append("                            <th>" + data.getString("templateKeyName") + "</th>\n");
        thSb.append("                            <th class=\"text-center\">" + data.getString("templateKeyName") + "</th>\n");
        tdSb.append("                            <td>{{" + data.getString("templateCode") + "." + data.getString("templateKey") + "}}</td>\n");
        tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + data.getString("templateKey") + "}}</td>\n");
        JSONArray columns = data.getJSONArray("columns");
        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
            JSONObject column = columns.getJSONObject(columnIndex);
            thSb.append("                            <th>" + column.getString("cnCode") + "</th>\n");
            thSb.append("                            <th class=\"text-center\">" + column.getString("cnCode") + "</th>\n");
            tdSb.append("                            <td>{{" + data.getString("templateCode") + "." + column.getString("code") + "}}</td>\n");
            tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + column.getString("code") + "}}</td>\n");
        }
        thSb.append("                            <th class=\"text-right\">操作</th>\n");
        tdSb.append("                            <td><div class=\"btn-group\">\n" +
        thSb.append("                            <th class=\"text-center\">操作</th>\n");
        tdSb.append("                            <td class=\"text-center\"><div class=\"btn-group\">\n" +
                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openEdit"+toUpperCaseFirstOne(data.getString("templateCode"))+"Model("+data.getString("templateCode")+")\">修改</button>\n" +
                "                                </div>\n" +
                "                                <div class=\"btn-group\">\n" +
java110-code-generator/src/main/resources/web/manage/manage.html
@@ -5,15 +5,33 @@
                <div class="ibox-title">
                    <h5>@@templateName@@信息</h5>
                    <div class="ibox-tools" style="top:10px;">
                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAdd@@TemplateCode@@Modal()">
                            <i class="glyphicon glyphicon-plus"></i>
                            添加@@templateName@@
                        </button>
                        <form>
                            <div class="form-row">
                                <div class="col-8 input-group input-group-sm">
                                    <input type="text" placeholder="请填写@@searchName@@" class=" form-control" v-model="@@templateCode@@ManageInfo.@@searchCode@@">
                                    <div class="input-group-prepend">
                                        <button type="button" class="btn btn-primary btn-sm"  v-on:click="_query@@TemplateCode@@Method()">
                                            <i class="glyphicon glyphicon-search"></i> 马上查询</button>
                                    </div>
                                </div>
                                <div class="col">
                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAdd@@TemplateCode@@Modal()">
                                        <i class="glyphicon glyphicon-plus"></i>
                                        添加@@templateName@@
                                    </button>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
                <div class="ibox-content">
                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                    <table class="footable table table-stripped toggle-arrow-tiny"
                           data-page-size="15"
                           style="table-layout: fixed;word-break:break-all;"
                    >
                        <thead>
                        <tr>
                            @@columnsCnCode@@
java110-code-generator/src/main/resources/web/manage/manage.js
@@ -9,7 +9,8 @@
            @@templateCode@@ManageInfo:{
                @@templateCode@@s:[],
                total:0,
                records:1
                records:1,
                @@searchCode@@:''
            }
        },
        _initMethod:function(){
@@ -28,7 +29,8 @@
                var param = {
                    params:{
                        page:_page,
                        row:_rows
                        row:_rows,
                        @@searchCode@@:vc.component.@@templateCode@@ManageInfo.@@searchCode@@
                    }
               }
@@ -58,6 +60,10 @@
            },
            _openDelete@@TemplateCode@@Model:function(_@@templateCode@@){
                vc.emit('delete@@TemplateCode@@','openDelete@@TemplateCode@@Modal',_@@templateCode@@);
            },
            _query@@TemplateCode@@Method:function(){
                vc.component._list@@TemplateCode@@s(DEFAULT_PAGE, DEFAULT_ROWS);
            }
        }
    });
java110-code-generator/src/main/resources/web/template_1.json
@@ -1,69 +1,147 @@
{
  "templateName":"编码映射",
  "templateCode":"mapping",
  "templateKey":"id",
  "templateKeyName":"编码ID",
  "templateName":"服务",
  "templateCode":"service",
  "templateKey":"serviceId",
  "templateKeyName":"服务ID",
  "searchCode": "name",
  "searchName": "服务名称",
  "columns":[
    {
      "code":"domain",
      "cnCode":"域",
      "desc":"必填,请填写域",
      "code":"name",
      "cnCode":"服务名称",
      "desc":"必填,请填写服务名称",
      "required":true,
      "hasDefaultValue":true,
      "defaultValue":"DOMAIN.COMMON",
      "hasDefaultValue":false,
      "inputType":"input",
      "limit":"maxLength",
      "limitParam":"50",
      "limitErrInfo":"域长度不能超过50"
      "limitErrInfo":"服务名称不能超过50"
    },
    {
      "code":"name",
      "cnCode":"名称",
      "desc":"必填,请填写名称",
      "code":"serviceCode",
      "cnCode":"服务编码",
      "desc":"必填,请填写服务编码如 service.saveService",
      "required":true,
      "hasDefaultValue":false,
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"2,50",
      "limitErrInfo":"名称必须在2至50字符之间"
      "limitErrInfo":"服务编码必须在2至50字符之间"
    },
    {
      "code":"key",
      "cnCode":"键",
      "desc":"必填,请填写键",
      "code":"businessTypeCd",
      "cnCode":"秘钥",
      "desc":"可填,请填写秘钥,如果填写了需要加密传输",
      "required":true,
      "hasDefaultValue":false,
      "defaultValue":"",
      "inputType":"input",
      "hasDefaultValue":true,
      "defaultValue":"API",
      "inputType":"none",
      "limit":"maxin",
      "limitParam":"1,100",
      "limitErrInfo":"键必须在1至100之间"
      "limitParam":"2,4",
      "limitErrInfo":"业务类型必须为API"
    },
    {
      "code":"value",
      "cnCode":"值",
      "desc":"必填,请填写值",
      "code":"seq",
      "cnCode":"序列",
      "desc":"必填,请填写序列",
      "required":true,
      "hasDefaultValue":false,
      "defaultValue":"",
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"1,100",
      "limitErrInfo":"值必须在1至100之间"
      "hasDefaultValue":true,
      "defaultValue":"1",
      "inputType":"none",
      "limit":"maxLength",
      "limitParam":"1",
      "limitErrInfo":"序列格式错误"
    },
    {
      "code":"remark",
      "cnCode":"备注",
      "desc":"可填,请填写备注",
      "code":"messageQueueName",
      "cnCode":"消息队列",
      "desc":"可填,请填写消息队列,订单在异步调用时使用",
      "required":false,
      "hasDefaultValue":false,
      "defaultValue":"",
      "inputType":"textarea",
      "inputType":"input",
      "limit":"maxLength",
      "limitParam":"50",
      "limitErrInfo":"消息队列不能超过50"
    }
  ,
    {
      "code":"isInstance",
      "cnCode":"是否实例",
      "desc":"可填,请填写实例 Y 或N",
      "required":true,
      "hasDefaultValue":true,
      "defaultValue":"Y",
      "inputType":"input",
      "limit":"maxLength",
      "limitParam":"50",
      "limitErrInfo":"实例不能超过50"
    }
  ,
    {
      "code":"url",
      "cnCode":"调用地址",
      "desc":"可填,请填写调用地址",
      "required":false,
      "hasDefaultValue":true,
      "defaultValue":"http://order-service/orderApi/service",
      "inputType":"input",
      "limit":"maxLength",
      "limitParam":"200",
      "limitErrInfo":"备注内容不能超过200"
      "limitErrInfo":"调用地址不能超过200"
    },
    {
      "code":"method",
      "cnCode":"调用方式",
      "desc":"必填,请填写调用方式",
      "required":true,
      "hasDefaultValue":false,
      "inputType":"select",
      "selectValue":"GET,POST",
      "selectValueName":"http get,http post",
      "limit":"maxLength",
      "limitParam":"50",
      "limitErrInfo":"调用方式不能超过50"
    },
    {
      "code":"timeout",
      "cnCode":"超时时间",
      "desc":"必填,请填写超时时间",
      "required":true,
      "hasDefaultValue":true,
      "defaultValue":"60",
      "inputType":"input",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"超时时间必须为数字"
    },
    {
      "code":"retryCount",
      "cnCode":"重试次数",
      "desc":"必填,请填写重试次数",
      "required":true,
      "hasDefaultValue":true,
      "defaultValue":"3",
      "inputType":"input",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"重试次数必须为数字"
    },
    {
      "code":"provideAppId",
      "cnCode":"提供服务",
      "desc":"必填,请填写提供服务",
      "required":true,
      "hasDefaultValue":true,
      "defaultValue":"8000418002",
      "inputType":"none",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"重试次数必须为数字"
    }
  ]
java110-code-generator/src/main/resources/web/template_mapping.json
New file
@@ -0,0 +1,72 @@
{
  "templateName":"编码映射",
  "templateCode":"mapping",
  "templateKey":"id",
  "templateKeyName":"编码ID",
  "searchCode": "name",
  "searchName": "名称",
  "columns":[
    {
      "code":"domain",
      "cnCode":"域",
      "desc":"必填,请填写域",
      "required":true,
      "hasDefaultValue":true,
      "defaultValue":"DOMAIN.COMMON",
      "inputType":"input",
      "limit":"maxLength",
      "limitParam":"50",
      "limitErrInfo":"域长度不能超过50"
    },
    {
      "code":"name",
      "cnCode":"名称",
      "desc":"必填,请填写名称",
      "required":true,
      "hasDefaultValue":false,
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"2,50",
      "limitErrInfo":"名称必须在2至50字符之间"
    },
    {
      "code":"key",
      "cnCode":"键",
      "desc":"必填,请填写键",
      "required":true,
      "hasDefaultValue":false,
      "defaultValue":"",
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"1,100",
      "limitErrInfo":"键必须在1至100之间"
    },
    {
      "code":"value",
      "cnCode":"值",
      "desc":"必填,请填写值",
      "required":true,
      "hasDefaultValue":false,
      "defaultValue":"",
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"1,100",
      "limitErrInfo":"值必须在1至100之间"
    },
    {
      "code":"remark",
      "cnCode":"备注",
      "desc":"可填,请填写备注",
      "required":false,
      "hasDefaultValue":false,
      "defaultValue":"",
      "inputType":"textarea",
      "limit":"maxLength",
      "limitParam":"200",
      "limitErrInfo":"备注内容不能超过200"
    }
  ]
}
java110-code-generator/src/main/resources/web/template_service.json
File was deleted
java110-db/src/main/resources/mapper/mapping/MappingServiceDaoImplMapper.xml
@@ -6,11 +6,12 @@
    <!-- 保存映射信息 add by wuxw 2018-07-03 -->
       <insert id="saveMappingInfo" parameterType="Map">
           insert into c_mapping(
domain,name,remark,id,value,key
) values (
#{domain},#{name},#{remark},#{id},#{value},#{key}
)
           <![CDATA[
            insert into c_mapping select
            #{id},#{domain},#{name},#{key},#{value},#{remark},now(),'0'
        ]]>
       </insert>
@@ -38,7 +39,7 @@
   and t.value= #{value}
</if> 
<if test="key !=null and key != ''">
   and t.key= #{key}
   and t.`key`= #{key}
</if> 
       </select>
@@ -101,7 +102,8 @@
</if> 
<if test="key !=null and key != ''">
   and t.key= #{key}
</if>
</if>
        order by t.create_time desc
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if> 
@@ -128,7 +130,7 @@
, t.value= #{value}
</if> 
<if test="key !=null and key != ''">
, t.key= #{key}
, t.`key`= #{key}
</if> 
 where 1=1 <if test="id !=null and id != ''">
and t.id= #{id}
java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml
@@ -155,7 +155,8 @@
</if> 
<if test="seq !=null and seq != ''">
   and t.seq= #{seq}
</if>
</if>
        order by t.create_time desc
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if>