From 925bdd2b0920cb82a4b10975ec288b7db6c83bff Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 29 四月 2025 15:55:10 +0800
Subject: [PATCH] 软件上传更新
---
src/main/java/com/whyc/service/SoftwareService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index f06e264..60b447f 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -40,21 +40,23 @@
Software software = mapper.selectById(id);
//涓婁紶璺緞瀹氫箟鍜宧ttp璺緞瀹氫箟
String rootFile = CommonUtil.getRootFile();
- String softwareDir = rootFile + "software";
+ //璺緞涓�/battery_gwm_file/software/搴忓垪鍙穇SN缂栫爜_鐗堟湰鍙�/鏂囦欢鍚�
+ //String softwareDir = rootFile + "software";
+ String softwareDir = rootFile + "software" + File.separator + software.getSerialNumber() + "_" + software.getSnCode() + "_" + software.getVersion();
+
String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("battery_gwm_file"+ File.separator + "software"));
File softwareDirFile = new File(softwareDir);
if(!softwareDirFile.exists()){
softwareDirFile.mkdirs();
}
- //涓婁紶,璺緞涓�/battery_gwm_file/software/搴忓垪鍙穇SN缂栫爜_鐗堟湰鍙�/鏂囦欢鍚�
- softwareDir = rootFile + "software" + File.separator + software.getSerialNumber() + "_" + software.getSnCode() + "_" + software.getVersion();
- file.transferTo(new File(softwareDir+File.separator+fileName));
+ //涓婁紶
+ file.transferTo(new File(softwareDir + File.separator + fileName));
//鏇存柊涓婁紶鐨勮蒋浠朵俊鎭�
Date now = new Date();
software.setCreateTime(now);
software.setUploadUserId(user.getId());
software.setUploadUserName(user.getName());
- software.setFileUrl(softwareHttpUrl+File.separator + software.getSerialNumber() + "_" + software.getSnCode() + "_" + software.getVersion() +File.separator +fileName);
+ software.setFileUrl(softwareHttpUrl + File.separator +fileName);
software.setFileName(fileName);
mapper.updateById(software);
@@ -74,6 +76,7 @@
if (materialCode != null && !materialCode.equals("")) {
query.eq("material_code", materialCode);
}
+ query.orderByDesc("id");
List<Software> list = mapper.selectList(query);
PageInfo<Software> pageInfo = new PageInfo<>(list);
return new Response().set(1, pageInfo);
--
Gitblit v1.9.1