xxl模块新增接口返回实体类；校验规则字段添加

guoshilong

2023-07-05 d7218d406dedf462b7d0ce1782f4bc510a5214f7

xxl模块新增接口返回实体类；校验规则字段添加

 skjcmanager/skjcmanager-service/skjcmanager-sm/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;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java

@@ -54,4 +54,9 @@
    @ApiModelProperty(" 值(数据字典或值)")
    private String value;

    /**
     *指标
     */
    @ApiModelProperty("指标")
    private String target;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/RulesConditionMapper.java

@@ -5,6 +5,7 @@
import cn.gistack.sm.resDataCheck.vo.RulesVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -14,4 +15,6 @@
public interface RulesConditionMapper extends BaseMapper<RulesCondition> {

    List<RulesCondition> selectRulesConditionPage(IPage<RulesCondition> page, RulesCondition rulesCondition);

    boolean physicDelete(@Param("id") Long id);
}

 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>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IRulesConditionService.java

@@ -11,4 +11,11 @@
 */
public interface IRulesConditionService extends BaseService<RulesCondition> {
    IPage<RulesCondition> selectRulesConditionPage(IPage<RulesCondition> page, RulesCondition rulesCondition);

    /**
     * 物理删除
     * @param id id
     * @return
     */
    boolean physicDelete(Long id);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesConditionServiceImpl.java

@@ -21,4 +21,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);
    }
}

 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;

 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);
    }

    /**