代码提交

liusheng

6 小时以前 c62e26954e41360fc6a2efc874815aa84f8b0073

代码提交

 ruoyi-admin/pom.xml

@@ -165,6 +165,11 @@
            <artifactId>xmlbeans</artifactId>
            <version>5.1.0</version>
        </dependency>
        <dependency>
            <groupId>org.postgresql</groupId>
            <artifactId>postgresql</artifactId>
            <version>42.6.0</version> <!-- è¯·æ ¹æ®éœ€è¦é€‰æ‹©æœ€æ–°ç‰ˆæœ¬ -->
        </dependency>
    </dependencies>
    <build>
        <plugins>

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -1,6 +1,5 @@
package com.ruoyi.web.component;

import afu.org.checkerframework.checker.oigj.qual.O;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -23,7 +22,6 @@
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceSubtaskRecordService;
import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -41,7 +39,6 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import static cn.hutool.core.convert.Convert.numberToWord;
import static cn.hutool.core.convert.Convert.toHex;

@Slf4j

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java

@@ -1,26 +1,18 @@
package com.ruoyi.web.controller.smartor;

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.smartor.domain.SchemeAutofinshrule;
import com.ruoyi.smartor.service.ISchemeAutofinshruleService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.smartor.domain.SchemeAutofinshrule;
import com.smartor.service.ISchemeAutofinshruleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * æ–¹æ¡ˆç»“案规则Controller

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

@@ -13,15 +13,15 @@
        #        å…¬å¸
        #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        ä¸½æ°´
#        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: smartor
#        password: Smartor.2023
#        driverClassName: com.mysql.cj.jdbc.Driver
        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
        #        æ²³å—
#        url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: root
#        password: 123456
#        driverClassName: com.mysql.cj.jdbc.Driver
        #        url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: root
        #        password: 123456
        #        driverClassName: com.mysql.cj.jdbc.Driver
        #        # æ–°åŽ
        #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: smartor
@@ -29,10 +29,16 @@
        #        driverClassName: com.mysql.cj.jdbc.Driver

        #  å…¬å¸äº‘
        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: hxsoft
        password: Hxerp2000
        driverClassName: com.mysql.cj.jdbc.Driver
#        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: hxsoft
#        password: Hxerp2000
#        driverClassName: com.mysql.cj.jdbc.Driver

#        # é«˜æ–¯æ•°æ®åº“配置
#        url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
#        username: gaussdb
#        password: Ls@123456
#        driverClassName: org.postgresql.Driver

      # ä»Žåº“数据源
      slave:

 ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -17,4 +17,9 @@
        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
    </settings>

    <plugins>
        <!-- SQL转换拦截器 -->
        <plugin interceptor="com.ruoyi.common.mybatis.SqlConverterInterceptor"/>
    </plugins>

</configuration>

 ruoyi-common/src/main/java/com/ruoyi/common/mybatis/SqlConverterInterceptor.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.ruoyi.common.mybatis;

import com.ruoyi.common.utils.SqlConverter;
import com.ruoyi.common.utils.SpringContextUtils;
import org.apache.ibatis.executor.statement.StatementHandler;
import org.apache.ibatis.plugin.*;
import org.springframework.stereotype.Component;

import java.sql.Connection;
import java.util.Properties;

/**
 * SQL转换拦截器
 */
@Component
@Intercepts({
    @Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})
})
public class SqlConverterInterceptor implements Interceptor {

    private SqlConverter sqlConverter;

    @Override
    public Object intercept(Invocation invocation) throws Throwable {
        if (sqlConverter == null) {
            if (SpringContextUtils.getContext() == null) {
                // Spring容器还没初始化，直接跳过转换
                return invocation.proceed();
            }
            sqlConverter = SpringContextUtils.getBean(SqlConverter.class);
        }
        StatementHandler statementHandler = (StatementHandler) invocation.getTarget();
        String sql = statementHandler.getBoundSql().getSql();
        
        // è½¬æ¢SQL
        String convertedSql = sqlConverter.convertSql(sql);
        
        // ä½¿ç”¨åå°„设置转换后的SQL
        java.lang.reflect.Field field = statementHandler.getBoundSql().getClass().getDeclaredField("sql");
        field.setAccessible(true);
        field.set(statementHandler.getBoundSql(), convertedSql);
        
        return invocation.proceed();
    }

    @Override
    public Object plugin(Object target) {
        return Plugin.wrap(target, this);
    }

    @Override
    public void setProperties(Properties properties) {
        // ä¸éœ€è¦è®¾ç½®å±žæ€§
    }
} 

 ruoyi-common/src/main/java/com/ruoyi/common/utils/SpringContextUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.common.utils;

import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;

@Component
public class SpringContextUtils implements ApplicationContextAware {
    private static ApplicationContext context;

    @Override
    public void setApplicationContext(ApplicationContext applicationContext) {
        context = applicationContext;
    }

    public static <T> T getBean(Class<T> clazz) {
        return context.getBean(clazz);
    }

    public static ApplicationContext getContext() {
        return context;
    }
} 

 ruoyi-common/src/main/java/com/ruoyi/common/utils/SqlConverter.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package com.ruoyi.common.utils;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

/**
 * SQL语法转换工具类
 */
@Component
public class SqlConverter {
    
    @Value("${spring.datasource.druid.master.driverClassName}")
    private String driverClassName;
    
    /**
     * è½¬æ¢SQL语法
     * @param sql åŽŸå§‹SQL
     * @return è½¬æ¢åŽçš„SQL
     */
    public String convertSql(String sql) {
        // åˆ¤æ–­æ˜¯å¦æ˜¯é«˜æ–¯æ•°æ®åº“
        if (isGaussDB()) {
            return convertToGaussSql(sql);
        }
        return sql;
    }
    
    /**
     * åˆ¤æ–­æ˜¯å¦æ˜¯é«˜æ–¯æ•°æ®åº“
     */
    private boolean isGaussDB() {
        return driverClassName.contains("postgresql");
    }
    
    /**
     * å°†MySQL语法转换为高斯数据库语法
     */
    private String convertToGaussSql(String sql) {
        if (sql == null || sql.trim().isEmpty()) {
            return sql;
        }
        
        // è½¬æ¢LIMIT语法
        sql = sql.replaceAll("LIMIT\\s+(\\d+)\\s*,\\s*(\\d+)", "LIMIT $2 OFFSET $1");
        
        // è½¬æ¢æ—¥æœŸå‡½æ•°
        sql = sql.replaceAll("DATE_FORMAT\\(([^,]+),\\s*'%Y-%m-%d'\\)", "TO_CHAR($1, 'YYYY-MM-DD')");
        sql = sql.replaceAll("DATE_FORMAT\\(([^,]+),\\s*'%Y-%m-%d %H:%i:%s'\\)", "TO_CHAR($1, 'YYYY-MM-DD HH24:MI:SS')");
        
        // è½¬æ¢å­—符串连接
        sql = sql.replaceAll("CONCAT\\(([^)]+)\\)", "CONCAT_WS('', $1)");
        
        // è½¬æ¢IFNULL函数（忽略大小写）
        sql = sql.replaceAll("(?i)ifnull\\(([^,]+),\\s*([^)]+)\\)", "coalesce($1, $2)");
        
        // è½¬æ¢NOW()函数
        sql = sql.replaceAll("NOW\\(\\)", "CURRENT_TIMESTAMP");
        
        // æ›¿æ¢ sysdate() ä¸º CURRENT_TIMESTAMP
        sql = sql.replaceAll("sysdate\\(\\)", "CURRENT_TIMESTAMP");
        
        // åŽ»é™¤æ‰€æœ‰åå¼•å·
        sql = sql.replaceAll("`", "");
        
        // è½¬æ¢GROUP_CONCAT_WS为string_agg（忽略大小写）
        sql = sql.replaceAll("(?i)group_concat_ws\\s*\\(([^,]+),\\s*([^)]+)\\)", "string_agg($2, $1)");
        
        return sql;
    }
} 

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -1,18 +1,10 @@
package com.ruoyi.framework.config;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import javax.sql.DataSource;

import com.ruoyi.framework.interceptor.HospitalFilterInterceptor;
import com.ruoyi.common.utils.StringUtils;
import org.apache.ibatis.io.VFS;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.boot.autoconfigure.ConfigurationCustomizer;
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -26,7 +18,13 @@
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.util.ClassUtils;
import com.ruoyi.common.utils.StringUtils;

import javax.sql.DataSource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;

/**
 * Mybatis支持*匹配扫描包

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java

@@ -47,7 +47,7 @@
                orgid = loginUser.getUser().getOrgid();
            }
        } catch (Exception e) {
            e.printStackTrace();
//            e.printStackTrace();
        }
        if (StringUtils.isEmpty(orgid)) {
            return invocation.proceed();
@@ -71,7 +71,7 @@
     * @return ä¿®æ”¹åŽçš„ SQL
     */
    private String modifySqlWithorgidId(String originalSql, String orgid) {
        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu") || originalSql.contains("information_schema.tables") || originalSql.contains("information_schema.columns") || originalSql.contains("gen_table") || originalSql.toUpperCase().contains("ORGID IS NULL")) {
        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu")  || originalSql.contains("sys_job") || originalSql.contains("update sys_menu") || originalSql.contains("information_schema.tables") || originalSql.contains("information_schema.columns") || originalSql.contains("gen_table") || originalSql.toUpperCase().contains("ORGID IS NULL")) {
            return originalSql;
        }
        // æå– orgid çš„ WHERE å­å¥

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -283,7 +283,7 @@


    /**
     * é•¿æœŸä»»åŠ¡æ‰§è¡Œï¼ˆç”µè¯ï¼‰
     * é•¿æœŸä»»åŠ¡æ‰§è¡Œ
     */
    public void longTaskSend() {
        //获取任务信息
@@ -441,7 +441,8 @@
                                serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                        }
                    }
                } else if (descByCode.equals("短信")) {
                }
                else if (descByCode.equals("短信")) {
                    RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
                    String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
                    for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
@@ -543,7 +544,8 @@
                            }
                        }
                    }
                } else if (descByCode.equals("公众号")) {
                }
                else if (descByCode.equals("公众号")) {
                    log.error("公众号进来了吗？{}", descByCode);
                    //公众号
                    RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -40,7 +40,6 @@
     */
    @Excel(name = "登录地址")
    private String ipaddr;
    private String guid;

    /**
     * ç™»å½•åœ°ç‚¹

 ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -19,8 +19,8 @@
    </resultMap>

    <insert id="insertLogininfor" parameterType="SysLogininfor">
        insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time,guid,orgid)
        values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate(),guid,orgid)
        insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
        values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
    </insert>

    <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">

 smartor/src/main/java/com/smartor/mapper/SchemeAutofinshruleMapper.java

@@ -1,19 +1,19 @@
package com.ruoyi.smartor.mapper;
package com.smartor.mapper;

import java.util.List;
import com.ruoyi.smartor.domain.SchemeAutofinshrule;

/**
 * æ–¹æ¡ˆç»“案规则Mapper接口
 * 
 *
 * @author smartor
 * @date 2023-03-04
 */
public interface SchemeAutofinshruleMapper 
public interface SchemeAutofinshruleMapper
{
    /**
     * æŸ¥è¯¢æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param id æ–¹æ¡ˆç»“案规则主键
     * @return æ–¹æ¡ˆç»“案规则
     */
@@ -21,7 +21,7 @@

    /**
     * æŸ¥è¯¢æ–¹æ¡ˆç»“案规则列表
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return æ–¹æ¡ˆç»“案规则集合
     */
@@ -29,7 +29,7 @@

    /**
     * æ–°å¢žæ–¹æ¡ˆç»“案规则
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return ç»“æžœ
     */
@@ -37,7 +37,7 @@

    /**
     * ä¿®æ”¹æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return ç»“æžœ
     */
@@ -45,7 +45,7 @@

    /**
     * åˆ é™¤æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param id æ–¹æ¡ˆç»“案规则主键
     * @return ç»“æžœ
     */
@@ -53,7 +53,7 @@

    /**
     * æ‰¹é‡åˆ é™¤æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */

 smartor/src/main/java/com/smartor/service/ISchemeAutofinshruleService.java

@@ -1,19 +1,19 @@
package com.ruoyi.smartor.service;
package com.smartor.service;

import java.util.List;
import com.ruoyi.smartor.domain.SchemeAutofinshrule;

/**
 * æ–¹æ¡ˆç»“案规则Service接口
 * 
 *
 * @author smartor
 * @date 2023-03-04
 */
public interface ISchemeAutofinshruleService 
public interface ISchemeAutofinshruleService
{
    /**
     * æŸ¥è¯¢æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param id æ–¹æ¡ˆç»“案规则主键
     * @return æ–¹æ¡ˆç»“案规则
     */
@@ -21,7 +21,7 @@

    /**
     * æŸ¥è¯¢æ–¹æ¡ˆç»“案规则列表
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return æ–¹æ¡ˆç»“案规则集合
     */
@@ -29,7 +29,7 @@

    /**
     * æ–°å¢žæ–¹æ¡ˆç»“案规则
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return ç»“æžœ
     */
@@ -37,7 +37,7 @@

    /**
     * ä¿®æ”¹æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return ç»“æžœ
     */
@@ -45,7 +45,7 @@

    /**
     * æ‰¹é‡åˆ é™¤æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param ids éœ€è¦åˆ é™¤çš„方案结案规则主键集合
     * @return ç»“æžœ
     */
@@ -53,7 +53,7 @@

    /**
     * åˆ é™¤æ–¹æ¡ˆç»“案规则信息
     * 
     *
     * @param id æ–¹æ¡ˆç»“案规则主键
     * @return ç»“æžœ
     */

 smartor/src/main/java/com/smartor/service/impl/SchemeAutofinshruleServiceImpl.java

@@ -1,28 +1,29 @@
package com.ruoyi.smartor.service.impl;
package com.smartor.service.impl;

import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.smartor.domain.SchemeAutofinshrule;
import com.smartor.service.ISchemeAutofinshruleService;
import com.smartor.mapper.SchemeAutofinshruleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.smartor.mapper.SchemeAutofinshruleMapper;
import com.ruoyi.smartor.domain.SchemeAutofinshrule;
import com.ruoyi.smartor.service.ISchemeAutofinshruleService;

import java.util.List;

/**
 * æ–¹æ¡ˆç»“案规则Service业务层处理
 * 
 *
 * @author smartor
 * @date 2023-03-04
 */
@Service
public class SchemeAutofinshruleServiceImpl implements ISchemeAutofinshruleService 
public class SchemeAutofinshruleServiceImpl implements ISchemeAutofinshruleService
{
    @Autowired
    private SchemeAutofinshruleMapper schemeAutofinshruleMapper;

    /**
     * æŸ¥è¯¢æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param id æ–¹æ¡ˆç»“案规则主键
     * @return æ–¹æ¡ˆç»“案规则
     */
@@ -34,7 +35,7 @@

    /**
     * æŸ¥è¯¢æ–¹æ¡ˆç»“案规则列表
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return æ–¹æ¡ˆç»“案规则
     */
@@ -46,7 +47,7 @@

    /**
     * æ–°å¢žæ–¹æ¡ˆç»“案规则
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return ç»“æžœ
     */
@@ -59,7 +60,7 @@

    /**
     * ä¿®æ”¹æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param schemeAutofinshrule æ–¹æ¡ˆç»“案规则
     * @return ç»“æžœ
     */
@@ -72,7 +73,7 @@

    /**
     * æ‰¹é‡åˆ é™¤æ–¹æ¡ˆç»“案规则
     * 
     *
     * @param ids éœ€è¦åˆ é™¤çš„方案结案规则主键
     * @return ç»“æžœ
     */
@@ -84,7 +85,7 @@

    /**
     * åˆ é™¤æ–¹æ¡ˆç»“案规则信息
     * 
     *
     * @param id æ–¹æ¡ˆç»“案规则主键
     * @return ç»“æžœ
     */

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -287,7 +287,7 @@
                tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
                pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
            }
            if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 2) {
            if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS()) &&  serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS().size() > 0) {
                //问卷
                redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache");
                redisCache.setCacheListRight(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS());
@@ -295,7 +295,7 @@
                Long tims = Long.valueOf(3 * 24 * 3600);
                boolean expire = redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims);
                return 1;
            } else if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 1) {
            } else if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList()) && serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList().size() > 0) {
                //问卷
                redisCache.deleteObject(pid + "-" + tid + "-SFscriptCache");
                redisCache.setCacheListRight(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList());

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -156,7 +156,7 @@
        return serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
    }

    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO){
    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO) {
        return serviceSubtaskMapper.selectServiceSubtaskListAgain(serviceSubtaskVO);
    }

@@ -344,7 +344,7 @@
            serviceSubtask1.setIsVisitAgain(2);
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
            return "无需再次随访，任务被标记不在执行";
        } else if (patArchive.getNotrequiredFlag().equals("1")) {
        } else if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
            serviceSubtask1.setIsVisitAgain(2);
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
            return "无需再次随访，患者被标记不需要被服务";

 smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.smartor.mapper.SchemeAutofinshruleMapper">
<mapper namespace="com.smartor.mapper.SchemeAutofinshruleMapper">

    <resultMap type="SchemeAutofinshrule" id="SchemeAutofinshruleResult">
        <result property="id" column="id"/>