From b53d01f143877baa8025e02684dd8360d7053a74 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 23 十二月 2025 13:38:40 +0800
Subject: [PATCH] #
---
src/main/webapp/views/config/config.html | 1 +
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 12 ++++++++++++
src/main/webapp/static/js/config/config.js | 18 ++++++++++++++++++
src/main/java/com/zy/system/controller/ConfigController.java | 16 ++++++++++++++++
4 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index e09a1e2..3cb2adf 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -30,6 +30,7 @@
import org.springframework.stereotype.Component;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -400,6 +401,17 @@
//妫�娴嬫祬搴撲綅鐘舵��
public synchronized boolean checkShallowLocStatus(String locNo, Integer taskNo) {
+ String checkDeepLocOutTaskBlockReport = "Y";
+ Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+ if (systemConfigMapObj != null) {
+ HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
+ checkDeepLocOutTaskBlockReport = systemConfigMap.get("checkDeepLocOutTaskBlockReport");
+ }
+
+ if (!checkDeepLocOutTaskBlockReport.equals("Y")) {
+ return true;
+ }
+
Object lock = redisUtil.get(RedisKeyType.CHECK_SHALLOW_LOC_STATUS_LIMIT.key + taskNo);
if (lock != null) {
return false;
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index e5a5639..9079b78 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -13,6 +13,8 @@
import com.zy.common.entity.Parameter;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.enums.RedisKeyType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,20 @@
@Autowired
private ConfigService configService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @RequestMapping(value = "/config/refreshCache")
+ @ManagerAuth
+ public R refreshCache(){
+ HashMap<String, String> systemConfigMap = new HashMap<>();
+ List<Config> configList = configService.selectList(new EntityWrapper<>());
+ for (Config config : configList) {
+ systemConfigMap.put(config.getCode(), config.getValue());
+ }
+ redisUtil.set(RedisKeyType.SYSTEM_CONFIG_MAP.key, systemConfigMap);
+ return R.ok();
+ }
@RequestMapping(value = "/config/{id}/auth")
@ManagerAuth
diff --git a/src/main/webapp/static/js/config/config.js b/src/main/webapp/static/js/config/config.js
index 4043b9c..bc6d223 100644
--- a/src/main/webapp/static/js/config/config.js
+++ b/src/main/webapp/static/js/config/config.js
@@ -130,6 +130,24 @@
});
}
break;
+ case 'refreshCache':
+ layer.confirm('纭畾鍒锋柊Redis缂撳瓨鍚�', function(){
+ $.ajax({
+ url: baseUrl+"/config/refreshCache",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg('鍒锋柊鎴愬姛');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ break;
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
diff --git a/src/main/webapp/views/config/config.html b/src/main/webapp/views/config/config.html
index fb4d8df..f0b75be 100644
--- a/src/main/webapp/views/config/config.html
+++ b/src/main/webapp/views/config/config.html
@@ -34,6 +34,7 @@
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-warm layui-btn-sm" id="btn-refresh-cache" lay-event="refreshCache">鍒锋柊缂撳瓨</button>
</div>
</script>
--
Gitblit v1.9.1