Procházet zdrojové kódy

加入 服务绑定bug 优化

wuxw před 6 roky
rodič
revize
bfd09e93a3

+ 7 - 2
WebService/src/main/java/com/java110/web/smo/service/impl/BindingServiceSMOImpl.java

@@ -27,9 +27,14 @@ public class BindingServiceSMOImpl extends AbstractComponentSMO implements IBind
 
         JSONArray infos = paramIn.getJSONArray("data");
 
-        if(infos == null || infos.size() !=2){
-            throw new IllegalArgumentException("请求参数错误,为包含 应用或服务信息");
+        if(infos == null || infos.size() !=3){
+            throw new IllegalArgumentException("请求参数错误,为包含 应用, 服务或 扩展信息");
         }
+
+        Assert.hasKeyByFlowData(infos, "addRouteView", "orderTypeCd", "必填,请填写订单类型");
+        Assert.hasKeyByFlowData(infos, "addRouteView", "invokeLimitTimes", "必填,请填写调用次数");
+        Assert.hasKeyByFlowData(infos, "addRouteView", "invokeModel", "可填,请填写消息队列,订单在异步调用时使用");
+
     }
 
     @Override

+ 2 - 0
WebService/src/main/resources/components/serviceRegisterPackage/serviceRegister-manage/serviceRegisterManage.html

@@ -82,6 +82,7 @@
                             <th class="text-center">应用名称</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>
 
@@ -94,6 +95,7 @@
                             <td class="text-center">{{serviceRegister.appName}}</td>
                             <td class="text-center">{{serviceRegister.serviceId}}</td>
                             <td class="text-center">{{serviceRegister.serviceName}}</td>
+                            <td class="text-center">{{serviceRegister.serviceCode}}</td>
                             <td class="text-center">{{serviceRegister.orderTypeCd}}</td>
                             <td class="text-center">
                                 <div class="btn-group">

+ 9 - 8
WebService/src/main/resources/components/serviceRegisterPackage/serviceRegister-manage/serviceRegisterManage.js

@@ -23,7 +23,8 @@ serviceUrl:'',
             }
         },
         _initMethod:function(){
-            vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
+            //vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.component._loadDataByParam(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent:function(){
             vc.on('serviceRegisterManage','chooseApp',function(_param){
@@ -92,12 +93,12 @@ serviceUrl:'',
 
             },
             _loadDataByParam: function(){
-                    vc.component.serviceManageInfo.conditions.appId = vc.getParam("appId");
+                    vc.component.serviceRegisterManageInfo.conditions.appId = vc.getParam("appId");
                     //如果 floodId 没有传 则,直接结束
-                    if(vc.component.serviceManageInfo.conditions.appId == null
-                        || vc.component.serviceManageInfo.conditions.appId == undefined
-                        || vc.component.serviceManageInfo.conditions.appId == ''){
-                        vc.component._listServices(DEFAULT_PAGE, DEFAULT_ROWS);
+                    if(vc.component.serviceRegisterManageInfo.conditions.appId == null
+                        || vc.component.serviceRegisterManageInfo.conditions.appId == undefined
+                        || vc.component.serviceRegisterManageInfo.conditions.appId == ''){
+                        vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
                         return ;
                     }
 
@@ -106,7 +107,7 @@ serviceUrl:'',
                             page:DEFAULT_PAGE,
                             row:DEFAULT_ROWS,
                             communityId:vc.getCurrentCommunity().communityId,
-                            appId:vc.component.serviceManageInfo.conditions.appId
+                            appId:vc.component.serviceRegisterManageInfo.conditions.appId
                         }
                     }
 
@@ -118,7 +119,7 @@ serviceUrl:'',
                             if(res.status == 200){
                                 var _appInfo = JSON.parse(json);
                                 var _tmpApp = _appInfo.apps[0];
-                                vc.component.serviceManageInfo.conditions.appName = _tmpApp.name;
+                                vc.component.serviceRegisterManageInfo.conditions.appName = _tmpApp.name;
                                 return ;
                             }
                             vc.message(json);