From f41e9a8dd4aa5de0de323ffe2377c896cb44ea37 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期五, 05 十二月 2025 18:46:34 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 beff88c..8c2ec44 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
@@ -81,7 +81,7 @@
return AjaxResult.success(data);
}
/**
- * 鎷垮埌闄や簡鍏跺畠绫诲瀷鏉愭枡鐨勪釜鏁�
+ * 鎷垮埌瀵瑰簲鐨勬鍗锋潗鏂欎釜鏁�
*/
@PreAuthorize("@ss.hasPermi('system:materials:list')")
@GetMapping("/getFileCount/{recordId}")
@@ -90,6 +90,17 @@
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);
}
/**
* 鏌ヨ銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戝垪琛�
@@ -204,15 +215,17 @@
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("璇ラ〉鍙﹀瓨"))
{
//鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
@@ -300,7 +313,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
@@ -320,6 +333,7 @@
}
catch (Exception e)
{
+ System.out.println("88888888882222222222222");
System.out.println(e);
return AjaxResult.error(e.getMessage());
}
--
Gitblit v1.9.1