From 1960d27f6769700346e22eb7c5fa071b73e53770 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 09 九月 2022 16:13:38 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/SoftwareService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index 064f702..a795e7a 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -1,6 +1,7 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.UserOperation;
@@ -158,14 +159,18 @@
if(!software.getFileName().equals(file1Name.substring(0,file1Name.lastIndexOf(".")))){
return new Response().set(1,false,"闄勪欢鐨勬枃浠跺悕涓庤蒋浠跺彂甯冭褰昬xcel鍐呯殑鏂囦欢鍚嶇О涓嶄竴鑷�");
}
+ Software softExists = getByFilename(software.getFileName());
+ if(softExists != null){ //鏂囦欢鍚�:瑙勬牸鍨嬪彿_杞欢鐗堟湰,宸插瓨鍦�,涓嶈兘閲嶅涓婁紶;杩欑鎯呭喌灞炰簬杩藉姞鏈哄瀷,鍒鏇存柊
+ return new Response().set(1,false,"鏂囦欢鍚嶇О("+softExists.getFileName()+")宸插瓨鍦�,涓嶈兘閲嶅涓婁紶");
+ }
Date date = new Date();
String dateUnion = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(date);
- //鏂囦欢閲嶅懡鍚�
- file1Name = file1Name.substring(0,file1Name.lastIndexOf(".")) + "_" + dateUnion +file1Name.substring(file1Name.lastIndexOf("."));
- file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
+ //鏂囦欢閲嶅懡鍚�(鏆備笉闇�瑕�,涓ユ牸閬靛畧鍚嶇О瑙勫垯鐨勬儏鍐典笅涓嶄細閲嶅悕)
+ //file1Name = file1Name.substring(0,file1Name.lastIndexOf(".")) + "_" + dateUnion +file1Name.substring(file1Name.lastIndexOf("."));
+ //file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
//瀛樺偍璺緞
String rootFile = CommonUtil.getRootFile();
- String softwareDir = rootFile + "software" + File.separator + software.getOwner();
+ String softwareDir = rootFile + "software" + File.separator + software.getOwner()+ File.separator + software.getFileName();
String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
File softwareDirFile = new File(softwareDir);
if(!softwareDirFile.exists()){
@@ -184,6 +189,12 @@
return new Response().set(1,true,"涓婁紶瀹屾垚");
}
+ private Software getByFilename(String fileName) {
+ QueryWrapper<Software> query = Wrappers.query();
+ query.eq("file_name",fileName).last(" limit 1");
+ return mapper.selectOne(query);
+ }
+
private void insertBatch(List<Software> softwareList){
mapper.insertBatchSomeColumn(softwareList);
}
--
Gitblit v1.9.1