Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java

@@ -54,6 +54,10 @@ public class AppVo extends BaseEntityLong {
      * 目标app
      */
     private Long targetAppId;
+    /**
+     * 是否删除
+     */
+    private Integer targetDelete=0;
 
     /** 类型(1.应用程序,2.url)列表 */
     private List <Integer> appTypeList;

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

@@ -321,10 +321,12 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
         AppEntity targetAppEntity = this.get(targetAppId, context);
 
         //删除应用的数据集
+        if(!ObjectUtils.isEmpty(sourceAppEntity.getTargetDelete())&&YesNoEnum.YES.getValue()==sourceAppEntity.getTargetDelete()) {
             Long[] delIds = targetAppEntity.getAppDatasetList().stream().map(i -> i.getId()).toArray(Long[]::new);
             if (ObjectUtils.isEmpty(delIds)) {
                 appDatasetService.remove(delIds, context);
             }
+        }
 
         //保存数据集
         List<AppDatasetEntity> appDatasetList = sourceAppEntity.getAppDatasetList();

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

@@ -214,6 +214,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
      * app应用克隆给本站点
      */
     @PostMapping(value = "cloneAppBySameSite")
+    @UnAuth
     public Rest<Void> cloneAppBySameSite(@RequestBody AppEntity appQuery) {
         String busiDesc = this.getModuleDesc() + "自助服务应用部署克隆";
         Rest<Void> rest = Rest.ok(busiDesc + " 【成功】");

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -117,5 +117,16 @@ Content-Type: application/json
 }
 
 
+###自助终端应用克隆1
+POST {{baseUrl}}/app/cloneAppBySameSite
+Content-Type: application/json
+
+{
+  "sourceAppId":228,
+  "targetAppId":230
+}
+
+
+