From 6adcb9d2eaa5676fbbaa251dca95a12f40223f4a Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 10 十二月 2025 17:36:08 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 8 deletions(-)
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 c833c43..89fb691 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
@@ -9,7 +9,11 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
@@ -22,8 +26,11 @@
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.domain.ArchiveCategory;
+import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.DocumentMaterials;
import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
+import com.ruoyi.domain.vo.DocumentMaterialsVo;
+import com.ruoyi.domain.vo.DocumentMaterialsVoSmall;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.server.Sys;
import com.ruoyi.service.IDocumentMaterialsService;
@@ -62,6 +69,44 @@
@Autowired
private IDocumentMaterialsService documentMaterialsService;
+
+ /**
+ * 鍒ゆ柇PageNumber鏄惁杩炵画
+ */
+ @PreAuthorize("@ss.hasPermi('system:materials:list')")
+ @GetMapping("/isPageNubLegal/{recordId}")
+ public AjaxResult judgePageLegal(@PathVariable("recordId") Integer recordId)
+ {
+
+ boolean res = documentMaterialsService.isPageNumberIslegal(recordId);
+ int cnt = documentMaterialsService.getFileCount(recordId);
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("res",res);
+ data.put("total",cnt);
+ return AjaxResult.success(data);
+ }
+ /**
+ * 鎷垮埌瀵瑰簲鐨勬鍗锋潗鏂欎釜鏁�
+ */
+ @PreAuthorize("@ss.hasPermi('system:materials:list')")
+ @GetMapping("/getFileCount/{recordId}")
+ public AjaxResult getFileCount(@PathVariable("recordId") Integer recordId)
+ {
+
+ int cnt = documentMaterialsService.getFileCount(recordId);
+ return AjaxResult.success(cnt);
+ }
+
+ /**
+ * 鏍规嵁椤靛彿娣诲姞涓棿璁板綍鐨勬帴鍙�
+ * 渚嬪椤靛彿1锛�5锛�7锛屽垯娣诲姞椤靛彿涓�2锛�3锛�4锛堜俊鎭笌1淇濇寔涓�鑷达級锛�6锛堜俊鎭笌5淇濇寔涓�鑷达級
+ */
+ @PreAuthorize("@ss.hasPermi('system:materials:edit')")
+ @GetMapping("/addMiddleRecords/{recordId}/{maxPageNumber}")
+ public AjaxResult addMiddleRecords(@PathVariable("recordId") Long recordId,@PathVariable("maxPageNumber") Long maxPageNumber)
+ {
+ return documentMaterialsService.addMiddleRecordsByPageNumbers(recordId, maxPageNumber);
+ }
/**
* 鏌ヨ銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戝垪琛�
*/
@@ -69,7 +114,6 @@
@GetMapping("/list")
public AjaxResult list(DocumentMaterials documentMaterials)
{
-
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return documentMaterialsService.selectDataList(documentMaterials, pageNum, pageSize);
@@ -81,12 +125,64 @@
@PreAuthorize("@ss.hasPermi('system:materials:export')")
@Log(title = "銆愭枃浠舵潗鏂欑患鍚堜俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DocumentMaterials documentMaterials)
+ public void export(HttpServletResponse response, DocumentMaterials documentMaterials, @RequestParam(value = "ids", required = false) Long[] ids)
{
- List<DocumentMaterials> list = documentMaterialsService.selectDocumentMaterialsList(documentMaterials);
+ List<DocumentMaterials> list;
+ System.out.println(ids);
+ // 濡傛灉鎻愪緵浜唅ds鍙傛暟锛屽垯鏍规嵁ids瀵煎嚭鎸囧畾璁板綍
+ if (ids != null && ids.length > 0) {
+ list = documentMaterialsService.selectDocumentMaterialsByIds(ids);
+ } else {
+ list = documentMaterialsService.selectDocumentMaterialsList(documentMaterials);
+
+ }
ExcelUtil<DocumentMaterials> util = new ExcelUtil<DocumentMaterials>(DocumentMaterials.class);
- util.exportExcel(response, list, "銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戞暟鎹�");
+ util.exportExcel(response, list, "鐢靛瓙鏂囦欢鐩綍");
}
+
+ @PreAuthorize("@ss.hasPermi('system:materials:export')")
+ @Log(title = "銆愬鍑哄嵎鍐呯洰褰曘��", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportDir")
+ public void exportDir(HttpServletResponse response, DocumentMaterials documentMaterials, @RequestParam(value = "ids", required = false) Long[] ids)
+ {
+ List<DocumentMaterials> list;
+ System.out.println(ids);
+ // 濡傛灉鎻愪緵浜唅ds鍙傛暟锛屽垯鏍规嵁ids瀵煎嚭鎸囧畾璁板綍
+ if (ids != null && ids.length > 0) {
+ list = documentMaterialsService.selectDocumentMaterialsByIds(ids);
+ } else {
+ list = documentMaterialsService.selectDocumentMaterialsList(documentMaterials);
+
+ }
+ // 鏍规嵁visible瀛楁绛涢�夛紝鍙繚鐣檝isible涓�1鐨勮褰�
+ List<DocumentMaterials> filteredList = list.stream()
+ .filter(doc -> doc.getVisible() != null && doc.getVisible() == 1 && !Objects.equals(doc.getFileStyle(), "鍏朵粬鏉愭枡"))
+ .collect(Collectors.toList());
+
+ // 浣跨敤AtomicLong瀹炵幇搴忓彿鐨勯�掑
+ AtomicLong nm = new AtomicLong(1L);
+ // 灏嗙瓫閫夊悗鐨凞ocumentMaterials杞崲涓篋ocumentMaterialsVo
+ List<DocumentMaterialsVoSmall> list1 = filteredList.stream().map(doc -> {
+ DocumentMaterialsVoSmall vo = new DocumentMaterialsVoSmall();
+ // 鎵嬪姩鏄犲皠瀛楁锛屼娇鐢╣etAndIncrement()鏂规硶鑾峰彇褰撳墠鍊煎苟閫掑
+ vo.setNum(nm.getAndIncrement());
+
+ vo.setDocumentNumber(doc.getDocumentNumber());
+ vo.setCreator(doc.getCreator());
+ vo.setTitle(doc.getTitle());
+ vo.setDate(doc.getDate());
+ vo.setPageNumber(doc.getPageNumber());
+ vo.setRemarks(doc.getRemarks());
+// vo.setRecordId(doc.getRecordId() != null ? doc.getRecordId().toString() : null);
+// vo.setPublicity(doc.getPublicity());
+ return vo;
+ }).collect(Collectors.toList());
+
+ ExcelUtil<DocumentMaterialsVoSmall> util = new ExcelUtil<DocumentMaterialsVoSmall>(DocumentMaterialsVoSmall.class);
+ util.exportExcel(response, list1, "鍗峰唴鐩綍");
+ }
+
+ // List<DocumentMaterialsVo> dsvs = documentMaterialsService.findArchMInfo(id.toString());
/**
* 鑾峰彇銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戣缁嗕俊鎭�
@@ -106,6 +202,7 @@
@PostMapping
public AjaxResult add(@RequestBody DocumentMaterials documentMaterials)
{
+ documentMaterials.setVisible(1);
int res = documentMaterialsService.insertDocumentMaterials(documentMaterials);
System.out.println(res+"][[[[[[[[[[[[[[[[[[");
return toAjax(res);
@@ -168,21 +265,23 @@
AjaxResult ajax = AjaxResult.success();
//鍒嗗壊鏂囦欢鍚�
String [] nams = fname.split("\\.");
+ System.out.println(fname);
Long nam = Long.parseLong(nams[0]);
//鏍规嵁椤靛彿鎷垮埌妗堝嵎鐨勮缁嗕俊鎭�
- System.out.println("0-------------");
System.out.println(recordId);
+ System.out.println("0-------------");
+
DocumentMaterials doc = documentMaterialsService.selectByPageNumber(nam, Math.toIntExact(recordId));
if(doc==null)
return AjaxResult.error("鏃犲搴旈〉鍙凤紝璇锋鏌ユ竻妤氶檮浠朵互鍙婂搴旂殑杈撳叆锛�");
else{
- if(doc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
+ if(doc.getSecurityLevel()!=null&&doc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
{
//鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
//璇诲彇鏈嶅姟鍣ㄤ笂鐨勫浘鍍�
// new InputStream();
- String fp = filePath + "\\0071.jpg";
+ String fp = filePath + "\\glc.jpg";
Path path = Paths.get(fp);
File fil = new File(fp);
//鎷垮埌鍥惧儚灞炴��
@@ -264,7 +363,7 @@
int wdpi = info.getPhysicalWidthDpi() ;
int hdpi = info.getPhysicalHeightDpi();
- System.out.println("DPI: " + info.getPhysicalWidthDpi());
+ System.out.println("DPI: " + info.getPhysicalWidthDpi()+nam+"dds");
//璁＄畻fileNumber
Long fileNumber = documentMaterialsService.getFiNum(nam, recordId);
//璁＄畻sizeType
@@ -284,6 +383,7 @@
}
catch (Exception e)
{
+ System.out.println("88888888882222222222222");
System.out.println(e);
return AjaxResult.error(e.getMessage());
}
@@ -304,4 +404,6 @@
ExcelUtil<DocumentMaterialFileSmallVo> util = new ExcelUtil<>(DocumentMaterialFileSmallVo.class);
util.exportExcel(response,list,"妗ｆ璇︾粏淇℃伅瀵煎叆妯℃澘");
}
+
+ //瀵煎嚭material
}
--
Gitblit v1.9.1