From 8f2a3e6e508ea22999a1e032b95a7aec3dbd4967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Wed, 29 Oct 2025 09:53:45 +0800 Subject: [PATCH] =?UTF-8?q?10-29-bug=E4=BF=AE=E5=A4=8D,=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=8C=85=E6=96=B0=E5=A2=9E=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/SysPackageController.java | 7 ++-- .../org/dromara/app/domain/SysPackage.java | 5 +++ .../dromara/app/domain/vo/SysPackageVo.java | 5 +++ .../controller/XzdSkyfkFbhtfkController.java | 33 ++++++++++--------- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java index 00d204f7..6b0cd431 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java @@ -42,7 +42,7 @@ public class SysPackageController { * 上传最新安装包及版本 */ @GetMapping("/uploadNewVersion") - public R uploadNewVersion(String version, String type, MultipartFile file) { + public R uploadNewVersion(String version, String type, MultipartFile file, String context) { String originalFileName = "apk/package/app-release.apk"; // 先查询最新记录 @@ -57,11 +57,11 @@ public class SysPackageController { } // 分离事务：再处理数据库操作 - return handleDatabaseOperations(version, type, upload, list); + return handleDatabaseOperations(version, type, upload, list, context); } @Transactional - public R handleDatabaseOperations(String version, String type, SysOssVo upload, List existingPackages) { + public R handleDatabaseOperations(String version, String type, SysOssVo upload, List existingPackages, String context) { try { // 先删除旧文件记录 if (existingPackages != null && !existingPackages.isEmpty()) { @@ -78,6 +78,7 @@ public class SysPackageController { sysPackage.setFileId(upload.getOssId()); sysPackage.setFileUrl(upload.getUrl()); sysPackage.setType(type); + sysPackage.setContext(context); boolean save = sysPackageService.save(sysPackage); if (!save) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java index 91970a57..dfb28a7f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java @@ -30,4 +30,9 @@ public class SysPackage extends BaseEntity { private String fileUrl; + /** + * 更新内容 + */ + private String context; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java index a37fc641..d988329a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java @@ -27,4 +27,9 @@ public class SysPackageVo { @ExcelProperty("安装包地址") private String fileUrl; + + /** + * 更新内容 + */ + private String context; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java index 68f4e45d..9d395503 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java @@ -1,26 +1,27 @@ package org.dromara.xzd.skyfk.fbhtfk.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; -import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; -import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; +import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; +import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 收款与付款-分包合同付款 @@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/fbhtfk/skyfkFbhtfk") +@RequestMapping("/xzd/fbhtfk/skyfkFbhtfk") public class XzdSkyfkFbhtfkController extends BaseController { private final IXzdSkyfkFbhtfkService xzdSkyfkFbhtfkService;