From c62e26954e41360fc6a2efc874815aa84f8b0073 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 五月 2025 14:45:10 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml | 5
ruoyi-admin/pom.xml | 5
ruoyi-common/src/main/java/com/ruoyi/common/utils/SpringContextUtils.java | 23 +++
ruoyi-common/src/main/java/com/ruoyi/common/utils/SqlConverter.java | 70 +++++++++++
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml | 4
ruoyi-common/src/main/java/com/ruoyi/common/mybatis/SqlConverterInterceptor.java | 55 +++++++++
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 1
smartor/src/main/java/com/smartor/mapper/SchemeAutofinshruleMapper.java | 18 +-
smartor/src/main/java/com/smartor/service/ISchemeAutofinshruleService.java | 18 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java | 26 +--
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 8
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 4
ruoyi-admin/src/main/resources/application-druid.yml | 30 +++--
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 3
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java | 18 +-
smartor/src/main/java/com/smartor/service/impl/SchemeAutofinshruleServiceImpl.java | 27 ++--
smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java | 4
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 4
19 files changed, 239 insertions(+), 86 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 3fd6b63..20f4e6e 100644
--- a/ruoyi-admin/pom.xml
+++ b/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>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 4a742f5..10c7c9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/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
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java
index 61238b2..e9708f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SchemeAutofinshruleController.java
+++ b/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
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index bce7996..2961436 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/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:
diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
index 40e19ca..1e3c73f 100644
--- a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
+++ b/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>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/mybatis/SqlConverterInterceptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/mybatis/SqlConverterInterceptor.java
new file mode 100644
index 0000000..4f5a3e3
--- /dev/null
+++ b/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) {
+ // 涓嶉渶瑕佽缃睘鎬�
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SpringContextUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SpringContextUtils.java
new file mode 100644
index 0000000..9f92a49
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SqlConverter.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SqlConverter.java
new file mode 100644
index 0000000..5bca7c8
--- /dev/null
+++ b/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");
+ }
+
+ /**
+ * 灏哅ySQL璇硶杞崲涓洪珮鏂暟鎹簱璇硶
+ */
+ 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涓簊tring_agg锛堝拷鐣ュぇ灏忓啓锛�
+ sql = sql.replaceAll("(?i)group_concat_ws\\s*\\(([^,]+),\\s*([^)]+)\\)", "string_agg($2, $1)");
+
+ return sql;
+ }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
index d938b77..e04de46 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
+++ b/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鏀寔*鍖归厤鎵弿鍖�
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index 8c2c93a..7ddca76 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/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 瀛愬彞
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index ea51b97..dec2f0a 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/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();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 0082fdc..2025c10 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -40,7 +40,6 @@
*/
@Excel(name = "鐧诲綍鍦板潃")
private String ipaddr;
- private String guid;
/**
* 鐧诲綍鍦扮偣
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 10ce0f6..a0f071f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/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">
diff --git a/smartor/src/main/java/com/smartor/mapper/SchemeAutofinshruleMapper.java b/smartor/src/main/java/com/smartor/mapper/SchemeAutofinshruleMapper.java
index 68c0c53..b1eabda 100644
--- a/smartor/src/main/java/com/smartor/mapper/SchemeAutofinshruleMapper.java
+++ b/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 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/ISchemeAutofinshruleService.java b/smartor/src/main/java/com/smartor/service/ISchemeAutofinshruleService.java
index 960c86a..eeb78d6 100644
--- a/smartor/src/main/java/com/smartor/service/ISchemeAutofinshruleService.java
+++ b/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 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/impl/SchemeAutofinshruleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SchemeAutofinshruleServiceImpl.java
index 17b1366..fac319e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SchemeAutofinshruleServiceImpl.java
+++ b/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 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 2d47ab3..383e489 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/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());
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index a951ded..307c5f1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/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 "鏃犻渶鍐嶆闅忚锛屾偅鑰呰鏍囪涓嶉渶瑕佽鏈嶅姟";
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml
index 8c73999..e321ebe 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml
+++ b/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"/>
--
Gitblit v1.9.3