添加申请页面抓取

base-manager/doc/api.md

@@ -9383,6 +9383,96 @@ msg|String|消息|-
 ```
 
 
+### 自助终端应用部署
+
+**请求URL:** app/appDistribute
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 应用部署
+
+**请求参数:**
+
+参数名称| 类型    | 必填  |描述
+:---|:------|:----|:-------
+id|Long|否|应用Id
+
+**请求样例:**
+
+```
+{
+
+}
+
+```
+
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+
+**响应消息样例:**
+
+```
+{
+    "msg":"应用部署成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
+### 自助终端基础应用部署
+
+**请求URL:** app/appCommonDistribute
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 基础应用部署
+
+**请求参数:**
+
+参数名称| 类型    | 必填  |描述
+:---|:------|:----|:-------
+filePath|String|是|文件相对路径地址
+
+**请求样例:**
+
+```
+{
+
+}
+
+```
+
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+
+**响应消息样例:**
+
+```
+{
+    "msg":"应用部署成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
 
 ### 自助终端应用克隆
 

base-manager/src/main/java/com/mortals/xhx/module/app/service/AppService.java

@@ -22,6 +22,8 @@ public interface AppService extends ICRUDService<AppEntity, Long> {
 
     Rest<String> appDistribute(AppEntity appEntity, Context context);
 
+    Rest<Void> appCommonDistribute(AppEntity appEntity, Context context);
+
 
     Rest<String> cloneAppsBySites(List<AppEntity> appList, List<SiteEntity> siteList, Context context);
 

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -62,16 +62,16 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
     @Override
     protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException {
         //排序
-        if(!ObjectUtils.isEmpty(params.getIdList())){
+        if (!ObjectUtils.isEmpty(params.getIdList())) {
             //根据idList进行排序
             for (int i = 0; i < params.getIdList().size(); i++) {
                 Long id = params.getIdList().get(i);
                 for (int j = 0; j < list.size(); j++) {
-                    if(id.equals(list.get(j).getId())){
+                    if (id.equals(list.get(j).getId())) {
                         //判断位置是否一直
-                        if(i!=j){
+                        if (i != j) {
                             //交换
-                            Collections.swap(list,i,j);
+                            Collections.swap(list, i, j);
                         }
                     }
                 }
@@ -119,6 +119,29 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
         return Rest.ok("应用部署成功！");
     }
 
+    @Override
+    public Rest<Void> appCommonDistribute(AppEntity appEntity, Context context) {
+        //判断文件是否存在
+        String targetFilePath = uploadService.getFilePath(appEntity.getFilePath());
+        if (FileUtil.isEmpty(new File(targetFilePath))) {
+            throw new AppException("部署文件不存在！");
+        }
+        if (!FileUtil.getSuffix(appEntity.getFilePath()).equals("zip")) {
+            throw new AppException("部署只支持zip文件！");
+        }
+        //部署路径是否存在 如果不存在 创建目录，
+        //文件构成目录 /home/publish/app/common
+        String disPath = "/home/publish/app/common";
+
+        //判断目标目录是否存在 如果存在 这删除
+        if (FileUtil.isDirectory(disPath)) {
+            FileUtil.del(disPath);
+        }
+        ZipUtils.unzip(new File(targetFilePath), disPath);
+
+        return Rest.ok("基础应用部署成功！");
+    }
+
     @Override
     public Rest<String> cloneAppsBySites(List<AppEntity> appList, List<SiteEntity> siteList, Context context) {
         log.info("克隆应用开始!");

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -57,8 +57,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
     }
 
 
-
-
     @Override
     protected int infoAfter(Long id, Map<String, Object> model, AppEntity entity, Context context) throws AppException {
         List<AppEntity> appEntityList = this.service.find(new AppQuery().appCode(entity.getAppCode()), context);
@@ -67,22 +65,13 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         return super.infoAfter(id, model, entity, context);
     }
 
-    @Override
-    protected int doListAfter(AppEntity query, Map<String, Object> model, Context context) throws AppException {
-      //model.get("result")
-
-
-
-        return super.doListAfter(query, model, context);
-    }
-
     /**
      * app应用部署
      */
     @PostMapping(value = "appDistribute")
-    public Rest<Void> appDistribute(@RequestBody AppEntity appEntity) {
+    public Rest<String> appDistribute(@RequestBody AppEntity appEntity) {
         String busiDesc = this.getModuleDesc() + "自助服务应用部署";
-        Rest<Void> rest = Rest.ok(busiDesc + " 【成功】");
+        Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
         try {
             if (ObjectUtils.isEmpty(appEntity.getId())) {
                 throw new AppException("应用Id不能为空！");
@@ -91,7 +80,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
             if (ObjectUtils.isEmpty(appEntity)) {
                 throw new AppException("当前应用不存在！appId:" + appEntity.getId());
             }
-            Rest<String> disRest = this.service.appDistribute(appEntity, getContext());
+            rest = this.service.appDistribute(appEntity, getContext());
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error("自助服务应用部署", e);
@@ -100,6 +89,23 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         return rest;
     }
 
+    /**
+     * app基础应用部署
+     */
+    @PostMapping(value = "appCommonDistribute")
+    public Rest<Void> appCommonDistribute(@RequestBody AppEntity appEntity) {
+        String busiDesc = this.getModuleDesc() + "自助服务应用部署";
+        Rest<Void> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            rest = this.service.appCommonDistribute(appEntity, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error("基础服务应用部署", e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
 
     /**
      * app应用克隆给其它站点