From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/SoftwareService.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 140 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index a60ebbd..4c6b142 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -6,10 +6,13 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.UserOperation;
+import com.whyc.dto.CodeFilesDto;
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
+import com.whyc.dto.SoftDto;
+import com.whyc.mapper.SoftcodeMapper;
import com.whyc.mapper.SoftwareMapper;
-import com.whyc.pojo.DocUser;
+import com.whyc.pojo.Softcode;
import com.whyc.pojo.Software;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
@@ -30,6 +33,11 @@
import java.io.*;
import java.net.URLEncoder;
import java.text.ParseException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -39,6 +47,9 @@
public class SoftwareService {
@Autowired(required = false)
private SoftwareMapper mapper;
+
+ @Autowired(required = false)
+ private SoftcodeMapper codeMapper;
@Autowired
private DocLogService logService;
@@ -135,9 +146,26 @@
}
//鏌ヨ杞欢鍒楄〃鐨勪俊鎭�
- public Response getAllSoftware(String fileName,String applyMaterialCode,String applyModel,String owner, String boardNumber,int pageCurr, int pageSize) {
+ public Response getAllSoftware(Integer lockFlag, String fileName, String applyMaterialCode, String applyModel, String owner, String boardNumber
+ ,String version, int pageCurr, int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
- List list=mapper.getFileUrl(fileName,applyMaterialCode,applyModel,owner,boardNumber);
+ List<SoftDto> list=mapper.getFileUrl(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber,version);
+ //鏍规嵁杞欢鍚嶇О鏌ヨ鏄惁瀛樺湪婧愮爜锛�0锛氬惁锛�1锛氬瓨鍦級
+ for (SoftDto dto:list) {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("file_name",dto.getFileName());
+ wrapper.last("limit 1");
+ Softcode code=codeMapper.selectOne(wrapper);
+ if(code!=null){
+ dto.setCodeNum(code.getNum());
+ dto.setCodeFlag(1);
+ dto.setCodeName(code.getCodeName());
+ }else{
+ dto.setCodeNum(0);
+ dto.setCodeFlag(0);
+ dto.setCodeName("");
+ }
+ }
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0,pageInfo,"杞欢淇℃伅杩斿洖");
}
@@ -158,10 +186,12 @@
wrapper.eq("id",id);
wrapper.last("limit 1");
Software software=mapper.selectOne(wrapper);
+
+ String filename=software.getFileUrl().substring(software.getFileUrl().lastIndexOf("\\")+1);
try {
// 杞爜闃叉涔辩爜
//resp.addHeader("Content-Disposition", "attachment;filename=" + new String(softwareName.getBytes("UTF-8"), "ISO8859-1"));
- resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode ( software.getFileName()+".zip", "utf-8"));
+ resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode (filename, "utf-8"));
OutputStream out = resp.getOutputStream();
FileInputStream in = new FileInputStream(fileDirName+File.separator+software.getFileUrl());
int len=0;
@@ -178,15 +208,14 @@
e.printStackTrace();
}
//璁板綍鏃ュ織
- DocUser docUser= ActionUtil.getUser();
- String operationDetail="鍏蜂綋杞欢鍚嶇О涓�:"+software.getFileName();
- String opreationMsg="鎵ц浜嗚蒋浠朵笅杞芥搷浣�";
- String terminalIp=req.getRemoteAddr();
- logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
+ logService.recordOperationLogDownLoad(ActionUtil.getUser().getId(),ActionUtil.getUser().getName(), UserOperation.TYPE_DOWNLOAD_SOFWARE.getType(),new Date(),req.getRemoteAddr()
+ ,filename,fileDirName+File.separator+software.getFileUrl(),"",String.valueOf(id),software.getVersion());
+
}
@Transactional
public Response upload(MultipartFile file1, MultipartFile file2, String fontUpdateTime, List<Software> softwareList) throws IOException {
+ String userName = ActionUtil.getUser().getName();
String file1Name = file1.getOriginalFilename();
String file2Name = file2.getOriginalFilename();
Software software = softwareList.get(0);
@@ -199,9 +228,9 @@
}
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()+ File.separator + software.getFileName();
@@ -218,10 +247,14 @@
software1.setFileUrl(softwareHttpUrl+File.separator+file1Name);
software1.setExcelUrl(softwareHttpUrl+File.separator+file2Name);
software1.setCreateTime(date);
+ software1.setUploadUser(userName);
+ //閿佸畾-涓撲緵娴嬭瘯浜哄憳鎵嶈兘瑙ｉ攣
+ software1.setLockFlag(-1);
}
+ /* 鍙栨秷鑷姩閿佸畾鍘熸潵鐗堟湰,鍥犱负鏂扮増鏈渶瑕佽繘琛屾祴璇曟墠鑳戒娇鐢�
//閿佸畾鍘熸潵鐨勬墍鏈夌増鏈�:鏍规嵁鐗堝彿鍜岃蒋浠剁被鍨�
List<String> materialCodeList = softwareList.stream().map(Software::getApplyMaterialCode).collect(Collectors.toList());
- lockByBoardNumberAndTypeAndMaterialCode(software.getBoardNumber(),software.getType(),materialCodeList);
+ lockByBoardNumberAndTypeAndMaterialCode(software.getBoardNumber(),software.getType(),materialCodeList);*/
//鍐欏叆鏁版嵁搴�
insertBatch(softwareList);
return new Response().set(1,true,"涓婁紶瀹屾垚");
@@ -230,9 +263,10 @@
private void lockByBoardNumberAndTypeAndMaterialCode(String boardNumber, String type, List<String> materialCodeList) {
UpdateWrapper<Software> update = Wrappers.update();
update.set("lock_flag",1)
- .set("lock_reason","杞欢鐗堟湰鍗囩骇")
+ .set("local_reason","杞欢鐗堟湰鍗囩骇")
.eq("board_number",boardNumber)
.eq("type",type)
+ .ne("lock_flag",-1)
.in("apply_material_code",materialCodeList);
mapper.update(null,update);
}
@@ -266,23 +300,113 @@
UpdateWrapper<Software> update = Wrappers.update();
update.eq("file_name",softwareDB.getFileName());
mapper.delete(update);
+ String fontUpdateTime = softwareDB.getFontUpdateTime();
softwareList.forEach(software2 -> {
software2.setFileUrl(softwareDB.getFileUrl());
software2.setExcelUrl(softwareHttpUrl + File.separator + originalFilename);
software2.setCreateTime(new Date());
+ software2.setLockFlag(-1);
+ software2.setFontUpdateTime(fontUpdateTime);
});
mapper.insertBatchSomeColumn(softwareList);
return new Response().set(1,true,"鏇存柊瀹屾垚");
}
}
- //鏍规嵁杞欢id淇敼杞欢閿佸畾鐘舵��
- public Response updateSoftwareLock(String fileUrl,int lockFlag,String localReason) {
+
+ /**
+ * 鏍规嵁杞欢鍞竴鍊煎瓧娈典慨鏀硅蒋浠堕攣瀹氱姸鎬�,杩欓噷閫夊彇fileUrl
+ *
+ * @param fileUrl
+ * @param lockFlagNow
+ * @param lockFlag
+ * @param localReason
+ * @return
+ */
+ public Response updateSoftwareLock(String fileUrl, int lockFlagNow, int lockFlag, String localReason) {
+ String userName = ActionUtil.getUser().getName();
+ if(lockFlag ==0){
+ //鍙湁鏉庢鍗庢墠鑳借В閿� 寰呮祴璇曢攣瀹氱殑杞欢
+ QueryWrapper<Software> query = Wrappers.query();
+ query.eq("file_url",fileUrl);
+ List<Software> softwareListInDB = mapper.selectList(query);
+ Software softwareInDB = softwareListInDB.get(0);
+ if(softwareInDB.getLockFlag() == -1){
+ //if(!userName.equals("鏉庢鍗�")){
+ // return new Response().set(1,false,"鏃犳潈闄愯В閿� 寰呮祴璇曠殑杞欢");
+ //}else{
+ //閿佸畾鍘熸潵鐨勬墍鏈夌増鏈�:鏍规嵁鐗堝彿鍜岃蒋浠剁被鍨�,鎺掗櫎寰呮祴璇曠増鏈�
+ List<String> materialCodeList = softwareListInDB.stream().map(Software::getApplyMaterialCode).collect(Collectors.toList());
+ lockByBoardNumberAndTypeAndMaterialCode(softwareInDB.getBoardNumber(),softwareInDB.getType(),materialCodeList);
+
+ //}
+ }
+ }
UpdateWrapper uwrapper=new UpdateWrapper();
uwrapper.set("lock_flag",lockFlag);
uwrapper.set("local_reason",localReason);
uwrapper.eq("file_url",fileUrl);
+ uwrapper.eq("lock_flag",lockFlagNow);
int flag=mapper.update(null,uwrapper);
return new Response().set(1,flag>0,"閿佸畾/瑙ｉ攣鎴愬姛");
}
+ //鏍规嵁杞欢鍚嶇О瀹炵幇杞欢鍒犻櫎
+ public Response deleteSoftware(String fileName,String version) {
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("file_name",fileName);
+ wrapper.eq("version",version);
+ int flag=mapper.delete(wrapper);
+ return new Response().set(1,flag>0,"浠秈d瀹炵幇杞欢鍒犻櫎");
+ }
+
+ //鏌ヨ鏃ユ湡涓夊ぉ鍐呯殑鎵�鏈変笂浼犺蒋浠�
+ public Response getFileNameByCreateTime(String createTime) {
+ //鑾峰彇endtime鐨勪笁澶╁墠鐨勬椂闂�
+ LocalDate createDay= LocalDate.parse(createTime);
+ LocalDateTime end = createDay.atTime(LocalTime.MAX);
+ Date endtime=Date.from(end.atZone(ZoneId.systemDefault()).toInstant());
+ //鑾峰彇createTime鐨勪笁澶╁墠鐨勬椂闂�
+ LocalDate threeDaysAgo = createDay.minusDays(3);
+ LocalDateTime startOfDay = threeDaysAgo.atStartOfDay();
+ Date starttime=Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.select("distinct file_name","type","version","based_version","owner","filing_date","create_time");
+ wrapper.ge("create_time",starttime);
+ wrapper.le("create_time",endtime);
+ wrapper.eq("owner",ActionUtil.getUser().getName());
+ List<Software> list=mapper.selectList(wrapper);
+ //鑾峰彇list涓璮ileName鐨勯泦鍚�
+ //List<String> nameList = list.stream().map(Software::getFileName).collect(Collectors.toList());
+ return new Response().setII(1,list!=null,list,"鏌ヨ鏃ユ湡涓夊ぉ鍐呯殑鎵�鏈変笂浼犺蒋浠�");
+ }
+ //鏌ヨ褰撳墠owner鐨勬湭涓婁紶婧愮爜璁板綍
+ public Response getFileNameByOwnerWithCode(String owner) {
+ List<Software> list=mapper.getFileNameByOwnerWithCode(owner);
+ return new Response().setII(1,list!=null,list,"鏌ヨ褰撳墠owner鐨勬湭涓婁紶婧愮爜璁板綍");
+ }
+ //鎵归噺娣诲姞婧愮爜鍖�
+ public Response setCodeByFileNmaes(CodeFilesDto dto) {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("num",dto.getNum());
+ wrapper.last("limit 1");
+ Softcode softcode=codeMapper.selectOne(wrapper);
+ if(softcode==null){
+ return new Response().set(1,false,"婧愮爜鍖呬笉瀛樺湪");
+ }else{
+ //鑾峰彇list涓璮ileName鐨勯泦鍚�
+ List<String> nameList = dto.getFileNames();
+ List<Softcode> softcodeList=new ArrayList<>();
+ for (String fileName : nameList) {
+ Softcode s=new Softcode();
+ s.setFileName(fileName);
+ s.setCodeUrl(softcode.getCodeUrl());
+ s.setCodeName(softcode.getCodeName());
+ s.setCreateTime(new Date());
+ softcodeList.add(s);
+ }
+ codeMapper.insertBatchSomeColumn(softcodeList);
+ return new Response().set(1,true,"鎵归噺娣诲姞婧愮爜鍖�");
+ }
+ }
}
--
Gitblit v1.9.1