吴学文 лет назад: 6
Родитель
Сommit
561b3e6a18

+ 52 - 59
WebService/src/main/resources/components/servicePackage/add-serviceImpl/addServiceImpl.html

@@ -1,4 +1,4 @@
-<div id = "addServiceImplModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addServiceImplModel" 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">
@@ -18,67 +18,60 @@
                                 <label class="col-sm-2 col-form-label">备注</label>
                                 <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填,请填写备注" class="form-control"></div>
                             </div>-->
-
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务实现ID</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceImplInfo.serviceBusinessId"                   type="text" placeholder="必填,请填写服务实现ID" 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="addServiceImplInfo.businessTypeCd"                   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="addServiceImplInfo.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">
-<select class="custom-select" v-model="addServiceImplInfo.invokeType">
-         <option selected  disabled value="">必填,请选择调用类型</option>
-         <option  value="1">微服务POST方式</option>
-<option  value="2">webservice方式</option>
-<option  value="3">http post方式</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">调用地址</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceImplInfo.url"                   type="text" placeholder="必填,请填写调用地址" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">kafka主题</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceImplInfo.messageTopic"                   type="text" placeholder="选填,请填写kafka主题" 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="addServiceImplInfo.timeout"                   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="addServiceImplInfo.retryCount"                   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">
-<textarea  placeholder="选填,请填写描述" class="form-control" v-model="addServiceImplInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">业务类型</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceImplInfo.businessTypeCd" 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="addServiceImplInfo.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">
+                                    <select class="custom-select" v-model="addServiceImplInfo.invokeType">
+                                        <option selected disabled value="">必填,请选择调用类型</option>
+                                        <option value="1">微服务POST方式</option>
+                                        <option value="2">webservice方式</option>
+                                        <option value="3">http post方式</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">调用地址</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceImplInfo.url" type="text" placeholder="必填,请填写调用地址" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">kafka主题</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceImplInfo.messageTopic" type="text" placeholder="选填,请填写kafka主题" 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="addServiceImplInfo.timeout" 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="addServiceImplInfo.retryCount" 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">
+                                    <textarea placeholder="选填,请填写描述" class="form-control" v-model="addServiceImplInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveServiceImplInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveServiceImplInfo()"><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>

+ 1 - 13
WebService/src/main/resources/components/servicePackage/add-serviceImpl/addServiceImpl.js

@@ -8,7 +8,6 @@
         data:{
             addServiceImplInfo:{
                 serviceBusinessId:'',
-                serviceBusinessId:'',
 businessTypeCd:'',
 name:'',
 invokeType:'',
@@ -33,18 +32,7 @@ description:'',
                 return vc.validate.validate({
                     addServiceImplInfo:vc.component.addServiceImplInfo
                 },{
-                    'addServiceImplInfo.serviceBusinessId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"服务实现ID不能为空"
-                        },
- {
-                            limit:"maxLength",
-                            param:"50",
-                            errInfo:"服务实现ID不能超过50"
-                        },
-                    ],
+
 'addServiceImplInfo.businessTypeCd':[
 {
                             limit:"required",

+ 0 - 1
WebService/src/main/resources/components/servicePackage/edit-serviceImpl/editServiceImpl.js

@@ -3,7 +3,6 @@
     vc.extends({
         data:{
             editServiceImplInfo:{
-                serviceBusinessId:'',
 serviceBusinessId:'',
 businessTypeCd:'',
 name:'',

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

@@ -63,7 +63,6 @@
 
                     <table class="footable table table-stripped toggle-arrow-tiny"
                            data-page-size="15"
-                           style="table-layout: fixed;word-break:break-all;"
                     >
                         <thead>
                         <tr>

+ 1 - 1
java110-db/src/main/resources/mapper/service/ServiceBusinessServiceDaoImplMapper.xml

@@ -84,7 +84,7 @@ business_type_cd,invoke_type,message_topic,retry_count,status_cd,service_busines
 
     <!-- 查询服务实现信息 add by wuxw 2018-07-03 -->
     <select id="getServiceBusinessInfo" parameterType="Map" resultType="Map">
-        select  t.business_type_cd,t.business_type_cd businessTypeCd,t.invoke_type,t.invoke_type invokeType,t.message_topic,t.message_topic messageTopic,t.retry_count,t.retry_count retryCount,t.status_cd,t.status_cd statusCd,t.service_business_id,t.service_business_id serviceBusinessId,t.url,t.timeout 
+        select  t.business_type_cd,c.name,c.description,t.business_type_cd businessTypeCd,t.invoke_type,t.invoke_type invokeType,t.message_topic,t.message_topic messageTopic,t.retry_count,t.retry_count retryCount,t.status_cd,t.status_cd statusCd,t.service_business_id,t.service_business_id serviceBusinessId,t.url,t.timeout
 from c_service_business t ,c_business_type c
 where 1 =1
         and t.business_type_cd = c.business_type_cd