修改代码生成 支持 条件中 select 生成

WebService/src/main/resources/components/servicePackage/serviceImpl-manage/serviceImplManage.html

@@ -5,28 +5,42 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button"  class="btn btn-link btn-sm" style="margin-right:10px;"  v-on:click="_moreCondition()">更多</button>
+                        <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">
+                        <div class="col-sm-4">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入业务类型" v-model="serviceImplManageInfo.conditions.businessTypeCd" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<div class="form-group">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入业务名称" v-model="serviceImplManageInfo.conditions.name" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-                        </div><div class="col-sm-1">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <select class="custom-select" v-model="addServiceImplInfo.invokeType">
+                                <option selected value="">请选择调用方式</option>
+                                <option value="1">微服务POST方式</option>
+                                <option value="2">webservice方式</option>
+                                <option value="3">http post方式</option>
+                            </select>
+                        </div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryServiceImplMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="serviceImplManageInfo.moreCondition == true">
-<div class="form-group">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="serviceImplManageInfo.moreCondition == true">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入kafka主题" v-model="serviceImplManageInfo.conditions.messageTopic" class=" form-control">
-                            </div>                        </div></div>
+                            </div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -53,7 +67,7 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">服务实现ID</th>
+                            <th class="text-center">服务实现ID</th>
                             <th class="text-center">服务实现ID</th>
                             <th class="text-center">业务类型</th>
                             <th class="text-center">业务名称</th>
@@ -65,17 +79,19 @@
                         </thead>
                         <tbody>
                         <tr v-for="serviceImpl in serviceImplManageInfo.serviceImpls">
-                                                        <td class="text-center">{{serviceImpl.serviceBusinessId}}</td>
+                            <td class="text-center">{{serviceImpl.serviceBusinessId}}</td>
                             <td class="text-center">{{serviceImpl.serviceBusinessId}}</td>
                             <td class="text-center">{{serviceImpl.businessTypeCd}}</td>
                             <td class="text-center">{{serviceImpl.name}}</td>
                             <td class="text-center">{{serviceImpl.invokeType}}</td>
-                            <td class="text-center"><div class="btn-group">
+                            <td class="text-center">
+                                <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditServiceImplModel(serviceImpl)">修改</button>
                                 </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openDeleteServiceImplModel(serviceImpl)">删除</button>
-                                </div></td>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -94,7 +110,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addServiceImpl"
                callBackListener=""

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

@@ -84,6 +84,27 @@ public class GeneratorManagerComponent extends BaseGenerator {
                 conditionInput.append("<div class=\"form-group\">\n" +
                         "                                <input type=\"text\" placeholder=\"请输入" + tmpCond.getString("name") + "\" v-model=\"" + data.getString("templateCode") + "ManageInfo.conditions." + tmpCond.getString("code") + "\" class=\" form-control\">\n" +
                         "                            </div>");
+            } else if ("select".equals(tmpCond.getString("inputType"))){
+
+                String[] selectValues = tmpCond.getString("selectValue").split(",");
+                String[] selectValueNames = tmpCond.getString("selectValueName").split(",");
+
+
+                String option = "";
+                for (int valueIndex = 0; valueIndex < selectValues.length; valueIndex++) {
+
+                    String value = selectValues[valueIndex];
+
+                    option += "<option  value=\"" + value + "\">" + selectValueNames[valueIndex] + "</option>\n";
+
+                }
+
+                conditionInput.append("<select class=\"custom-select\" v-model=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+tmpCond.getString("code")+"\">\n" +
+                        "         <option selected  value=\"\">请选择" + tmpCond.getString("name") + "</option>\n" +
+                        "         " +option+
+                        "  </select>"
+                );
+
             }
 
             conditionInput.append("                        </div>");