修复 根据 查询类型 显示不同的

WebService/src/main/resources/components/serviceProvidePackage/add-serviceProvide/addServiceProvide.html

@@ -1,4 +1,5 @@
-<div id = "addServiceProvideModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addServiceProvideModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -20,62 +21,74 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务名称</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceProvideInfo.name"                   type="text" placeholder="必填，请填写服务名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务编码</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceProvideInfo.serviceCode"                   type="text" placeholder="必填，请填写服务编码" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">参数</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceProvideInfo.params"                   type="text" placeholder="必填，请填写参数" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">实现方式</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addServiceProvideInfo.queryModel">
-         <option selected  disabled value="">必填，请选择实现方式</option>
-         <option  value="1">sql方式</option>
-<option  value="3">java方式</option>
-<option  value="2">存储过程方式</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">sql</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写sql" class="form-control" v-model="addServiceProvideInfo.sql"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">输出模板</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写输出模板" class="form-control" v-model="addServiceProvideInfo.template"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">存储过程</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写存储过程" class="form-control" v-model="addServiceProvideInfo.proc"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">java</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写java" class="form-control" v-model="addServiceProvideInfo.javaScript"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写描述" class="form-control" v-model="addServiceProvideInfo.remark"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">服务名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceProvideInfo.name" type="text" placeholder="必填，请填写服务名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">服务编码</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceProvideInfo.serviceCode" type="text"
+                                           placeholder="必填，请填写服务编码" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">参数</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceProvideInfo.params" type="text" placeholder="必填，请填写参数"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">实现方式</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addServiceProvideInfo.queryModel">
+                                        <option selected disabled value="">必填，请选择实现方式</option>
+                                        <option value="1">sql方式</option>
+                                        <option value="3">java方式</option>
+                                        <option value="2">存储过程方式</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row" v-if="addServiceProvideInfo.queryModel==1">
+                                <label class="col-sm-2 col-form-label">sql</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写sql" class="form-control"
+                                              v-model="addServiceProvideInfo.sql"></textarea></div>
+                            </div>
+                            <div class="form-group row" v-if="addServiceProvideInfo.queryModel==1">
+                                <label class="col-sm-2 col-form-label">输出模板</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写输出模板" class="form-control"
+                                              v-model="addServiceProvideInfo.template"></textarea></div>
+                            </div>
+                            <div class="form-group row" v-if="addServiceProvideInfo.queryModel==2">
+                                <label class="col-sm-2 col-form-label">存储过程</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写存储过程" class="form-control"
+                                              v-model="addServiceProvideInfo.proc"></textarea></div>
+                            </div>
+                            <div class="form-group row" v-if="addServiceProvideInfo.queryModel==3">
+                                <label class="col-sm-2 col-form-label">java</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写java" class="form-control"
+                                              v-model="addServiceProvideInfo.javaScript"></textarea></div>
+                            </div>
+                            <div class="form-group row" >
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="addServiceProvideInfo.remark"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveServiceProvideInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveServiceProvideInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/serviceProvidePackage/edit-serviceProvide/editServiceProvide.html

@@ -1,4 +1,5 @@
-<div id = "editServiceProvideModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editServiceProvideModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,62 +8,74 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务名称</label>
-         <div class="col-sm-10">
-           <input v-model="editServiceProvideInfo.name"                   type="text" placeholder="必填，请填写服务名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务编码</label>
-         <div class="col-sm-10">
-           <input v-model="editServiceProvideInfo.serviceCode"                   type="text" placeholder="必填，请填写服务编码" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">参数</label>
-         <div class="col-sm-10">
-           <input v-model="editServiceProvideInfo.params"                   type="text" placeholder="必填，请填写参数" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">实现方式</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editServiceProvideInfo.queryModel">
-         <option selected  disabled value="">必填，请选择实现方式</option>
-         <option  value="1">sql方式</option>
-<option  value="3">java方式</option>
-<option  value="2">存储过程方式</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">sql</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写sql" class="form-control" v-model="editServiceProvideInfo.sql"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">输出模板</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写输出模板" class="form-control" v-model="editServiceProvideInfo.template"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">存储过程</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写存储过程" class="form-control" v-model="editServiceProvideInfo.proc"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">java</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写java" class="form-control" v-model="editServiceProvideInfo.javaScript"></textarea>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写描述" class="form-control" v-model="editServiceProvideInfo.remark"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">服务名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editServiceProvideInfo.name" type="text" placeholder="必填，请填写服务名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">服务编码</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editServiceProvideInfo.serviceCode" type="text"
+                                           placeholder="必填，请填写服务编码" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">参数</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editServiceProvideInfo.params" type="text" placeholder="必填，请填写参数"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">实现方式</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editServiceProvideInfo.queryModel">
+                                        <option selected disabled value="">必填，请选择实现方式</option>
+                                        <option value="1">sql方式</option>
+                                        <option value="3">java方式</option>
+                                        <option value="2">存储过程方式</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row" v-if="editServiceProvideInfo.queryModel==1">
+                                <label class="col-sm-2 col-form-label">sql</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写sql" class="form-control"
+                                              v-model="editServiceProvideInfo.sql"></textarea></div>
+                            </div>
+                            <div class="form-group row" v-if="editServiceProvideInfo.queryModel==1">
+                                <label class="col-sm-2 col-form-label">输出模板</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写输出模板" class="form-control"
+                                              v-model="editServiceProvideInfo.template"></textarea></div>
+                            </div>
+                            <div class="form-group row" v-if="editServiceProvideInfo.queryModel==2">
+                                <label class="col-sm-2 col-form-label">存储过程</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写存储过程" class="form-control"
+                                              v-model="editServiceProvideInfo.proc"></textarea></div>
+                            </div>
+                            <div class="form-group row" v-if="editServiceProvideInfo.queryModel==3">
+                                <label class="col-sm-2 col-form-label">java</label>
+                                <div class="col-sm-10">
+                                    <textarea rows="10" placeholder="选填，请填写java" class="form-control"
+                                              v-model="editServiceProvideInfo.javaScript"></textarea></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="editServiceProvideInfo.remark"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editServiceProvide()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editServiceProvide()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

java110-bean/src/main/java/com/java110/vo/api/service/ApiServiceDataVo.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class ApiServiceDataVo implements Serializable {
-
     private String serviceId;
 private String name;
 private String serviceCode;

java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml

@@ -307,7 +307,7 @@
 
     <!-- 查询服务提供信息 add by wuxw 2018-07-03 -->
     <select id="getServiceProvideInfo" parameterType="Map" resultType="Map">
-        select t.service_code serviceCode,t.name,t.params,t.query_model queryModel,
+        select t.id,t.service_code serviceCode,t.name,t.params,t.query_model queryModel,
         (CASE
         WHEN t.`query_model` = '1'
         THEN 'SQL方式'