From 6d8a43de07062234a05716fcbb94273709cab21e Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期二, 16 七月 2019 17:04:36 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/views/appFlow.html | 4
WebService/src/main/resources/static/css/common.css | 17
java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java | 12
WebService/src/main/resources/static/css/jquery.step.css | 71 +++
WebService/src/main/resources/components/list-owner-member/listOwnerMember.html | 2
WebService/src/main/resources/components/service-binding/serviceBinding.css | 8
WebService/src/main/resources/components/room/room.html | 2
WebService/src/main/resources/views/parkingSpaceFeeFlow.html | 3
WebService/src/main/resources/views/parkingSpaceFlow.html | 3
WebService/src/main/resources/components/menu/menu.js | 7
WebService/src/main/resources/views/enterCommunity.html | 3
WebService/src/main/resources/static/js/jquery.step.min.js | 1
WebService/src/main/resources/components/sell-car/sellCar.html | 4
WebService/src/main/resources/views/ownerParkingSpaceFlow.html | 3
WebService/src/main/resources/components/parkingSpace-fee/parkingSpaceFee.html | 2
WebService/src/main/resources/views/mappingFlow.html | 3
WebService/src/main/resources/components/owner-room/ownerRoom.html | 2
java110-code-generator/src/main/resources/web/manage/manage.html | 28 +
WebService/src/main/resources/views/demoFlow.html | 7
WebService/src/main/resources/components/floor/listFloor.html | 2
WebService/src/main/resources/views/floorFlow.html | 3
java110-code-generator/src/main/resources/web/template_mapping.json | 72 +++
WebService/src/main/resources/components/service-binding/serviceBinding.html | 22 +
WebService/src/main/resources/components/staff-privilege/staffPrivilege.html | 2
WebService/src/main/resources/components/app-manage/appManage.html | 2
WebService/src/main/resources/components/mapping-manage/mappingManage.html | 59 +-
WebService/src/main/resources/views/propertyFeeFlow.html | 3
java110-db/src/main/resources/mapper/mapping/MappingServiceDaoImplMapper.xml | 18
WebService/src/main/resources/static/js/core.js | 6
WebService/src/main/resources/views/hireParkingSpaceFlow.html | 3
WebService/src/main/resources/views/ownerFlow.html | 3
WebService/src/main/resources/views/communityFlow.html | 3
WebService/src/main/resources/views/staffPrivilege.html | 3
java110-code-generator/src/main/java/com/java110/code/BaseGenerator.java | 4
WebService/src/main/resources/components/property-fee/propertyFee.html | 2
WebService/src/main/resources/views/ownerRoomFlow.html | 3
WebService/src/main/resources/components/community-manage/communityManage.html | 2
WebService/src/main/resources/views/sellRoomFlow.html | 3
WebService/src/main/resources/components/unit/unit.html | 2
WebService/src/main/resources/components/view-app-info/viewAppInfo.html | 63 +++
WebService/src/main/resources/views/unitFlow.html | 3
WebService/src/main/resources/components/breadcrumb/breadcrumb.js | 68 +++
WebService/src/main/resources/views/demoStudyFlow.html | 3
WebService/src/main/resources/views/privilege.html | 3
WebService/src/main/resources/components/list-demo/listDemo.html | 3
WebService/src/main/resources/views/sellOwnerCarFlow.html | 3
WebService/src/main/resources/views/businessTypeFlow.html | 3
OrderService/pom.xml | 2
WebService/src/main/resources/components/notice-manage/noticeManage.html | 2
WebService/src/main/resources/components/service-manage/serviceManage.js | 10
WebService/src/main/resources/views/noticeFlow.html | 3
WebService/src/main/resources/views/serviceFlow.html | 3
WebService/src/main/resources/components/breadcrumb/breadcrumb.html | 19
WebService/src/main/resources/components/service-manage/serviceManage.html | 90 ++-
java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml | 3
WebService/src/main/resources/components/service-binding/serviceBinding.js | 39 +
WebService/src/main/resources/components/owner-parking-space/ownerParkingSpace.html | 2
WebService/src/main/resources/views/parkingSpaceFeeConfigFlow.html | 3
WebService/src/main/resources/views/propertyFeeConfigFlow.html | 4
/dev/null | 146 -------
java110-code-generator/src/main/resources/web/manage/manage.js | 10
WebService/src/main/resources/components/enter-community/enterCommunity.html | 2
java110-code-generator/src/main/resources/web/template_1.json | 150 +++++-
WebService/src/main/resources/components/list-owner/listOwner.html | 2
WebService/src/main/resources/components/list-parking-space/listParkingSpace.html | 2
WebService/src/main/resources/components/view-app-info/viewAppInfo.js | 52 ++
WebService/src/main/resources/components/mapping-manage/mappingManage.js | 8
WebService/src/main/resources/views/staff.html | 3
WebService/src/main/resources/components/list_business_type/listBusinessType.html | 2
WebService/src/main/resources/views/ownerMemberFlow.html | 3
WebService/src/main/resources/views/serviceBindingFlow.html | 39 +
WebService/src/main/resources/views/roomFlow.html | 3
WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html | 4
WebService/src/main/resources/components/sell-room/sellRoom.html | 4
74 files changed, 869 insertions(+), 289 deletions(-)
diff --git a/OrderService/pom.xml b/OrderService/pom.xml
index 24d2ae2..15af280 100644
--- a/OrderService/pom.xml
+++ b/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>
diff --git a/WebService/src/main/resources/components/app-manage/appManage.html b/WebService/src/main/resources/components/app-manage/appManage.html
index 2f152f7..96cd084 100644
--- a/WebService/src/main/resources/components/app-manage/appManage.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/breadcrumb/breadcrumb.html b/WebService/src/main/resources/components/breadcrumb/breadcrumb.html
new file mode 100644
index 0000000..43cc2c9
--- /dev/null
+++ b/WebService/src/main/resources/components/breadcrumb/breadcrumb.html
@@ -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>
\ No newline at end of file
diff --git a/WebService/src/main/resources/components/breadcrumb/breadcrumb.js b/WebService/src/main/resources/components/breadcrumb/breadcrumb.js
new file mode 100644
index 0000000..fd01baf
--- /dev/null
+++ b/WebService/src/main/resources/components/breadcrumb/breadcrumb.js
@@ -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)
\ No newline at end of file
diff --git a/WebService/src/main/resources/components/community-manage/communityManage.html b/WebService/src/main/resources/components/community-manage/communityManage.html
index c91cf63..abdcd9d 100644
--- a/WebService/src/main/resources/components/community-manage/communityManage.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/enter-community/enterCommunity.html b/WebService/src/main/resources/components/enter-community/enterCommunity.html
index df37015..71b1875 100644
--- a/WebService/src/main/resources/components/enter-community/enterCommunity.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/floor/listFloor.html b/WebService/src/main/resources/components/floor/listFloor.html
index 01598bf..f58c880 100644
--- a/WebService/src/main/resources/components/floor/listFloor.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html b/WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html
index 127e7f4..55c801e 100644
--- a/WebService/src/main/resources/components/hire-parking-space/hireParkingSpace.html
+++ b/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> 鎴戣鍑虹</button>
</div>
diff --git a/WebService/src/main/resources/components/list-demo/listDemo.html b/WebService/src/main/resources/components/list-demo/listDemo.html
index 71b6934..f028ea4 100644
--- a/WebService/src/main/resources/components/list-demo/listDemo.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/list-owner-member/listOwnerMember.html b/WebService/src/main/resources/components/list-owner-member/listOwnerMember.html
index a2ea3935..a4c00a8 100644
--- a/WebService/src/main/resources/components/list-owner-member/listOwnerMember.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/list-owner/listOwner.html b/WebService/src/main/resources/components/list-owner/listOwner.html
index fe0c568..e28b2ed 100644
--- a/WebService/src/main/resources/components/list-owner/listOwner.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/list-parking-space/listParkingSpace.html b/WebService/src/main/resources/components/list-parking-space/listParkingSpace.html
index f86829e..407f836 100644
--- a/WebService/src/main/resources/components/list-parking-space/listParkingSpace.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/list_business_type/listBusinessType.html b/WebService/src/main/resources/components/list_business_type/listBusinessType.html
index 4f2130e..8aa01b7 100644
--- a/WebService/src/main/resources/components/list_business_type/listBusinessType.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/mapping-manage/mappingManage.html b/WebService/src/main/resources/components/mapping-manage/mappingManage.html
index ddb313d..f272736 100644
--- a/WebService/src/main/resources/components/mapping-manage/mappingManage.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/mapping-manage/mappingManage.js b/WebService/src/main/resources/components/mapping-manage/mappingManage.js
index 994eb0e..bfd7646 100644
--- a/WebService/src/main/resources/components/mapping-manage/mappingManage.js
+++ b/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);
+
}
}
});
diff --git a/WebService/src/main/resources/components/menu/menu.js b/WebService/src/main/resources/components/menu/menu.js
index 6d2ba85..8814c25 100644
--- a/WebService/src/main/resources/components/menu/menu.js
+++ b/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();
}
+
},
});
diff --git a/WebService/src/main/resources/components/notice-manage/noticeManage.html b/WebService/src/main/resources/components/notice-manage/noticeManage.html
index 648c4b1..246e435 100644
--- a/WebService/src/main/resources/components/notice-manage/noticeManage.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/owner-parking-space/ownerParkingSpace.html b/WebService/src/main/resources/components/owner-parking-space/ownerParkingSpace.html
index 1f222af..2b5aeb8 100644
--- a/WebService/src/main/resources/components/owner-parking-space/ownerParkingSpace.html
+++ b/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>
diff --git a/WebService/src/main/resources/components/owner-room/ownerRoom.html b/WebService/src/main/resources/components/owner-room/ownerRoom.html
index 0046299..d16091a 100644
--- a/WebService/src/main/resources/components/owner-room/ownerRoom.html
+++ b/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>
diff --git a/WebService/src/main/resources/components/parkingSpace-fee/parkingSpaceFee.html b/WebService/src/main/resources/components/parkingSpace-fee/parkingSpaceFee.html
index 36afb19..8511d44 100644
--- a/WebService/src/main/resources/components/parkingSpace-fee/parkingSpaceFee.html
+++ b/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"
diff --git a/WebService/src/main/resources/components/property-fee/propertyFee.html b/WebService/src/main/resources/components/property-fee/propertyFee.html
index 82ed0a7..c36e2bf 100644
--- a/WebService/src/main/resources/components/property-fee/propertyFee.html
+++ b/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"
diff --git a/WebService/src/main/resources/components/room/room.html b/WebService/src/main/resources/components/room/room.html
index 8ee4f65..5310b31 100644
--- a/WebService/src/main/resources/components/room/room.html
+++ b/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>
diff --git a/WebService/src/main/resources/components/sell-car/sellCar.html b/WebService/src/main/resources/components/sell-car/sellCar.html
index 1c65121..c66df9e 100644
--- a/WebService/src/main/resources/components/sell-car/sellCar.html
+++ b/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> 鎴戣鍞崠</button>
</div>
diff --git a/WebService/src/main/resources/components/sell-room/sellRoom.html b/WebService/src/main/resources/components/sell-room/sellRoom.html
index 254a7dc..015c3e6 100644
--- a/WebService/src/main/resources/components/sell-room/sellRoom.html
+++ b/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> 鎴戣鍞崠</button>
</div>
diff --git a/WebService/src/main/resources/components/service-binding/serviceBinding.css b/WebService/src/main/resources/components/service-binding/serviceBinding.css
new file mode 100644
index 0000000..0ea02b2
--- /dev/null
+++ b/WebService/src/main/resources/components/service-binding/serviceBinding.css
@@ -0,0 +1,8 @@
+.wizard > .steps > ul > li {
+ width: 33.33%;
+}
+
+.java110_step{
+ width:80%;
+ margin: 20px auto 50px auto;
+}
diff --git a/WebService/src/main/resources/components/service-binding/serviceBinding.html b/WebService/src/main/resources/components/service-binding/serviceBinding.html
new file mode 100644
index 0000000..1d8f3f3
--- /dev/null
+++ b/WebService/src/main/resources/components/service-binding/serviceBinding.html
@@ -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>
diff --git a/WebService/src/main/resources/components/service-binding/serviceBinding.js b/WebService/src/main/resources/components/service-binding/serviceBinding.js
new file mode 100644
index 0000000..8168de7
--- /dev/null
+++ b/WebService/src/main/resources/components/service-binding/serviceBinding.js
@@ -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);
diff --git a/WebService/src/main/resources/components/service-manage/serviceManage.html b/WebService/src/main/resources/components/service-manage/serviceManage.html
index 6e9bf5e..e826b91 100644
--- a/WebService/src/main/resources/components/service-manage/serviceManage.html
+++ b/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>
diff --git a/WebService/src/main/resources/components/service-manage/serviceManage.js b/WebService/src/main/resources/components/service-manage/serviceManage.js
index 557cb20..4c52be9 100644
--- a/WebService/src/main/resources/components/service-manage/serviceManage.js
+++ b/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);
+
}
}
});
diff --git a/WebService/src/main/resources/components/staff-privilege/staffPrivilege.html b/WebService/src/main/resources/components/staff-privilege/staffPrivilege.html
index ae18336..d1f46b6 100644
--- a/WebService/src/main/resources/components/staff-privilege/staffPrivilege.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/unit/unit.html b/WebService/src/main/resources/components/unit/unit.html
index c51cf99..4765e0d 100644
--- a/WebService/src/main/resources/components/unit/unit.html
+++ b/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">
diff --git a/WebService/src/main/resources/components/view-app-info/viewAppInfo.html b/WebService/src/main/resources/components/view-app-info/viewAppInfo.html
new file mode 100644
index 0000000..2acc21c
--- /dev/null
+++ b/WebService/src/main/resources/components/view-app-info/viewAppInfo.html
@@ -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>
\ No newline at end of file
diff --git a/WebService/src/main/resources/components/view-app-info/viewAppInfo.js b/WebService/src/main/resources/components/view-app-info/viewAppInfo.js
new file mode 100644
index 0000000..14d6abf
--- /dev/null
+++ b/WebService/src/main/resources/components/view-app-info/viewAppInfo.js
@@ -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);
\ No newline at end of file
diff --git a/WebService/src/main/resources/static/css/common.css b/WebService/src/main/resources/static/css/common.css
index f0b6468..ccb081d 100644
--- a/WebService/src/main/resources/static/css/common.css
+++ b/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;
}
\ No newline at end of file
diff --git a/WebService/src/main/resources/static/css/jquery.step.css b/WebService/src/main/resources/static/css/jquery.step.css
new file mode 100644
index 0000000..7e5cd16
--- /dev/null
+++ b/WebService/src/main/resources/static/css/jquery.step.css
@@ -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;
+}
\ No newline at end of file
diff --git a/WebService/src/main/resources/static/js/core.js b/WebService/src/main/resources/static/js/core.js
index 37fb1c9..0c40761 100644
--- a/WebService/src/main/resources/static/js/core.js
+++ b/WebService/src/main/resources/static/js/core.js
@@ -225,6 +225,12 @@
return "";
};
+ //鏌ヨurl
+ vc.getUrl = function(){
+ //杩斿洖褰撳墠 URL 鐨勬煡璇㈤儴鍒嗭紙闂彿 ? 涔嬪悗鐨勯儴鍒嗭級銆�
+ var urlParameters = location.pathname;
+ return urlParameters;
+ };
//瀵硅薄杞琯et鍙傛暟
vc.objToGetParam =function(obj){
var str = [];
diff --git a/WebService/src/main/resources/static/js/jquery.step.min.js b/WebService/src/main/resources/static/js/jquery.step.min.js
new file mode 100644
index 0000000..2e45eeb
--- /dev/null
+++ b/WebService/src/main/resources/static/js/jquery.step.min.js
@@ -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);
\ No newline at end of file
diff --git a/WebService/src/main/resources/views/appFlow.html b/WebService/src/main/resources/views/appFlow.html
index 0870aaf..5b40d38 100644
--- a/WebService/src/main/resources/views/appFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/businessTypeFlow.html b/WebService/src/main/resources/views/businessTypeFlow.html
index ecdf082..bd7555a 100644
--- a/WebService/src/main/resources/views/businessTypeFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/communityFlow.html b/WebService/src/main/resources/views/communityFlow.html
index f08f504..2c82064 100644
--- a/WebService/src/main/resources/views/communityFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/demoFlow.html b/WebService/src/main/resources/views/demoFlow.html
index 6f93bad..930e061 100644
--- a/WebService/src/main/resources/views/demoFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/demoStudyFlow.html b/WebService/src/main/resources/views/demoStudyFlow.html
index 70f47bb..50ff47a 100644
--- a/WebService/src/main/resources/views/demoStudyFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/enterCommunity.html b/WebService/src/main/resources/views/enterCommunity.html
index 74eafdf..0aca56e 100644
--- a/WebService/src/main/resources/views/enterCommunity.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/floorFlow.html b/WebService/src/main/resources/views/floorFlow.html
index 2537625..5a0ef56 100644
--- a/WebService/src/main/resources/views/floorFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/hireParkingSpaceFlow.html b/WebService/src/main/resources/views/hireParkingSpaceFlow.html
index 00b63d2..ca96419 100644
--- a/WebService/src/main/resources/views/hireParkingSpaceFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/mappingFlow.html b/WebService/src/main/resources/views/mappingFlow.html
index 0c0c7fa..f0b1646 100644
--- a/WebService/src/main/resources/views/mappingFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/noticeFlow.html b/WebService/src/main/resources/views/noticeFlow.html
index c324b09..f27db16 100644
--- a/WebService/src/main/resources/views/noticeFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/ownerFlow.html b/WebService/src/main/resources/views/ownerFlow.html
index e51566e..6a3e05b 100644
--- a/WebService/src/main/resources/views/ownerFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/ownerMemberFlow.html b/WebService/src/main/resources/views/ownerMemberFlow.html
index 71d0143..87b87e3 100644
--- a/WebService/src/main/resources/views/ownerMemberFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/ownerParkingSpaceFlow.html b/WebService/src/main/resources/views/ownerParkingSpaceFlow.html
index 0c4f585..3966497 100644
--- a/WebService/src/main/resources/views/ownerParkingSpaceFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/ownerRoomFlow.html b/WebService/src/main/resources/views/ownerRoomFlow.html
index e5afe88..7e87eb8 100644
--- a/WebService/src/main/resources/views/ownerRoomFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/parkingSpaceFeeConfigFlow.html b/WebService/src/main/resources/views/parkingSpaceFeeConfigFlow.html
index 93ed7c8..e0cf19d 100644
--- a/WebService/src/main/resources/views/parkingSpaceFeeConfigFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/parkingSpaceFeeFlow.html b/WebService/src/main/resources/views/parkingSpaceFeeFlow.html
index 5eef8b1..b8b4cca 100644
--- a/WebService/src/main/resources/views/parkingSpaceFeeFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/parkingSpaceFlow.html b/WebService/src/main/resources/views/parkingSpaceFlow.html
index 1cfe05f..fa2426e 100644
--- a/WebService/src/main/resources/views/parkingSpaceFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/privilege.html b/WebService/src/main/resources/views/privilege.html
index 60b5443..7653527 100644
--- a/WebService/src/main/resources/views/privilege.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/propertyFeeConfigFlow.html b/WebService/src/main/resources/views/propertyFeeConfigFlow.html
index 09f4140..400f6f0 100644
--- a/WebService/src/main/resources/views/propertyFeeConfigFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/propertyFeeFlow.html b/WebService/src/main/resources/views/propertyFeeFlow.html
index 40b501d..0cc90f2 100644
--- a/WebService/src/main/resources/views/propertyFeeFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/roomFlow.html b/WebService/src/main/resources/views/roomFlow.html
index af7c4d6..dff9142 100644
--- a/WebService/src/main/resources/views/roomFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/sellOwnerCarFlow.html b/WebService/src/main/resources/views/sellOwnerCarFlow.html
index 71bea2f..ab2508c 100644
--- a/WebService/src/main/resources/views/sellOwnerCarFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/sellRoomFlow.html b/WebService/src/main/resources/views/sellRoomFlow.html
index b4efb6c..9dc2e7a 100644
--- a/WebService/src/main/resources/views/sellRoomFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/serviceBindingFlow.html b/WebService/src/main/resources/views/serviceBindingFlow.html
new file mode 100644
index 0000000..eb9e54a
--- /dev/null
+++ b/WebService/src/main/resources/views/serviceBindingFlow.html
@@ -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>
diff --git a/WebService/src/main/resources/views/serviceFlow.html b/WebService/src/main/resources/views/serviceFlow.html
index 7a0ab1c..36b4771 100644
--- a/WebService/src/main/resources/views/serviceFlow.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/staff.html b/WebService/src/main/resources/views/staff.html
index de66cd9..e647419 100644
--- a/WebService/src/main/resources/views/staff.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/staffPrivilege.html b/WebService/src/main/resources/views/staffPrivilege.html
index 50b5339..5ad43be 100644
--- a/WebService/src/main/resources/views/staffPrivilege.html
+++ b/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>
diff --git a/WebService/src/main/resources/views/unitFlow.html b/WebService/src/main/resources/views/unitFlow.html
index ee9d5180..10dd8b4 100644
--- a/WebService/src/main/resources/views/unitFlow.html
+++ b/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>
diff --git a/java110-code-generator/src/main/java/com/java110/code/BaseGenerator.java b/java110-code-generator/src/main/java/com/java110/code/BaseGenerator.java
index feeaa3c..4be5a4b 100644
--- a/java110-code-generator/src/main/java/com/java110/code/BaseGenerator.java
+++ b/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"));
}
}
diff --git a/java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java b/java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java
index 2041013..4dc2163 100644
--- a/java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java
+++ b/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" +
diff --git a/java110-code-generator/src/main/resources/web/manage/manage.html b/java110-code-generator/src/main/resources/web/manage/manage.html
index e8f6656..a1f2db0 100644
--- a/java110-code-generator/src/main/resources/web/manage/manage.html
+++ b/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@@
diff --git a/java110-code-generator/src/main/resources/web/manage/manage.js b/java110-code-generator/src/main/resources/web/manage/manage.js
index bf8c234..940c299 100644
--- a/java110-code-generator/src/main/resources/web/manage/manage.js
+++ b/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);
+
}
}
});
diff --git a/java110-code-generator/src/main/resources/web/template_1.json b/java110-code-generator/src/main/resources/web/template_1.json
index 1f0d962..e4565d6 100644
--- a/java110-code-generator/src/main/resources/web/template_1.json
+++ b/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":"涓氬姟绫诲瀷蹇呴』涓篈PI"
},
{
- "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 鎴朜",
+ "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":"閲嶈瘯娆℃暟蹇呴』涓烘暟瀛�"
}
]
diff --git a/java110-code-generator/src/main/resources/web/template_mapping.json b/java110-code-generator/src/main/resources/web/template_mapping.json
new file mode 100644
index 0000000..3642810
--- /dev/null
+++ b/java110-code-generator/src/main/resources/web/template_mapping.json
@@ -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"
+ }
+
+ ]
+}
\ No newline at end of file
diff --git a/java110-code-generator/src/main/resources/web/template_service.json b/java110-code-generator/src/main/resources/web/template_service.json
deleted file mode 100644
index 31039fd..0000000
--- a/java110-code-generator/src/main/resources/web/template_service.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
- "templateName":"鏈嶅姟",
- "templateCode":"service",
- "templateKey":"serviceId",
- "templateKeyName":"鏈嶅姟ID",
- "columns":[
- {
- "code":"name",
- "cnCode":"鏈嶅姟鍚嶇О",
- "desc":"蹇呭～锛岃濉啓鏈嶅姟鍚嶇О",
- "required":true,
- "hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"鏈嶅姟鍚嶇О涓嶈兘瓒呰繃50"
- },
- {
- "code":"serviceCode",
- "cnCode":"鏈嶅姟缂栫爜",
- "desc":"蹇呭～锛岃濉啓鏈嶅姟缂栫爜濡� service.saveService",
- "required":true,
- "hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxin",
- "limitParam":"2,50",
- "limitErrInfo":"鏈嶅姟缂栫爜蹇呴』鍦�2鑷�50瀛楃涔嬮棿"
- },
- {
- "code":"businessTypeCd",
- "cnCode":"绉橀挜",
- "desc":"鍙～锛岃濉啓绉橀挜锛屽鏋滃～鍐欎簡闇�瑕佸姞瀵嗕紶杈�",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"API",
- "inputType":"none",
- "limit":"maxin",
- "limitParam":"2,4",
- "limitErrInfo":"涓氬姟绫诲瀷蹇呴』涓篈PI"
- },
-
- {
- "code":"seq",
- "cnCode":"搴忓垪",
- "desc":"蹇呭～锛岃濉啓搴忓垪",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"1",
- "inputType":"none",
- "limit":"maxLength",
- "limitParam":"1",
- "limitErrInfo":"搴忓垪鏍煎紡閿欒"
- },
-
- {
- "code":"messageQueueName",
- "cnCode":"娑堟伅闃熷垪",
- "desc":"鍙～锛岃濉啓娑堟伅闃熷垪锛岃鍗曞湪寮傛璋冪敤鏃朵娇鐢�",
- "required":false,
- "hasDefaultValue":false,
- "defaultValue":"",
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"娑堟伅闃熷垪涓嶈兘瓒呰繃50"
- }
- ,
-
- {
- "code":"isInstance",
- "cnCode":"鏄惁瀹炰緥",
- "desc":"鍙～锛岃濉啓瀹炰緥 Y 鎴朜",
- "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"
- },
- {
- "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":"閲嶈瘯娆℃暟蹇呴』涓烘暟瀛�"
- }
-
- ]
-}
\ No newline at end of file
diff --git a/java110-db/src/main/resources/mapper/mapping/MappingServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/mapping/MappingServiceDaoImplMapper.xml
index 4b157d2..cffcc21 100644
--- a/java110-db/src/main/resources/mapper/mapping/MappingServiceDaoImplMapper.xml
+++ b/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}
diff --git a/java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml
index 9b2d10f..2d11a7e 100644
--- a/java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml
+++ b/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>
--
Gitblit v1.8.0