修改代码生成器 ， 加入多条件 查询功能

WebService/src/main/resources/components/servicePackage/app-service/appService.html

@@ -1,13 +0,0 @@
-<div id="component" >
-    <vc:create name="viewAppInfo"
-               callBackListener = "serviceManage"
-               callBackFunction="listService"
-               needShowAddAppButton="false"
-    ></vc:create>
-
-    <vc:create name="serviceManage"
-               needShowAddAppButton="false"
-    ></vc:create>
-
-
-</div>

WebService/src/main/resources/components/servicePackage/app-service/appService.js

@@ -1,19 +0,0 @@
-/**
-    入驻小区
-**/
-(function(vc){
-    vc.extends({
-        data:{
-
-        },
-        _initMethod:function(){
-            //根据请求参数查询 查询 业主信息
-        },
-        _initEvent:function(){
-
-        },
-        methods:{
-
-        }
-    });
-})(window.vc);

WebService/src/main/resources/components/servicePackage/service-manage/serviceManage.html

@@ -1,31 +1,64 @@
-<div id="component" >
+<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
     <div class="row">
         <div class="col-lg-12">
-            <div class="ibox">
+            <div class="ibox ">
                 <div class="ibox-title">
-                    <h5>服务信息</h5>
+                    <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <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">
-                                    <input type="text" placeholder="请填写服务编码" class=" form-control" v-model="serviceManageInfo.serviceCode">
-                                    <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-2" v-if="serviceManageInfo.needShowAddAppButton=='true'">
-                                    <button type="button"  class="btn btn-primary btn-sm" v-on:click="_openAddServiceModal()">
-                                        <i class="glyphicon glyphicon-plus"></i>
-                                        添加服务
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">更多
+                        </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group input-group">
+                                <input type="text" placeholder="请选择应用名称" v-model="serviceManageInfo.appName"
+                                       class=" form-control">
+                                <div class="input-group-prepend">
+                                    <button type="button" class="btn btn-primary btn-sm"><i
+                                            class="glyphicon glyphicon-search"></i> 选择
                                     </button>
                                 </div>
                             </div>
-                        </form>
-
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入服务名称" v-model="serviceManageInfo.serviceName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入服务编码" v-model="serviceManageInfo.serviceCode"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"><i
+                                    class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入调用地址" v-model="serviceManageInfo.serviceUrl"
+                                       class=" form-control">
+                            </div>
+                        </div>
                     </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>服务信息</h5>
                 </div>
                 <div class="ibox-content">
 
@@ -38,7 +71,7 @@
                             <th class="text-center">服务ID</th>
                             <th class="text-center">服务名称</th>
                             <th class="text-center">服务编码</th>
-                            <th class="text-center">是否API</th>
+                            <th class="text-center">秘钥</th>
                             <th class="text-center">序列</th>
                             <th class="text-center">消息队列</th>
                             <th class="text-center">是否实例</th>
@@ -66,12 +99,18 @@
                             <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>
+                            <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>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteServiceModel(service)">
+                                        删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>

WebService/src/main/resources/components/servicePackage/service-manage/serviceManage.js

@@ -72,6 +72,9 @@
             _queryServiceMethod:function(){
                 vc.component._listServices(DEFAULT_PAGE, DEFAULT_ROWS);
 
+            },
+            _moreCondition:function(){
+
             }
         }
     });

WebService/src/main/resources/views/appServiceFlow.html

@@ -1,37 +0,0 @@
-<!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>
-</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="appService"></vc:create>
-        </div>
-
-        <vc:create name="copyright"></vc:create>
-
-    </div>
-</div>
-
-<vc:create name="commonBottom"></vc:create>
-</body>
-</html>

java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java

@@ -35,6 +35,68 @@ public class GeneratorManagerComponent extends BaseGenerator {
 
         fileContext = super.replaceTemplateContext(fileContext, data);
 
+        //处理查询条件
+        JSONArray tmpConditions = data.getJSONArray("conditions");
+
+        StringBuffer conditionInput = new StringBuffer();
+
+        for(int condIndex = 0 ; condIndex <  tmpConditions.size(); condIndex ++){
+
+            JSONObject tmpCond = tmpConditions.getJSONObject(condIndex);
+
+            if(condIndex % 3 == 0){
+                conditionInput.append("<div class=\"row\">\n");
+            }
+
+            if(condIndex % 3 == 0 || condIndex % 3 == 1) {
+                conditionInput.append("<div class=\"col-sm-4\">\n");
+            }else if(condIndex % 3 == 2){
+                conditionInput.append("<div class=\"col-sm-3\">\n");
+            }
+            if("choose".equals(tmpCond.getString("inputType"))){
+                conditionInput.append("                            <div class=\"form-group input-group\">\n" +
+                        "                                <input type=\"text\" placeholder=\"请选择"+tmpCond.getString("name")+"\" v-model=\""+ data.getString("templateCode")+"ManageInfo."+tmpCond.getString("code")+"\" class=\" form-control\">\n" +
+                        "                                <div class=\"input-group-prepend\">\n" +
+                        "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\"><i\n" +
+                        "                                            class=\"glyphicon glyphicon-search\"></i> 选择\n" +
+                        "                                    </button>\n" +
+                        "                                </div>\n" +
+                        "                            </div>\n");
+
+            }else if("input".equals(tmpCond.getString("inputType"))){
+                conditionInput.append("<div class=\"form-group\">\n" +
+                        "                                <input type=\"text\" placeholder=\"请输入"+tmpCond.getString("name")+"\" v-model=\""+ data.getString("templateCode")+"ManageInfo."+tmpCond.getString("code")+"\" class=\" form-control\">\n" +
+                        "                            </div>");
+            }
+
+                conditionInput.append("                        </div>");
+            if(condIndex == 2){
+                conditionInput.append("<div class=\"col-sm-1\">\n" +
+                        "                            <button type=\"button\" class=\"btn btn-primary btn-sm\"><i\n" +
+                        "                                    class=\"glyphicon glyphicon-search\"></i> 查询\n" +
+                        "                            </button>\n" +
+                        "                        </div>");
+            }else if(condIndex % 3 == 2){
+                conditionInput.append("<div class=\"col-sm-1\">\n" +
+                        "                        </div>");
+
+            }
+
+
+            if(condIndex % 3 == 2 || condIndex == tmpConditions.size() -1){
+                conditionInput.append("</div>\n");
+            }
+        }
+
+        fileContext = fileContext.replace("@@conditionInput@@", conditionInput.toString());
+
+        if(tmpConditions.size() > 3){
+            fileContext = fileContext.replace("@@moreCondition@@","<button type=\"button\"  class=\"btn btn-link btn-sm\" style=\"margin-right:10px;\"  v-on:click=\"_moreCondition()\">更多</button>");
+        }else{
+            fileContext = fileContext.replace("@@moreCondition@@","");
+
+        }
+
         // 处理 th 信息
 
         StringBuffer thSb = new StringBuffer();

java110-code-generator/src/main/resources/web/manage/manage.html

@@ -1,29 +1,57 @@
 <div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
     <div class="row">
         <div class="col-lg-12">
-            <div class="ibox">
+            <div class="ibox ">
                 <div class="ibox-title">
-                    <h5>@@templateName@@信息</h5>
+                    <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <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@@
+                        @@moreCondition@@
+                        <!--<button type="button"  class="btn btn-link btn-sm" style="margin-right:10px;"  v-on:click="_moreCondition()">更多</button>-->
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    @@conditionInput@@
+                    <!--<div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group input-group">
+                                <input type="text" placeholder="请选择应用" class=" form-control">
+                                <div class="input-group-prepend">
+                                    <button type="button" class="btn btn-primary btn-sm"><i
+                                            class="glyphicon glyphicon-search"></i> 选择
                                     </button>
                                 </div>
                             </div>
-                        </form>
-
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入服务名称" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入服务编码" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"><i
+                                    class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>-->
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <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>
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -39,9 +67,9 @@
                         </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="@@templateCode@@ in @@templateCode@@ManageInfo.@@templateCode@@s">
-                                @@columnsName@@
-                            </tr>
+                        <tr v-for="@@templateCode@@ in @@templateCode@@ManageInfo.@@templateCode@@s">
+                            @@columnsName@@
+                        </tr>
                         </tbody>
                         <tfoot>
                         <tr>

java110-code-generator/src/main/resources/web/manage/manage.js

@@ -64,6 +64,9 @@
             _query@@TemplateCode@@Method:function(){
                 vc.component._list@@TemplateCode@@s(DEFAULT_PAGE, DEFAULT_ROWS);
 
+            },
+            _moreCondition:function(){
+
             }
         }
     });

java110-code-generator/src/main/resources/web/template_1.json

@@ -9,6 +9,7 @@
     {
       "name": "应用名称",
       "inputType": "choose",
+      "componentName": "chooseApp",
       "code": "appName",
       "whereCondition": "equal"
     },