From 02f8745d82ade8b5650aec51556e0c2e72f9b29c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 06 Jul 2023 17:07:13 +0800
Subject: [PATCH] 增加有闸无闸判断
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
index 071f75e..b44b507 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
@@ -5,10 +5,13 @@
import cn.gistack.sm.resDataCheck.service.IQualityManageService;
import cn.gistack.sm.resDataCheck.service.IRulesConditionService;
import cn.gistack.sm.resDataCheck.service.IRulesService;
+import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -24,6 +27,7 @@
@ApiIgnore
@RestController
@AllArgsConstructor
+@Slf4j
public class RulesClient implements IRulesClient {
private IRulesService rulesService;
@@ -202,6 +206,7 @@
@Override
public R createDataRules(Long id) {
+ log.info("规则匹配中......");
// 获取规则对象 返回值有关联水库，只匹配关联水库，为空表示匹配所有水库
Rules rules = rulesService.getById(id);
@@ -237,12 +242,26 @@
}
+ if (StringUtil.isNotBlank(rules.getIsGate())) {
+ sqlStr += "a.\"is_gate\" = " + rules.getIsGate();
+ }
+
// 拼接条件有问题，不操作
if (sqlStr.indexOf("-1") > 0) {
+ log.info("查询条件错误，请检查规则设置......：",sqlStr);
return R.fail(-1,sqlStr + "\\n 查询条件错误，请检查规则设置");
}
+ try {
+ qualityManageService.addQualityManage(id,sqlStr);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.info("查询条件错误，请检查规则设置......：",sqlStr);
+ } finally {
+ log.info("执行完成......：");
+ }
+
// 执行sql
- return R.data(qualityManageService.addQualityManage(id,sqlStr));
+ return R.success("");
}
}
--
Gitblit v1.9.3