取消事项缓存

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

@@ -215,6 +215,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
         AppVersionEntity versionEntity = new AppVersionEntity();
         versionEntity.initAttrValue();
         versionEntity.setAppId(entity.getId());
+        versionEntity.setAppName(entity.getAppName());
         versionEntity.setVersion(entity.getVersion());
         versionEntity.setNotes("应用初始创建！");
         versionEntity.setFileName(entity.getFileName());
@@ -266,6 +267,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
             AppVersionEntity versionEntity = new AppVersionEntity();
             versionEntity.initAttrValue();
             versionEntity.setAppId(entity.getId());
+            versionEntity.setAppName(entity.getAppName());
             versionEntity.setVersion(versionNum++);
             versionEntity.setNotes(entity.getNotes());
             versionEntity.setFileName(entity.getFileName());

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

@@ -92,14 +92,15 @@ public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppV
                 throw new AppException("当前应用版本不存在！appVersionId:" + appVersionId);
             }
 
-            if (appVersionEntity.getUsed() == YesNoEnum.NO.getValue()) {
+            if (appVersionEntity.getUsed() == YesNoEnum.YES.getValue()) {
                 throw new AppException("当前应用使用中！");
             }
-
+            Rest<Void> usedRest = this.service.appUsed(appVersionEntity, getContext());
             recordSysLog(request, busiDesc + " 【成功】");
+
         } catch (Exception e) {
             log.error("自助服务应用预览", e);
-            rest = Rest.fail(super.convertException(e));
+            return Rest.fail(super.convertException(e));
         }
         return rest;
     }

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

@@ -50,6 +50,31 @@ Content-Type: application/json
 client.global.set("App_id", JSON.parse(response.body).data.id);
 %}
 
+
+###自助终端应用更新
+POST {{baseUrl}}/app/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "id":5,
+  "siteName":"汇东县",
+  "appCode":"ckp",
+  "appName":"测试应用1",
+  "appIconPath":"/file/preview/196089969797.jpg",
+  "appThemeName":"应用程序",
+  "type":1,
+  "downDevCount":0,
+  "shelves":0,
+  "fileName":"窗口屏.zip",
+  "filePath":"/file/uploadfile/1661928678354.zip",
+  "summary":"vyk2sq"
+}
+
+> {%
+client.global.set("App_id", JSON.parse(response.body).data.id);
+%}
+
 ###自助终端应用查看
 GET {{baseUrl}}/app/info?id={{App_id}}
 Authorization: {{authToken}}

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

@@ -61,5 +61,8 @@ Authorization: {{authToken}}
 Accept: application/json
 
 
-
+###自助终端应用版本使用
+POST {{baseUrl}}/app/version/used?appVersionId=3
+Authorization: {{authToken}}
+Accept: application/json