From c94885d4e04fffc973678ca068bc2e1fbc97823f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 03 Jul 2023 19:12:05 +0800
Subject: [PATCH] 数据校验规则准备

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java           |    0 
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java                    |    0 
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClientClientFallback.java |   20 ++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java          |    2 -
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java              |    3 -
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesMapper.java                      |    1 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java             |    2 -
 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/DataRulesXxlJob.java             |   32 ++++++++++++++++
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/IRulesClient.java              |   25 ++++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/ConditionController.java          |    2 -
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java  |    4 --
 11 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/IRulesClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/IRulesClient.java
new file mode 100644
index 0000000..dc38a97
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/IRulesClient.java
@@ -0,0 +1,25 @@
+package cn.gistack.sm.resDataCheck.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/7/3 19:03
+ */
+@FeignClient(
+	value = "blade-sm",
+	fallback = RulesClientClientFallback.class
+)
+public interface IRulesClient {
+
+	String API_PREFIX = "/client";
+	String CREATE_DATA_RULES = API_PREFIX + "/createDataRules";
+
+	@GetMapping(CREATE_DATA_RULES)
+	R createDataRules();
+
+}
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClientClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClientClientFallback.java
new file mode 100644
index 0000000..f5e6d19
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClientClientFallback.java
@@ -0,0 +1,20 @@
+package cn.gistack.sm.resDataCheck.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/7/3 19:04
+ */
+@Component
+public class RulesClientClientFallback implements IRulesClient{
+
+	@Override
+	public R createDataRules() {
+		return R.fail("获取数据失败");
+	}
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/ConditionController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/ConditionController.java
index e31e489..c66efb1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/ConditionController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/ConditionController.java
@@ -2,8 +2,6 @@
 
 import cn.gistack.sm.resDataCheck.entity.RulesCondition;
 import cn.gistack.sm.resDataCheck.service.IRulesConditionService;
-import cn.gistack.sm.resDataCheck.service.IRulesService;
-import cn.gistack.sm.resDataCheck.vo.RulesVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java
index 45a7ed8..33752ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java
@@ -1,9 +1,6 @@
 package cn.gistack.sm.resDataCheck.controller;
 
-import cn.gistack.sm.patrol.entity.PatrolConfig;
-import cn.gistack.sm.patrol.service.IPatrolConfigService;
 import cn.gistack.sm.resDataCheck.entity.Rules;
-import cn.gistack.sm.resDataCheck.entity.RulesCondition;
 import cn.gistack.sm.resDataCheck.service.IRulesService;
 import cn.gistack.sm.resDataCheck.vo.RulesVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java
index d0e505c..a6288d4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java
@@ -1,8 +1,6 @@
 package cn.gistack.sm.resDataCheck.mapper;
 
-import cn.gistack.sm.resDataCheck.entity.Rules;
 import cn.gistack.sm.resDataCheck.entity.RulesCondition;
-import cn.gistack.sm.resDataCheck.vo.RulesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesMapper.java
index 7df09b6..3521e41 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesMapper.java
@@ -1,6 +1,5 @@
 package cn.gistack.sm.resDataCheck.mapper;
 
-import cn.gistack.sm.patrol.entity.PatrolConfig;
 import cn.gistack.sm.resDataCheck.entity.Rules;
 import cn.gistack.sm.resDataCheck.vo.RulesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java
index 93e9930..e675c3c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java
@@ -1,8 +1,6 @@
 package cn.gistack.sm.resDataCheck.service;
 
-import cn.gistack.sm.resDataCheck.entity.Rules;
 import cn.gistack.sm.resDataCheck.entity.RulesCondition;
-import cn.gistack.sm.resDataCheck.vo.RulesVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java
index dcfe4af..9d0a355 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java
@@ -1,12 +1,8 @@
 package cn.gistack.sm.resDataCheck.service.impl;
 
-import cn.gistack.sm.resDataCheck.entity.Rules;
 import cn.gistack.sm.resDataCheck.entity.RulesCondition;
 import cn.gistack.sm.resDataCheck.mapper.RulesConditionMapper;
-import cn.gistack.sm.resDataCheck.mapper.RulesMapper;
 import cn.gistack.sm.resDataCheck.service.IRulesConditionService;
-import cn.gistack.sm.resDataCheck.service.IRulesService;
-import cn.gistack.sm.resDataCheck.vo.RulesVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/DataRulesXxlJob.java b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/DataRulesXxlJob.java
new file mode 100644
index 0000000..ef69c20
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/DataRulesXxlJob.java
@@ -0,0 +1,32 @@
+package cn.gistack.job.executor.jobhandler;
+
+import cn.gistack.sm.resDataCheck.feign.IRulesClient;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import com.xxl.job.core.log.XxlJobLogger;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION: 数据校验规则相关
+ * @USER: aix
+ * @DATE: 2023/7/3 17:58
+ */
+@Component
+public class DataRulesXxlJob {
+
+	@Autowired
+	private IRulesClient rulesClient;
+
+
+	@XxlJob("dataRulesJobHandler")
+	public ReturnT<String> execute(String param) {
+		XxlJobLogger.log("开始数据校验规则任务...");
+		R r = rulesClient.createDataRules();
+		XxlJobLogger.log("结束数据校验规则任务...",r.getMsg());
+		return ReturnT.SUCCESS;
+	}
+
+}

--
Gitblit v1.9.3