From 35f62f9fd810863079db3ba65c73709cd56ee6fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Fri, 2 Dec 2022 10:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=8B=E9=A1=B9=E7=BC=93?=
=?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/service/impl/AppServiceImpl.java | 28 ++-----------------
.../mortals/httpclient/app/AppController.http | 2 +-
2 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
index 6f34ab76..d0757ac8 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
@@ -218,6 +218,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
versionEntity.setVersion(entity.getVersion());
versionEntity.setNotes("搴旂敤鍒濆鍒涘缓锛�");
versionEntity.setFileName(entity.getFileName());
+ versionEntity.setFilePath(entity.getFilePath());
versionEntity.setDistributeFilePath(entity.getDistributeFilePath());
versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context));
@@ -268,38 +269,13 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
versionEntity.setVersion(versionNum++);
versionEntity.setNotes(entity.getNotes());
versionEntity.setFileName(entity.getFileName());
+ versionEntity.setFilePath(entity.getFilePath());
versionEntity.setDistributeFilePath(entity.getDistributeFilePath());
versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity, context);
}
-
-/*
-
-
-
- String version = entity.getVersion();
-
- String versionNum = StrUtil.subAfter(version, Constant.VERSION_PREFIX, false);
- String newVersionNum = NumberUtil.add(versionNum, "0.1").setScale(1).toString();
- AppVersionEntity appVersionEntity = new AppVersionEntity();
- appVersionEntity.initAttrValue();
- AppVersionEntity versionEntity = new AppVersionEntity();
- versionEntity.initAttrValue();
- versionEntity.setAppId(appEntity.getId());
- versionEntity.setVersion(Constant.VERSION_PREFIX + newVersionNum);
- versionEntity.setNotes("搴旂敤鏁版嵁鏇存柊锛�");
- versionEntity.setFileName(appEntity.getFileName());
- versionEntity.setDistributeFilePath(appVersionEntity.getDistributeFilePath());
- versionEntity.setCreateTime(new Date());
- versionEntity.setCreateUserId(this.getContextUserId(context));
- appVersionService.save(versionEntity, context);
- appEntity.setVersion(versionEntity.getVersion());
- appService.update(appEntity, context);
-
-*/
-
super.updateAfter(entity, context);
}
diff --git a/base-manager/src/test/java/com/mortals/httpclient/app/AppController.http b/base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
index a7f334e9..9e998325 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
@@ -41,8 +41,8 @@ Content-Type: application/json
"type":1,
"downDevCount":0,
"shelves":0,
+ "fileName":"绐楀彛灞�.zip",
"filePath":"/file/uploadfile/1661928678354.zip",
- "version":"1.0",
"summary":"vyk2sq"
}
--
2.24.3