From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
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..b4adb34 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,7 @@
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.feign.IRulesClient;
import cn.gistack.sm.resDataCheck.service.IRulesService;
import cn.gistack.sm.resDataCheck.vo.RulesVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,6 +28,14 @@
public class RulesController extends BladeController {
private IRulesService rulesService;
+
+ private IRulesClient rulesClient;
+
+ @GetMapping(value = "/test")
+ public R test(@RequestParam(name = "id", required = true) Long id) {
+ rulesClient.createDataRules(id);
+ return R.data(0);
+ }
/**
* 分页列表查询
@@ -62,7 +68,8 @@
@ApiOperation(value = "数据规则校验-自定义添加", notes = "数据规则校验-自定义添加")
@PostMapping(value = "/save")
public R customizeAdd(@RequestBody RulesVO rulesVO){
- return R.data(rulesService.customizeAdd(rulesVO));
+ rulesService.customizeAdd(rulesVO);
+ return R.data(rulesVO);
}
/**
@@ -114,6 +121,18 @@
}
/**
+ * 自定义删除
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "数据规则校验-自定义删除", notes = "数据规则校验-自定义删除")
+ @PostMapping(value = "/remove")
+ public R remove(@RequestParam(name = "ids", required = true) String id) {
+ return R.data(rulesService.customizeRemove(id));
+ }
+
+ /**
* 通过id查询
*
* @param id
--
Gitblit v1.9.3