From 0fdd6b6113fe6e120ca5731fbab562f56eca8ae5 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 22 九月 2025 08:29:09 +0800
Subject: [PATCH] 新增了代码
---
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java | 8 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java | 8 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 8 ++--
archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java | 2
archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java | 22 ++++++++++-
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 21 +++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 4 +-
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 4 +-
10 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index 6898693..88d47fe 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -14,8 +14,8 @@
@Mapper
public interface DocumentMaterialsMapper extends BaseMapper<DocumentMaterials> {
- @Select("update document_materials SET url = #{url},size_type=#{sizeType}, file_number=#{fileNumber},page_order=#{pageOrder},width=#{width},height=#{height},horizontal_resolution=#{horizontalResolution},vertical_resolution=#{verticalResolution},file_size=#{fileSize}, format=#{format} where page_number = #{pageNumber}")
- Long updateInfoByPageNumber(@Param("pageNumber") Long pageNumber,@Param("sizeType") String sizeType, @Param("fileNumber") Long fileNumber,@Param("pageOrder") Long pageOrder,@Param("width") int width, @Param("height") int height, @Param("horizontalResolution") int horizontalResolution, @Param("verticalResolution") int verticalResolution, @Param("fileSize") Double fileSize,@Param("url") String url,@Param("format") String format);
+ @Select("update document_materials SET url = #{url},size_type=#{sizeType}, file_number=#{fileNumber},page_order=#{pageOrder},width=#{width},height=#{height},horizontal_resolution=#{horizontalResolution},vertical_resolution=#{verticalResolution},file_size=#{fileSize}, format=#{format} where page_number = #{pageNumber} and record_id=#{recordId}")
+ Long updateInfoByPageNumber(@Param("pageNumber") Long pageNumber,@Param("sizeType") String sizeType, @Param("fileNumber") Long fileNumber,@Param("pageOrder") Long pageOrder,@Param("width") int width, @Param("height") int height, @Param("horizontalResolution") int horizontalResolution, @Param("verticalResolution") int verticalResolution, @Param("fileSize") Double fileSize,@Param("url") String url,@Param("format") String format, @Param("recordId") Long recordId);
//鏍规嵁棰樺悕鎷垮埌鏈�澶х殑pageOrder
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
index 1178a83..ade6ce7 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
@@ -86,6 +86,6 @@
public int updateArchiveById(Long id);
-
+ public int updateStatusByIds(Long [] ids);
public List<ArchiveRecordSmall> findByIds(ArchiveRecords archiveRecords);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index 79e13f4..97ab26a 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -65,7 +65,7 @@
*/
public int deleteDocumentMaterialsByMaterialId(String materialId);
public Long getFiNum(Long pageNumber);
- public int updateByPageNumber(Long pageNumber,String sizeType, Long fileNumber, int wid, int hei, int wdpi, int hdpi, double sz,String url,String format);
+ public int updateByPageNumber(Long pageNumber,String sizeType, Long fileNumber, int wid, int hei, int wdpi, int hdpi, double sz,String url,String format, Long recordId);
public List<DocumentMaterialsVo> findArchMInfo(String recordId);
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
index d8af78a..834babd 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -179,11 +179,21 @@
Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
archiveRecords.setCreateTime(date);
-
-
+ System.out.println(archiveRecords.getRecordId());
+ //鏍规嵁妗ｅ彿鏌ヨ锛屾槸鍚﹀凡缁忔湁妗ｅ彿锛屾湁鐨勮瘽锛屽氨涓嶈鎻掑叆
+ LambdaQueryWrapper<ArchiveRecords> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId,
+ archiveRecords.getRecordId());
+ List<ArchiveRecords> lis = list(lambdaQueryWrapper);
+ if(!lis.isEmpty())
+ {
+ return 0;
+ }
archiveRecords.setRecordStatus("鏈綍鍏�");
// archiveRecords
boolean res = this.save(archiveRecords);
+
+ //0琛ㄧず澶辫触锛�1琛ㄧず鎴愬姛
if(res)
return 1;
else
@@ -273,6 +283,13 @@
}
@Override
+ public int updateStatusByIds(Long[] ids) {
+ for(Long id : ids)
+ this.baseMapper.updateStatusById(id);
+ return 0;
+ }
+
+ @Override
public List<ArchiveRecordSmall> findByIds(ArchiveRecords archiveRecords) {
LambdaQueryWrapper<ArchiveRecords> lqw = new LambdaQueryWrapper<>();
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index 8ed5789..1e3b757 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -168,7 +168,7 @@
}
@Override
- public int updateByPageNumber(Long pageNumber, String sizeType, Long fileNumber, int width, int height, int horizontalResolution, int verticalResolution, double fileSize, String url, String format) {
+ public int updateByPageNumber(Long pageNumber, String sizeType, Long fileNumber, int width, int height, int horizontalResolution, int verticalResolution, double fileSize, String url, String format, Long recordId) {
//鏍规嵁pageNumber鎷垮埌title锛岀劧鍚庤绠梡ageOrder
LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
lqw.eq(pageNumber!=null, DocumentMaterials::getPageNumber, pageNumber);
@@ -183,7 +183,7 @@
pageOrder = maxPOrder + 1;
}
- this.baseMapper.updateInfoByPageNumber(pageNumber, sizeType,fileNumber,pageOrder, width, height, horizontalResolution, verticalResolution, fileSize, url,format);
+ this.baseMapper.updateInfoByPageNumber(pageNumber, sizeType,fileNumber,pageOrder, width, height, horizontalResolution, verticalResolution, fileSize, url,format, recordId);
return 0;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
index 8932a97..5be5dc8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
@@ -51,7 +51,13 @@
return archivePlaceNameService.selectDataList(archivePlaceName, pageNum, pageSize);
}
-
+ @PreAuthorize("@ss.hasPermi('system:placeName:list')")
+ @GetMapping("/listAll")
+ public AjaxResult getAllPlaceName()
+ {
+ ArchivePlaceName archivePlaceName = new ArchivePlaceName();
+ return success(archivePlaceNameService.selectArchivePlaceNameList(archivePlaceName));
+ }
/**
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
index 7a40307..aba47ed 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
@@ -51,7 +51,13 @@
return archiveProjectNameService.selectDataList(archiveProjectName, pageNum, pageSize);
}
-
+ @PreAuthorize("@ss.hasPermi('system:projectName:list')")
+ @GetMapping("/listAll")
+ public AjaxResult getAllProjectName()
+ {
+ ArchiveProjectName archivePlaceName = new ArchiveProjectName();
+ return success(archiveProjectNameService.selectArchiveProjectNameList(archivePlaceName));
+ }
/**
* 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
index 7741b33..f913288 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
@@ -121,7 +121,17 @@
@PostMapping
public AjaxResult add(@RequestBody ArchiveRecords archiveRecords)
{
- return toAjax(archiveRecordsService.insertArchiveRecords(archiveRecords));
+ int res = archiveRecordsService.insertArchiveRecords(archiveRecords);
+ System.out.println(res);
+ if(res==0) {
+ System.out.println(res);
+
+ return new AjaxResult(0, "妗ｆ鍙峰凡缁忓瓨鍦ㄤ簡锛�");
+ }
+ else
+ return new AjaxResult(200, "娣诲姞鎴愬姛浜嗭紒");
+
+
}
/**
@@ -134,7 +144,15 @@
{
return toAjax(archiveRecordsService.updateArchiveRecords(archiveRecords));
}
-
+ @PreAuthorize("@ss.hasPermi('system:records:edit')")
+ @Log(title = "妗ｆ璁板綍", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/updateSByIds")
+ public AjaxResult updateStatusByIds(@RequestBody Long[] ids)
+ {
+ System.out.println(ids);
+ System.out.println("090sdfsdf");
+ return new AjaxResult(0, archiveRecordsService.updateStatusByIds(ids)+"");
+ }
/**
* 鍒犻櫎妗ｆ璁板綍
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index 1efe789..e718fdf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -144,7 +144,7 @@
}
@PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file) throws Exception
+ public AjaxResult uploadFile(MultipartFile file, Long recordId) throws Exception
{
// System.out.println("sdfd9999999999999999999999999999999");
try
@@ -185,7 +185,7 @@
//璁＄畻sizeType
String sizeType = getPageSize(wid*hei);
//鎻掑叆鏁版嵁搴撳搴旂殑url褰撲腑
- documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, fileName, pname);
+ documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, fileName, pname, recordId);
// System.out.println(url);
// System.out.println(fileName);
ajax.put("fileName", fileName);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
index 7b7f477..28d5ea7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
@@ -206,7 +206,7 @@
}
//娣诲姞07 鐨刾df
//pdf鐩綍灏侀潰
- String pdfPathF = "07-鍗烽潰灏侀潰.pdf";
+ String pdfPathF = "07-妗堝嵎灏侀潰.pdf";
pdfGenerateService.generatePdf(pdfPathF, ids[i]);
// 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
// 娣诲姞PDF鏂囦欢鍒癦IP
@@ -257,7 +257,7 @@
}
//excel 鍗峰唴灏侀潰瀵煎嚭zip
- ZipEntry entryiv = new ZipEntry(fna + adir +"/"+"鍗峰唴灏侀潰" + ".xls");
+ ZipEntry entryiv = new ZipEntry(fna + adir +"/"+"妗堝嵎灏侀潰" + ".xls");
List<ArchiveInfoVo> arsi = new ArrayList<>();
arsi.add(aIV);
@@ -525,7 +525,7 @@
zos = new ZipOutputStream(os);
//pdf鐩綍灏侀潰
- String pdfPathF = "07-鍗烽潰灏侀潰.pdf";
+ String pdfPathF = "07-妗堝嵎灏侀潰.pdf";
pdfGenerateService.generatePdf(pdfPathF, 55L);
// 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
// 娣诲姞PDF鏂囦欢鍒癦IP
@@ -576,7 +576,7 @@
//excel 鍗峰唴灏侀潰瀵煎嚭zip
- ZipEntry entryiv = new ZipEntry("鍗峰唴灏侀潰" + ".xls");
+ ZipEntry entryiv = new ZipEntry("妗堝嵎灏侀潰" + ".xls");
List<ArchiveInfoVo> arsi = new ArrayList<>();
arsi.add(aIV);
--
Gitblit v1.9.1