From 2b326b025aa0121abe008c3e7072c39a0dc286db Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 10 十一月 2026 13:59:38 +0800
Subject: [PATCH] 合并修改com/ruoyi/quartz/task/RyTacom/ruoyi/quartz/task/RyTask.java:3sk.java:3com/ruoyi/quart/task/RyTask.java:3
---
/dev/null | 8 --------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 6 ++++--
ruoyi-admin/pom.xml | 6 ++++++
.idea/compiler.xml | 13 +++++++++++++
ruoyi-admin/src/main/resources/application.yml | 2 +-
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6ef4c26..2227aa6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,5 +17,18 @@
<module name="ruoyi-quartz" />
</profile>
</annotationProcessing>
+ <bytecodeTargetLevel>
+ <module name="ruoyi-datacollection" target="1.8" />
+ <module name="ruoyi-inhospvisit" target="1.8" />
+ <module name="ruoyi-message" target="1.8" />
+ <module name="ruoyi-othervisit" target="1.8" />
+ <module name="ruoyi-outpatientvisit" target="1.8" />
+ <module name="ruoyi-patarchive" target="1.8" />
+ <module name="ruoyi-phone" target="1.8" />
+ <module name="ruoyi-publicity" target="1.8" />
+ <module name="ruoyi-satisfaction" target="1.8" />
+ <module name="ruoyi-task" target="1.8" />
+ <module name="ruoyi-template" target="1.8" />
+ </bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index c10d336..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" filepath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 67a4960..786160b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -208,6 +208,12 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
+
+ <!-- 闃块噷JSON瑙ｆ瀽鍣紙鏈ā鍧楃洿鎺ヤ娇鐢� fastjson2 API锛屾樉寮忓０鏄庨伩鍏嶄緷璧栦紶閫掑彉鍖栧鑷寸紪璇戝け璐ワ級 -->
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 8cea226..6a19f59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -1,6 +1,6 @@
package com.ruoyi.web.controller.smartor;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.util.TypeUtils;
import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
@@ -1078,7 +1078,9 @@
Map<String, Object> redisMap = redisCache.getCacheObject(userId + "patItemCount");
Boolean redisFlag = false;
if (MapUtils.isNotEmpty(redisMap)) {
- ServiceSubtaskEntity oldCondition = (ServiceSubtaskEntity) redisMap.get("searchCondition");
+ // Redis 鍙嶅簭鍒楀寲鍚庯紝searchCondition 鍙兘鏄� JSONObject锛岀洿鎺ュ己杞細瑙﹀彂 ClassCastException锛岃繖閲岀粺涓�杞崲
+ Object cachedCondition = redisMap.get("searchCondition");
+ ServiceSubtaskEntity oldCondition = TypeUtils.cast(cachedCondition, ServiceSubtaskEntity.class);
if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
redisFlag = true;
map = redisMap;
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0f89dc0..370708e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -75,7 +75,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: ls
+ active: druid
# 鏂囦欢涓婁紶
servlet:
--
Gitblit v1.9.3