From 34fb8efd9fef8a6ed0d7cbaff74f37f06bf2db60 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 21 五月 2026 14:42:26 +0800
Subject: [PATCH] update
---
admin-server/src/main/resources/application-test-aliyun.yml | 6 +++---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java | 14 +++++++++++++-
admin-server/src/main/resources/application.yml | 12 ++++++------
admin-server/src/main/resources/application-xll-aliyun.yml | 6 +++---
admin-server/src/main/java/com/estate/expert/admin/utils/wordtopdf/WordToPdfConverter.java | 2 +-
admin-server/src/main/resources/templates/第三方评估报告new.docx | 0
6 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
index a288f65..da8af05 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
@@ -123,7 +123,9 @@
return null;
JSONObject result = new JSONObject();
- result.put("名称", node.getName());
+ var name = node.getName();
+ result.put("名称", name);
+ result.put("问题清单标题", buildProblemListTitle(name));
buildNode(result, node);
var cfuzzyNode = getFuzzyNodeByPath(node.getPath());
@@ -178,6 +180,16 @@
return result;
}
+ private String buildProblemListTitle(String name) {
+ if (name == null || name.isBlank()) {
+ return "问题清单";
+ }
+ if ("安全检查".equals(name)) {
+ return "安全问题清单";
+ }
+ return name + "问题清单";
+ }
+
/**
* 构建错误信息
* @param nodePath 节点路径
diff --git a/admin-server/src/main/java/com/estate/expert/admin/utils/wordtopdf/WordToPdfConverter.java b/admin-server/src/main/java/com/estate/expert/admin/utils/wordtopdf/WordToPdfConverter.java
index 61cf487..5b11e61 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/utils/wordtopdf/WordToPdfConverter.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/utils/wordtopdf/WordToPdfConverter.java
@@ -294,7 +294,7 @@
long fileSize = wordFile.length();
long maxSize = 1000L * 1024L * 1024L;
if (fileSize > maxSize) {
- throw new IllegalArgumentException("File is too large: " + (fileSize / 1024 / 1024) + "MB, max is 100MB");
+ throw new IllegalArgumentException("File is too large: " + (fileSize / 1024 / 1024) + "MB, max is 1000MB");
}
}
diff --git a/admin-server/src/main/resources/application-test-aliyun.yml b/admin-server/src/main/resources/application-test-aliyun.yml
index a502aa9..eeef077 100644
--- a/admin-server/src/main/resources/application-test-aliyun.yml
+++ b/admin-server/src/main/resources/application-test-aliyun.yml
@@ -21,8 +21,8 @@
servlet:
multipart:
- max-file-size: 100MB
- max-request-size: 100MB
+ max-file-size: 1000MB
+ max-request-size: 1000MB
datasource:
url: jdbc:mysql://localhost:3306/estate_new?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
@@ -49,4 +49,4 @@
license:
- key: 01mKaeqzocRa9TmL1ELVzPtb/H2NCfdZXtzbsMuCIFbmBW4HtOjRdYRsI9ytRLTjqcwBnNkLFKWqRhCGxrrynUaFfQw0ZgTH9pqOOZkv2/0=
\ No newline at end of file
+ key: 01mKaeqzocRa9TmL1ELVzPtb/H2NCfdZXtzbsMuCIFbmBW4HtOjRdYRsI9ytRLTjqcwBnNkLFKWqRhCGxrrynUaFfQw0ZgTH9pqOOZkv2/0=
diff --git a/admin-server/src/main/resources/application-xll-aliyun.yml b/admin-server/src/main/resources/application-xll-aliyun.yml
index b7ad31b..08f0168 100644
--- a/admin-server/src/main/resources/application-xll-aliyun.yml
+++ b/admin-server/src/main/resources/application-xll-aliyun.yml
@@ -21,8 +21,8 @@
servlet:
multipart:
- max-file-size: 100MB
- max-request-size: 100MB
+ max-file-size: 1000MB
+ max-request-size: 1000MB
datasource:
url: jdbc:mysql://localhost:3306/estate_new?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
@@ -59,4 +59,4 @@
url: http://localhost:5000/api/Fuzzy_evaluation
license:
- key: 01mKaeqzocRa9TmL1ELVzPtb/H2NCfdZXtzbsMuCIFbmBW4HtOjRdYRsI9ytRLTjqcwBnNkLFKWqRhCGxrrynUaFfQw0ZgTH9pqOOZkv2/0=
\ No newline at end of file
+ key: 01mKaeqzocRa9TmL1ELVzPtb/H2NCfdZXtzbsMuCIFbmBW4HtOjRdYRsI9ytRLTjqcwBnNkLFKWqRhCGxrrynUaFfQw0ZgTH9pqOOZkv2/0=
diff --git a/admin-server/src/main/resources/application.yml b/admin-server/src/main/resources/application.yml
index 71380e4..b4b6b97 100644
--- a/admin-server/src/main/resources/application.yml
+++ b/admin-server/src/main/resources/application.yml
@@ -21,13 +21,13 @@
servlet:
multipart:
- max-file-size: 100MB
- max-request-size: 100MB
+ max-file-size: 1000MB
+ max-request-size: 1000MB
datasource:
- url: jdbc:mysql://localhost:3306/daping1?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
- username: root
- password: 123456
+ url: jdbc:mysql://localhost:3306/estate_new?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
+ username: admin
+ password: ZXtzbsMuCIFbmBW4HtOjRd
driver-class-name: com.mysql.jdbc.Driver
hikari:
auto-commit: true
@@ -59,4 +59,4 @@
url: http://localhost:5000/api/Fuzzy_evaluation
license:
- key: lI0Qvh4sExRSocj5hUsiykvZzzEkquy04aydOb22zh70O58gdourrlAMZAu/BdATBk3xqmDxn0y8+AM1BYgwEOREcS9+S8V6FUFtoJpPDu4=
\ No newline at end of file
+ key: lI0Qvh4sExRSocj5hUsiykvZzzEkquy04aydOb22zh70O58gdourrlAMZAu/BdATBk3xqmDxn0y8+AM1BYgwEOREcS9+S8V6FUFtoJpPDu4=
diff --git "a/admin-server/src/main/resources/templates/\347\254\254\344\270\211\346\226\271\350\257\204\344\274\260\346\212\245\345\221\212new.docx" "b/admin-server/src/main/resources/templates/\347\254\254\344\270\211\346\226\271\350\257\204\344\274\260\346\212\245\345\221\212new.docx"
index 7b2f342..749bb30 100644
--- "a/admin-server/src/main/resources/templates/\347\254\254\344\270\211\346\226\271\350\257\204\344\274\260\346\212\245\345\221\212new.docx"
+++ "b/admin-server/src/main/resources/templates/\347\254\254\344\270\211\346\226\271\350\257\204\344\274\260\346\212\245\345\221\212new.docx"
Binary files differ
--
Gitblit v1.7.1