修改克隆应用

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

@@ -221,6 +221,21 @@ public class AppServiceImpl extends AbstractCRUDCacheServiceImpl<AppDao, AppEnti
                     appClone.setDistributeFilePath("");
                     appClone.setShelves(YesNoEnum.NO.getValue());
                     appClone = this.save(appClone, context);
+
+                    //克隆应用版本
+                    AppVersionEntity appVersionCloneEntity = new AppVersionEntity();
+                    appVersionCloneEntity.initAttrValue();
+                    AppVersionQuery appVersionQuery = new AppVersionQuery();
+                    appVersionQuery.setUsed(YesNoEnum.YES.getValue());
+                    appVersionQuery.setAppId(appEntity.getId());
+                    AppVersionEntity appVersionOriEntity = appVersionService.selectOne(appVersionQuery);
+                    BeanUtils.copyProperties(appVersionOriEntity, appVersionCloneEntity, BeanUtil.getNullPropertyNames(appVersionOriEntity));
+                    appVersionCloneEntity.setAppId(appClone.getId());
+                    appVersionCloneEntity.setDistributeFilePath("");
+                    appVersionCloneEntity.setUsed(YesNoEnum.NO.getValue());
+                    appVersionCloneEntity.setId(null);
+                    appVersionService.save(appVersionCloneEntity, context);
+
                     //保存数据集
                     List<AppDatasetEntity> appDatasetList = appClone.getAppDatasetList();
                     if (!ObjectUtils.isEmpty(appDatasetList)) {
@@ -288,7 +303,7 @@ public class AppServiceImpl extends AbstractCRUDCacheServiceImpl<AppDao, AppEnti
         AppEntity targetAppEntity = this.get(targetAppId, context);
 
         //删除应用的数据集
-        if(!ObjectUtils.isEmpty(appEntity.getTargetDelete())&&YesNoEnum.YES.getValue()==appEntity.getTargetDelete()) {
+        if (!ObjectUtils.isEmpty(appEntity.getTargetDelete()) && YesNoEnum.YES.getValue() == appEntity.getTargetDelete()) {
             Long[] delIds = targetAppEntity.getAppDatasetList().stream().map(i -> i.getId()).toArray(Long[]::new);
             if (!ObjectUtils.isEmpty(delIds)) {
                 appDatasetService.remove(delIds, context);

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

@@ -201,7 +201,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
             }
             List<AppEntity> appEntityList = this.service.find(new AppQuery().idList(appQuery.getIdList()), getContext());
             List<SiteEntity> siteEntityList = siteService.find(new SiteQuery().idList(appQuery.getSiteIdList()), getContext());
-            Rest<String> cloneRest = this.service.cloneAppsBySites(appEntityList, siteEntityList, getContext());
+             this.service.cloneAppsBySites(appEntityList, siteEntityList, getContext());
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error("自助服务应用部署", e);

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

@@ -104,7 +104,7 @@ public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppV
             if (appVersionEntity.getUsed() == YesNoEnum.YES.getValue()) {
                 throw new AppException("当前应用使用中！");
             }
-            Rest<Void> usedRest = this.service.appUsed(appVersionEntity, getContext());
+             this.service.appUsed(appVersionEntity, getContext());
             recordSysLog(request, busiDesc + " 【成功】");
 
         } catch (Exception e) {