lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-29-bug修复,安装包新增描述

Browse Source
This commit is contained in:
青云
2025-10-29 09:53:45 +08:00
parent b67a7d5370
commit 8f2a3e6e50
4 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java
View File

@ -42,7 +42,7 @@ public class SysPackageController {
* 上传最新安装包及版本 * 上传最新安装包及版本
*/ */
@GetMapping("/uploadNewVersion") @GetMapping("/uploadNewVersion")
public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file) { public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file, String context) {
String originalFileName = "apk/package/app-release.apk"; 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 @Transactional
public R<SysPackage> handleDatabaseOperations(String version, String type, SysOssVo upload, List<SysPackage> existingPackages) { public R<SysPackage> handleDatabaseOperations(String version, String type, SysOssVo upload, List<SysPackage> existingPackages, String context) {
try { try {
// 先删除旧文件记录 // 先删除旧文件记录
if (existingPackages != null && !existingPackages.isEmpty()) { if (existingPackages != null && !existingPackages.isEmpty()) {
@ -78,6 +78,7 @@ public class SysPackageController {
sysPackage.setFileId(upload.getOssId()); sysPackage.setFileId(upload.getOssId());
sysPackage.setFileUrl(upload.getUrl()); sysPackage.setFileUrl(upload.getUrl());
sysPackage.setType(type); sysPackage.setType(type);
sysPackage.setContext(context);
boolean save = sysPackageService.save(sysPackage); boolean save = sysPackageService.save(sysPackage);
if (!save) { if (!save) {

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java
View File

@ -30,4 +30,9 @@ public class SysPackage extends BaseEntity {
private String fileUrl; private String fileUrl;
/**
* 更新内容
*/
private String context;
} }

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java
View File

@ -27,4 +27,9 @@ public class SysPackageVo {
@ExcelProperty("安装包地址") @ExcelProperty("安装包地址")
private String fileUrl; private String fileUrl;
/**
* 更新内容
*/
private String context;
} }

33
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
View File

@ -1,26 +1,27 @@
package org.dromara.xzd.skyfk.fbhtfk.controller; 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 cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated; import jakarta.validation.constraints.NotEmpty;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import jakarta.validation.constraints.NotNull;
import org.dromara.common.log.annotation.Log; import lombok.RequiredArgsConstructor;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; import org.dromara.common.log.annotation.Log;
import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService; 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.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 @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/fbhtfk/skyfkFbhtfk") @RequestMapping("/xzd/fbhtfk/skyfkFbhtfk")
public class XzdSkyfkFbhtfkController extends BaseController { public class XzdSkyfkFbhtfkController extends BaseController {
private final IXzdSkyfkFbhtfkService xzdSkyfkFbhtfkService; private final IXzdSkyfkFbhtfkService xzdSkyfkFbhtfkService;