合并修改com/ruoyi/quartz/task/RyTacom/ruoyi/quartz/task/RyTask.java:3sk.java:3c...

陈昶聿

3 天以前 2b326b025aa0121abe008c3e7072c39a0dc286db

合并修改com/ruoyi/quartz/task/RyTacom/ruoyi/quartz/task/RyTask.java:3sk.java:3com/ruoyi/quart/task/RyTask.java:3

 .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>

 .idea/modules.xml

ÎļþÒÑɾ³ý

 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>

 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;

 ruoyi-admin/src/main/resources/application.yml

@@ -75,7 +75,7 @@
    # å›½é™…化资源文件路径
    basename: i18n/messages
  profiles:
    active: ls
    active: druid

  # æ–‡ä»¶ä¸Šä¼ 
  servlet: