集成一些修改

pom.xml

@@ -26,6 +26,12 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>checker-qual</artifactId>
+                    <groupId>org.checkerframework</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -64,12 +70,18 @@
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <version>3.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-compress</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson</artifactId>
+            <artifactId>fastjson2</artifactId>
-            <version>1.2.79</version>
+            <version>2.0.43</version>
         </dependency>
         <dependency>
             <groupId>org.gunshi</groupId>
@@ -114,6 +126,11 @@
         <!--            <artifactId>jts-core</artifactId>-->
         <!--            <version>1.18.1</version>-->
         <!--        </dependency>-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>integration-ruoyi</artifactId>
+            <version>3.8.8</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java

@@ -1,6 +1,6 @@
 package com.gunshi.project.xyt.controller;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;

src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java

@@ -1,6 +1,6 @@
 package com.gunshi.project.xyt.controller;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;

src/main/java/com/gunshi/project/xyt/timetask/DataTask.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson2.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
@@ -19,7 +20,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -206,7 +207,7 @@ public class DataTask {
                     }
                     List<LinkedHashMap> list = (List<LinkedHashMap>)map.get("data");
                     if(CollectionUtils.isNotEmpty(list)){
-                        List<StPptnR> rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StPptnR.class);
+                        List<StPptnR> rlist = JSONArray.parseArray(JSONObject.toJSONString(list)).toJavaList(StPptnR.class);
                         stPptnRService.saveBatch(rlist);
                     }
                 }
@@ -368,7 +369,7 @@ public class DataTask {
                     }
                     List<LinkedHashMap> list = (List<LinkedHashMap>)map.get("data");
                     if(CollectionUtils.isNotEmpty(list)){
-                        List<StRsvrR> rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StRsvrR.class);
+                        List<StRsvrR> rlist = JSONArray.parseArray(JSONObject.toJSONString(list)).toJavaList(StRsvrR.class);
                         stRsvrRService.saveBatch(rlist);
                     }
                 }

src/main/resources/application-dev.yml

@@ -3,3 +3,4 @@ spring:
     import:
       - config-common.yml
       - config-dev.yml
+      - config-ruoyi.yml

src/main/resources/application-prod.yml

@@ -3,3 +3,4 @@ spring:
     import:
       - config-common.yml
       - config-prod.yml
+      - config-ruoyi.yml

src/main/resources/application.yml

@@ -3,3 +3,4 @@ spring:
     import:
       - config-common.yml
       - config-dev.yml
+      - config-ruoyi.yml

src/main/resources/config-ruoyi.yml

@@ -0,0 +1,54 @@
+# 项目相关配置
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.8.8
+  # 版权年份
+  copyrightYear: 2024
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  #profile: D:/ruoyi/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数字计算 char 字符验证
+  captchaType: math
+
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 30
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+#pagehelper:
+#  helperDialect: postgresql
+#  supportMethodsArguments: true
+#  params: count=countSql
+
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /dev-api
+
+spring:
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages