完成 web java开发功能

OrderService/src/main/java/com/java110/order/api/CacheApi.java

@@ -3,7 +3,7 @@ package com.java110.order.api;
 import com.java110.order.smo.ICenterServiceCacheSMO;
 import com.java110.common.constant.ResponseConstant;
 import com.java110.core.base.controller.BaseController;
-import com.java110.core.factory.DataQueryFactory;
+import com.java110.service.context.DataQueryFactory;
 import com.java110.core.factory.DataTransactionFactory;
 import com.java110.service.context.DataQuery;
 import org.slf4j.Logger;

WebService/src/main/resources/components/appPackage/choose-app/chooseApp.html

@@ -30,10 +30,6 @@
                                         <tr>
                                             <th>应用Id</th>
                                             <th>应用名称</th>
-                                            <th>秘钥</th>
-                                            <th>白名单</th>
-                                            <th>黑名单</th>
-                                            <th>备注</th>
                                             <th>操作</th>
                                         </tr>
                                     </thead>
@@ -41,10 +37,6 @@
                                         <tr v-for="app in chooseAppInfo.apps">
                                             <td>{{app.appId}}</td>
                                             <td>{{app.name}}</td>
-                                            <td>{{app.securityCode}}</td>
-                                            <td>{{app.whileListIp}}</td>
-                                            <td>{{app.blackListIp}}</td>
-                                            <td>{{app.remark}}</td>
                                             <td>
                                                 <button class="btn btn-primary btn-xs" v-on:click="chooseApp(app)">选择</button>
                                             </td>

WebService/src/main/resources/components/servicePackage/add-service/addService.html

@@ -1,4 +1,5 @@
-<div id = "addServiceModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addServiceModel" 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,60 +21,75 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务名称</label>
-         <div class="col-sm-10">
-           <input v-model="addServiceInfo.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="addServiceInfo.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="addServiceInfo.messageQueueName"                   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="addServiceInfo.isInstance"                   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="addServiceInfo.url"                   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="addServiceInfo.method">
-         <option selected  disabled value="">必填，请选择调用方式</option>
-         <option  value="GET">http get</option>
-<option  value="POST">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="addServiceInfo.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="addServiceInfo.retryCount"                   type="text" placeholder="必填，请填写重试次数" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">服务名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addServiceInfo.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="addServiceInfo.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="addServiceInfo.messageQueueName" 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="addServiceInfo.isInstance">
+                                        <option selected disabled value="">必填，请填写是否实例</option>
+                                        <option value="Y">是</option>
+                                        <option value="N">否</option>
+                                        <option value="NT">透传</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="addServiceInfo.url" 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="addServiceInfo.method">
+                                        <option selected disabled value="">必填，请选择调用方式</option>
+                                        <option value="GET">http get</option>
+                                        <option value="POST">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="addServiceInfo.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="addServiceInfo.retryCount" type="text" placeholder="必填，请填写重试次数"
+                                           class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveServiceInfo()" ><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="saveServiceInfo()"><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/servicePackage/edit-service/editService.html

@@ -1,4 +1,5 @@
-<div id = "editServiceModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editServiceModel" 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,60 +8,75 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">服务名称</label>
-         <div class="col-sm-10">
-           <input v-model="editServiceInfo.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="editServiceInfo.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="editServiceInfo.messageQueueName"                   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="editServiceInfo.isInstance"                   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="editServiceInfo.url"                   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="editServiceInfo.method">
-         <option selected  disabled value="">必填，请选择调用方式</option>
-         <option  value="GET">http get</option>
-<option  value="POST">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="editServiceInfo.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="editServiceInfo.retryCount"                   type="text" placeholder="必填，请填写重试次数" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">服务名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editServiceInfo.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="editServiceInfo.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="editServiceInfo.messageQueueName" 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="editServiceInfo.isInstance">
+                                        <option selected disabled value="">必填，请填写是否实例</option>
+                                        <option value="Y">是</option>
+                                        <option value="N">否</option>
+                                        <option value="NT">透传</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="editServiceInfo.url" 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="editServiceInfo.method">
+                                        <option selected disabled value="">必填，请选择调用方式</option>
+                                        <option value="GET">http get</option>
+                                        <option value="POST">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="editServiceInfo.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="editServiceInfo.retryCount" type="text" placeholder="必填，请填写重试次数"
+                                           class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editService()" ><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="editService()"><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-core/src/main/java/com/java110/core/javassist/IJavassist.java

@@ -1,16 +0,0 @@
-package com.java110.core.javassist;
-
-import com.java110.core.context.service.DataQuery;
-
-/**
- * @ClassName IJavassist
- * @Description TODO
- * @Author wuxw
- * @Date 2019/9/4 23:08
- * @Version 1.0
- * add by wuxw 2019/9/4
- **/
-public interface IJavassist {
-
-    public void execute(DataQuery dataQuery);
-}

java110-service/src/main/java/com/java110/service/api/BusinessApi.java

@@ -3,7 +3,7 @@ package com.java110.service.api;
 import com.java110.common.constant.CommonConstant;
 import com.java110.common.constant.ResponseConstant;
 import com.java110.common.util.Assert;
-import com.java110.core.factory.DataQueryFactory;
+import com.java110.service.context.DataQueryFactory;
 import com.java110.core.factory.DataTransactionFactory;
 import com.java110.core.base.controller.BaseController;
 import com.java110.service.context.DataQuery;

java110-service/src/main/java/com/java110/service/context/DataQuery.java

@@ -132,7 +132,7 @@ public class DataQuery {
      * @param sqlParam sql 参数
      * @return 查询结果
      */
-    public Object queryDataBySql(String sql, List<Object> sqlParam){
+    public List<Map<String, Object>> queryDataBySql(String sql, List<Object> sqlParam){
         IQueryServiceDAO queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl",IQueryServiceDAO.class);
         return queryServiceDAOImpl.executeSql(sql, sqlParam.toArray());
     }

java110-core/src/main/java/com/java110/core/factory/DataQueryFactory.java

@@ -1,7 +1,6 @@
-package com.java110.core.factory;
+package com.java110.service.context;
 
 import com.java110.common.cache.ServiceSqlCache;
-import com.java110.core.context.service.DataQuery;
 import com.java110.entity.service.ServiceSql;
 
 /**

java110-service/src/main/java/com/java110/service/develop/IDevelop.java

@@ -0,0 +1,24 @@
+package com.java110.service.develop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.service.context.DataQuery;
+
+/**
+ * 开发接口类
+ * @ClassName IDevelop
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/9/8 14:22
+ * @Version 1.0
+ * add by wuxw 2019/9/8
+ **/
+public interface IDevelop {
+
+    /**
+     * 执行脚本方法
+     * @param dataQuery 查询上下文对象
+     * @return json
+     */
+    public JSONObject execute(DataQuery dataQuery);
+
+}

java110-service/src/main/java/com/java110/service/develop/notice/GetNoticesByJava.java

@@ -0,0 +1,58 @@
+package com.java110.service.develop.notice;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.service.context.DataQuery;
+import com.java110.service.develop.IDevelop;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName GetNoticesByJava
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/9/8 14:31
+ * @Version 1.0
+ * add by wuxw 2019/9/8
+ **/
+public class GetNoticesByJava implements IDevelop {
+    @Override
+    public JSONObject execute(DataQuery dataQuery) {
+        JSONObject params = dataQuery.getRequestParams();
+        List sqlParams = new ArrayList();
+
+        String sql = "SELECT nn.`notice_id` noticeId," +
+                "nn.`title`," +
+                "nn.`notice_type_cd` noticeTypeCd," +
+                "nn.`context`," +
+                "nn.`community_id` communityId," +
+                "nn.`user_id` userId," +
+                "nn.`start_time` startTime " +
+                "FROM n_notice nn\n" +
+                "WHERE nn.status_cd = '0'" ;
+        if(params.containsKey("noticeId") && !StringUtils.isEmpty(params.getString("noticeId"))){
+            sql += "and nn.`notice_id` = ? ";
+            sqlParams.add(params.get("noticeId"));
+        }
+        if(params.containsKey("communityId") && !StringUtils.isEmpty(params.getString("communityId"))){
+            sql += "and nn.`community_id` = ? ";
+            sqlParams.add(params.get("communityId"));
+        }
+        if(params.containsKey("userId") && !StringUtils.isEmpty(params.getString("userId"))){
+            sql += "and nn.`user_id` = ? ";
+            sqlParams.add(params.get("userId"));
+        }
+        if(params.containsKey("title") && !StringUtils.isEmpty(params.getString("title"))){
+            sql += "and nn.`notice_id` LIKE CONCAT('%',?,'%') ";
+            sqlParams.add(params.get("title"));
+        }
+
+        List outParam = dataQuery.queryDataBySql(sql,sqlParams);
+
+        JSONObject outObj = new JSONObject();
+        outObj.put("notices", outParam);
+
+        return outObj;
+    }
+}

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

@@ -190,10 +190,6 @@ public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSM
             if (param.endsWith(",")) {
                 param = param.substring(0, param.length() - 1);
             }*/
-
-
-
-
             dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
                     "成功", JSONObject.parseObject(interpreter.eval("execute(" + dataQuery + ")").toString())));
         } catch (Exception e) {