From 454f607f2efd7904b5a997e0bffbbfa0733530c5 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 07 Jul 2023 12:01:22 +0800
Subject: [PATCH] 数据校验规则数据生成修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/RulesController.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 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 e750148..d5bd041 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,13 @@
 public class RulesController extends BladeController {
 
 	private IRulesService rulesService;
+
+	private IRulesClient rulesClient;
+
+	@GetMapping(value = "/test")
+	public R test(@RequestParam(name = "id", required = true) Long id) {
+		return rulesClient.createDataRules(id);
+	}
 
 	/**
 	 * 分页列表查询
@@ -62,7 +67,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);
 	}
 
 	/**
@@ -96,7 +102,7 @@
 	 * @return
 	 */
 	@ApiOperation(value = "数据规则校验-通过id删除", notes = "数据规则校验-通过id删除")
-	@DeleteMapping(value = "/delete")
+	@PostMapping(value = "/delete")
 	public R delete(@RequestParam(name = "id", required = true) String id) {
 		return R.data(rulesService.removeById(id));
 	}
@@ -108,12 +114,24 @@
 	 * @return
 	 */
 	@ApiOperation(value = "数据规则校验-批量删除", notes = "数据规则校验-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+	@PostMapping(value = "/deleteBatch")
 	public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 		return R.data(this.rulesService.removeByIds(Arrays.asList(ids.split(","))));
 	}
 
 	/**
+	 * 自定义删除
+	 *
+	 * @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