From f9b71f332b6a2d12151f20eeb6c68caa2a754eaa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 05 Jul 2023 16:10:12 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java | 5 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.xml | 3 +++
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java | 12 ++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java | 7 +++++++
skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/controller/TaskXxlJobController.java | 3 ++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java | 3 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java | 21 +++++++++++----------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java | 5 +++++
8 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/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
index 2eba5a0..50ab2a3 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/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
@@ -96,4 +96,16 @@
@ApiModelProperty(" 重复执行间隔")
private String repeatGap;
+ /**
+ * 定时器id
+ */
+ @ApiModelProperty(" 定时器id")
+ private String xxlJobId;
+
+ /**
+ *问题描述
+ */
+ @ApiModelProperty("问题描述")
+ private String proDescription;
+
}
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/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
index 4e011ed..bf64421 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/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
@@ -54,4 +54,9 @@
@ApiModelProperty(" 值(数据字典或值)")
private String value;
+ /**
+ *指标
+ */
+ @ApiModelProperty("指标")
+ private String target;
}
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 a6288d4..818eb87 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
@@ -3,6 +3,7 @@
import cn.gistack.sm.resDataCheck.entity.RulesCondition;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -12,4 +13,6 @@
public interface RulesConditionMapper extends BaseMapper<RulesCondition> {
List<RulesCondition> selectRulesConditionPage(IPage<RulesCondition> page, RulesCondition rulesCondition);
+
+ boolean physicDelete(@Param("id") Long id);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.xml
index 263c72e..05c3928 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.sm.resDataCheck.mapper.RulesConditionMapper">
+ <delete id="physicDelete">
+ DELETE FROM SM_RES_DATA_CHECK_RULES_CONDITION WHERE id = #{id}
+ </delete>
<select id="selectRulesConditionPage" resultType="cn.gistack.sm.resDataCheck.entity.RulesCondition"></select>
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 e675c3c..cec806d 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
@@ -9,4 +9,11 @@
*/
public interface IRulesConditionService extends BaseService<RulesCondition> {
IPage<RulesCondition> selectRulesConditionPage(IPage<RulesCondition> page, RulesCondition rulesCondition);
+
+ /**
+ * 物理删除
+ * @param id id
+ * @return
+ */
+ boolean physicDelete(Long id);
}
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 9d0a355..524241f 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
@@ -17,4 +17,9 @@
public IPage<RulesCondition> selectRulesConditionPage(IPage<RulesCondition> page, RulesCondition rulesCondition) {
return page.setRecords(baseMapper.selectRulesConditionPage(page,rulesCondition));
}
+
+ @Override
+ public boolean physicDelete(Long id) {
+ return baseMapper.physicDelete(id);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
index 2312c6c..c61b5de 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
@@ -24,6 +24,7 @@
public class RulesServiceImpl extends BaseServiceImpl<RulesMapper, Rules> implements IRulesService {
private final IRulesConditionService rulesConditionService;
+
@Override
public IPage<Rules> selectRulesPage(IPage<Rules> page, Rules rules) {
return page.setRecords(baseMapper.selectRulesPage(page,rules));
@@ -42,7 +43,6 @@
//批量保存condition
boolean saveCondition = rulesConditionService.saveBatch(rulesVO.getRulesConditionList());
-
return saveRules&&saveCondition;
}
@@ -52,15 +52,16 @@
//更新rules
boolean updateRules = updateById(rulesVO);
+ RulesCondition rulesCondition = new RulesCondition();
+ rulesCondition.setRuleId(rulesVO.getId().toString());
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ list.forEach(e->{
+ rulesConditionService.physicDelete(e.getId());
+ });
+
rulesVO.getRulesConditionList().forEach(condition->{
- //有id，更新
- if (ObjectUtil.isNotEmpty(condition.getId())){
- rulesConditionService.updateById(condition);
- }else {
- //没id，赋rulesId
- condition.setRuleId(rulesVO.getId().toString());
- rulesConditionService.save(condition);
- }
+ condition.setRuleId(rulesVO.getId().toString());
+ rulesConditionService.save(condition);
});
return updateRules;
}
@@ -71,7 +72,7 @@
RulesCondition rulesCondition = new RulesCondition();
rulesCondition.setRuleId(id);
- List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition).orderByDesc("RELATION"));
rulesVO.setRulesConditionList(list);
return rulesVO;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/controller/TaskXxlJobController.java b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/controller/TaskXxlJobController.java
index b25c7e5..18d6ace 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/controller/TaskXxlJobController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/controller/TaskXxlJobController.java
@@ -76,7 +76,8 @@
@ApiOperation(value="定时任务-添加", notes="定时任务-添加")
@PostMapping(value = "/save")
public R save(@RequestBody XxlJobInfoVO xxlJobInfo) {
- return R.data(xxlJobInfoService.saveXxlJob(xxlJobInfo));
+ xxlJobInfoService.saveXxlJob(xxlJobInfo);
+ return R.data(xxlJobInfo);
}
/**
--
Gitblit v1.9.3