增强 服务提供功能

WebService/src/main/resources/components/servicePackage/choose-service/chooseService.html

@@ -28,24 +28,24 @@
                                 <table class="table table-striped">
                                     <thead>
                                         <tr>
-                                            <th class="text-center">服务ID</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>
                                             <th class="text-center">消息队列</th>
-                                            <th class="text-center">调用地址</th>
+                                            <th class="text-center">调用地址</th>-->
                                             <th class="text-center">调用方式</th>
                                             <th>操作</th>
                                         </tr>
                                     </thead>
                                     <tbody>
                                         <tr v-for="service in chooseServiceInfo.services">
-                                            <td class="text-center">{{service.serviceId}}</td>
+                                            <!--<td class="text-center">{{service.serviceId}}</td>-->
                                             <td class="text-center">{{service.name}}</td>
                                             <td class="text-center">{{service.serviceCode}}</td>
-                                            <td class="text-center">{{service.seq}}</td>
+                                            <!--<td class="text-center">{{service.seq}}</td>
                                             <td class="text-center">{{service.messageQueueName}}</td>
-                                            <td class="text-center">{{service.url}}</td>
+                                            <td class="text-center">{{service.url}}</td>-->
                                             <td class="text-center">{{service.method}}</td>
                                             <td>
                                                 <button class="btn btn-primary btn-xs" v-on:click="chooseService(service)">选择</button>

WebService/src/main/resources/components/serviceProvidePackage/devServiceProvideView/devServiceProvideView.html

@@ -35,7 +35,7 @@
                 <div class="form-group row" v-if="devServiceProvideViewInfo.queryModel==1">
                     <label class="col-sm-2 col-form-label">输出模板</label>
                     <div class="col-sm-10">
-                        <textarea cols="5" placeholder="选填，请填写输出模板" class="form-control"
+                        <textarea cols="10" placeholder="选填，请填写输出模板" class="form-control"
                                   v-model="devServiceProvideViewInfo.template"></textarea></div>
                 </div>
                 <div class="form-group row" v-if="devServiceProvideViewInfo.queryModel==2">

java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java

@@ -172,25 +172,25 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
      */
     private void doExecuteJava(DataQuery dataQuery) throws BusinessException {
         try {
-            JSONObject params = dataQuery.getRequestParams();
+            //JSONObject params = dataQuery.getRequestParams();
             String javaCode = dataQuery.getServiceSql().getJavaScript();
 
             Interpreter interpreter = new Interpreter();
             interpreter.eval(javaCode);
-            String param = "";
+           /* String param = "";
             for (String key : params.keySet()) {
                 param += (params.getString(key) + ",");
             }
 
             if (param.endsWith(",")) {
                 param = param.substring(0, param.length() - 1);
-            }
+            }*/
 
             dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
-                    "成功", JSONObject.parseObject(interpreter.eval("execute(" + param + ")").toString())));
+                    "成功", JSONObject.parseObject(interpreter.eval("execute(" + dataQuery + ")").toString())));
         } catch (Exception e) {
             logger.error("数据交互异常：", e);
-            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "数据交互异常。。。");
+            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "数据交互异常,"+e.getMessage());
         }
     }
 
@@ -251,6 +251,9 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
             List<Object> currentParams = new ArrayList<Object>();
 
             String currentSql = sqlObj.getString(dataQuery.getTemplateKey());
+            //处理 if 判断
+            currentSql = dealSqlIf(currentSql);
+
             String[] sqls = currentSql.split("#");
             String currentSqlNew = "";
             for (int sqlIndex = 0; sqlIndex < sqls.length; sqlIndex++) {
@@ -320,6 +323,27 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
         }
     }
 
+    /**
+     * 处理SQL语句
+     * @param oldSql
+     *              select * from s_a a
+     *              where if(name != null && name != ''){
+             *                  a.name = #name#
+             *             }
+     * @return
+     */
+    private String dealSqlIf(String oldSql){
+        String newSql = "";
+        // 未包含 条件语句
+        if(!oldSql.replace(" ","").contains("if(")){
+            return oldSql;
+        }
+
+
+        return newSql;
+
+    }
+
     /**
      * 处理JSONArray
      *