From 4f0d9bde31a80f6279e26466250da7716eec627f Mon Sep 17 00:00:00 2001
From: zs <zhoushuai@zbooksoft.com>
Date: 星期四, 18 十二月 2025 09:15:05 +0800
Subject: [PATCH] 提交成果资料按钮调整

---
 src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java |   52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java b/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java
index 572172a..1c1702d 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java
@@ -42,7 +42,7 @@
 
 
 /**
- * @author 15280
+ * @author 15280  secretLedger
  */
 @Controller
 @RequestMapping("/catAjjxx")
@@ -58,6 +58,10 @@
     ReadXml2017Service readXml2017Service;
     @Autowired
     ReadXml2023Service readXml2023Service;
+    @Autowired
+    UpdateXml2017Service updateXml2017Service;
+    @Autowired
+    UpdateXml2023Service updateXml2023Service;
     @Autowired
     XmlService xmlService;
 
@@ -117,7 +121,7 @@
     @RequestMapping(value = "/updateXmlIndex")
     @RequiresUser
     public ModelAndView updateXmlIndex() {
-        ModelAndView mv = new ModelAndView("hn/catAjjxx/updateXmlIndex");
+        ModelAndView mv = new ModelAndView("gh/catAjjxx/updateXmlIndex");
         return mv;
     }
 
@@ -140,9 +144,9 @@
             Element rootElement = document.getRootElement();
             String rootName = rootElement.getName();
             if ("AJXX".equals(rootName)) {
-//                updateXml2017Service.updateXml(document, checkData, updateId);
+                updateXml2017Service.updateXml(document, checkData, updateId);
             } else if ("DZZLXX".equals(rootName)) {
-//                updateXml2023Service.updateXml(document, checkData, updateId);
+                updateXml2023Service.updateXml(document, checkData, updateId);
             }
             if (checkData != null && !"".equals(checkData)) {
                 QueryWrapper<CatCheck> catCheckQueryWrapper = new QueryWrapper<>();
@@ -374,16 +378,13 @@
                     }
 
                     File file = new File(yswjPath);
-                    if (file.exists() && file.isFile()) {
-                        long fileSize = file.length();
-                        double fileSizeMB = fileSize / (1024.0 * 1024.0);
+                    if (file.exists()) {
+                        Long folderSize = getFolderSize(file);
+                        double fileSizeMB = (double) folderSize / 1024 / 1024;
                         String fileSizeStr = String.format("%.2f", fileSizeMB);
                         catYswjxx.setWjdx(fileSizeStr);
-//                        catYswjxx.setWjgs("pdf");
                         catYswjxx.setWjlj(yswjPath);
                         ysSuccess++;
-                    } else {
-                        ysFailed++;
                     }
                     catYswjxx.setWjm(wjtm);
                     catYswjxxService.saveOrUpdate(catYswjxx);
@@ -571,5 +572,36 @@
             return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
         }
     }
+
+    public static void main(String[] args) {
+        File file = new File("E:\\Desktop\\DD20240091\\DD20240091");
+        long folderSize = getFolderSize(file);
+        long l = folderSize / 1024 / 1024;
+        long folder = (folderSize / 1024 / 1024);
+        System.out.println(folderSize / 1024 / 1024);
+    }
+
+    public static Long getFolderSize(File folder) {
+        if (!folder.exists()) {
+            return 0L;
+        }
+
+        if (folder.isFile()) {
+            return folder.length();
+        }
+
+        Long totalSize = 0L;
+        File[] files = folder.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isFile()) {
+                    totalSize += file.length();
+                } else if (file.isDirectory()) {
+                    totalSize += getFolderSize(file);
+                }
+            }
+        }
+        return totalSize;
+    }
 }
 

--
Gitblit v1.9.1