From 04d04154d9041535342736bd1c924ade5d818614 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 16:45:07 +0800
Subject: [PATCH] 合并修改com/ruoyi/quartz/task/RyTacom/ruoyi/quartz/task/RyTask.java:3sk.java:3com/ruoyi/quart/task/RyTask.java:3
---
ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java | 34 +++++++++++++++++++++++++++++++++-
ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java | 17 ++++++++++++++++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
index 06b4a55..06204ba 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
@@ -1313,10 +1313,12 @@
Boolean redisFlag = false;
if (MapUtils.isNotEmpty(redisMap)) {
long tCmp = System.currentTimeMillis();
- ServiceSubtaskEntity oldCondition = (ServiceSubtaskEntity) redisMap.get("searchCondition");
+ ServiceSubtaskEntity oldCondition = convertCachedCondition(redisMap.get("searchCondition"));
if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
redisFlag = true;
map = redisMap;
+ // 椤烘墜鍥炲～杞崲鍚庣殑瀹炰綋锛岃杩欐潯缂撳瓨涓嬫鑳戒互姝ｇ‘绫诲瀷鍙嶅簭鍒楀寲
+ map.put("searchCondition", oldCondition);
redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
}
log.info("[patItem鑰楁椂] 4.2 鏉′欢姣斿={}ms锛屽懡涓�={}", System.currentTimeMillis() - tCmp, redisFlag);
@@ -1336,6 +1338,36 @@
return map;
}
+ /**
+ * 鎶� Redis 缂撳瓨閲岀殑鏌ヨ鏉′欢杩樺師鎴� {@link ServiceSubtaskEntity}銆�
+ * <p>
+ * 缂撳瓨鐢� {@code FastJson2JsonRedisSerializer} 鎸� {@code Object.class} 鍙嶅簭鍒楀寲锛�
+ * 褰� {@code searchCondition} 鐨� {@code @type} 缂哄け銆佹垨鎸囧悜宸茶縼绉荤殑鏃у寘鍚�
+ * 锛堝 {@code com.smartor.domain.entity.ServiceSubtaskEntity}锛夋椂锛宖astjson2 浼�
+ * 闈欓粯閫�鍖栨垚 {@link com.alibaba.fastjson2.JSONObject}锛岀洿鎺ュ己杞細鎶�
+ * {@code ClassCastException}銆傝繖閲岀粺涓�杞崲锛涜浆鎹㈠け璐ヨ繑鍥� {@code null}锛�
+ * 璋冪敤鏂规寜缂撳瓨鏈懡涓鐞嗭紙閲嶆柊鏌ュ簱锛夛紝閬垮厤鏁翠釜鎺ュ彛 500銆�
+ */
+ private ServiceSubtaskEntity convertCachedCondition(Object cachedCondition) {
+ if (cachedCondition == null) {
+ return null;
+ }
+ if (cachedCondition instanceof ServiceSubtaskEntity) {
+ return (ServiceSubtaskEntity) cachedCondition;
+ }
+ try {
+ // 涓嶈兘鐩存帴鐢� TypeUtils.cast / toJavaObject锛氭棫缂撳瓨閲岀殑 @type 鍙兘鎸囧悜宸茶縼绉荤殑绫伙紝
+ // fastjson2 浼氭寜 @type 鍘绘壘绫诲苟鎶� "No suitable ObjectReader found"銆�
+ // 杞垚 JSON 瀛楃涓插悗鎸夌洰鏍囩被瑙ｆ瀽锛屾湭寮�鍚� SupportAutoType 鏃� @type 鍙細琚綋浣滄櫘閫氬瓧娈靛拷鐣ャ��
+ return com.alibaba.fastjson2.JSON.parseObject(
+ com.alibaba.fastjson2.JSON.toJSONString(cachedCondition),
+ ServiceSubtaskEntity.class);
+ } catch (Exception e) {
+ log.warn("銆恜atItemCount銆戠紦瀛樹腑鐨勬煡璇㈡潯浠舵棤娉曡繕鍘熶负 ServiceSubtaskEntity锛屾寜缂撳瓨鏈懡涓鐞嗭紝瀹為檯绫诲瀷锛歿}",
+ cachedCondition.getClass().getName(), e);
+ return null;
+ }
+ }
/**
* 姣旇緝涓や釜ServiceSubtaskVO鐨勬煡璇㈡潯浠舵槸鍚︿竴鑷�
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
index 33aa4c3..9f570dc 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
@@ -2459,7 +2459,10 @@
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
groupKey = drcode;
} else {
- groupKey = "deptcode";
+ // 2026-11 瀛楁閲嶅懡鍚嶅悗锛歞eptcode 鏄湪闄㈢瀹わ紙鍘嗗彶鏁版嵁涓虹┖锛夛紝
+ // 鍑洪櫌绉戝宸叉敼鍚嶄负 leaveldeptcode锛屽垎缁勫繀椤荤敤鍚庤�咃紝
+ // 鍚﹀垯 getSfStatisticsGroupKey 浼氳繑鍥� NULL锛屾嫾鎴� IN (NULL) 瀵艰嚧鏁磋〃鏌ョ┖銆�
+ groupKey = "leaveldeptcode";
}
} else if (serviceSubtaskCountReq.getStatisticaltype() != null && serviceSubtaskCountReq.getStatisticaltype() == 3) {
// 鐥呯缁熻锛氭寜浠诲姟ID鍒嗙粍锛屾瘡涓换鍔″嵆涓�涓梾绉嶉殢璁夸换鍔�
@@ -2470,6 +2473,17 @@
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
serviceSubtaskCountReq.setGroupKey(groupKey);
List<String> groupKeyList = serviceSubtaskMapper.getSfStatisticsGroupKey(serviceSubtaskCountReq);
+ /*
+ * 鍒嗙粍閿彲鑳戒负 NULL锛堝巻鍙叉暟鎹�佹垨閲嶅懡鍚嶅悗灏氭湭鍥炲～鐨勫湪闄㈢淮搴﹀垪锛夛紝
+ * 鐩存帴鎷艰繘 SQL 浼氬彉鎴� `AND IFNULL(鍒�,'Unknown') IN (NULL)`锛屾亽涓嶆垚绔嬶紝鏁村紶缁熻琛ㄤ负绌恒��
+ * 杩欓噷缁熶竴鎴� 'Unknown'锛屼笌鑱氬悎 SQL 鐨� IFNULL(鍒�,'Unknown') 鍙ｅ緞瀵归綈銆�
+ */
+ if (groupKeyList != null) {
+ groupKeyList = groupKeyList.stream()
+ .map(key -> key == null ? "Unknown" : key)
+ .distinct()
+ .collect(Collectors.toList());
+ }
serviceSubtaskCountReq.setGroupKeyList(groupKeyList);
List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
switch (groupKey) {
@@ -2484,6 +2498,7 @@
collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getManagementDoctorCode()).orElse("Unknown")));
break;
case "deptcode":
+ case "leaveldeptcode":
collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeaveldeptcode()).orElse("Unknown")));
break;
case "leavehospitaldistrictcode":
--
Gitblit v1.9.3