feat: 添加风险规则新增，查询功能

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dataobject/BlinkRiskRuleDO.java

@@ -3,9 +3,6 @@ package com.cloud.sa.management.domain.dataobject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.sa.base.common.annoation.DataAdaptorMapping;
-import com.cloud.sa.base.common.json.deserializer.DictValueVoDeserializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 @Data
@@ -21,15 +18,11 @@ public class BlinkRiskRuleDO {
     /**
      * 风险维度
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_RISK_DIMENSION")
     private String riskDimension;
 
     /**
      * 风险模板
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_RISK_MODEL")
     private String riskModel;
 
     /**
@@ -45,8 +38,6 @@ public class BlinkRiskRuleDO {
     /**
      *条件运算符
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_CONDITIONAL_OPERATORS")
     private String operator;
 
     /**
@@ -57,8 +48,6 @@ public class BlinkRiskRuleDO {
     /**
      *提醒方式
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_REMIND_WAY")
     private String remindWay;
 
     /**
@@ -69,8 +58,6 @@ public class BlinkRiskRuleDO {
     /**
      *风险等级
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_RISK_GRADE")
     private String riskGrade;
 
     /**
@@ -101,22 +88,16 @@ public class BlinkRiskRuleDO {
     /**
      *显示门户页面
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_PORTAL_PAGE")
     private String showPortalPage;
 
     /**
      *统计数据
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_COUNT_DATA")
     private String countData;
 
     /**
      *显示单位
      */
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
-    @DataAdaptorMapping(type = "dict", value = "BLINK_DISPLAY_UNIT")
     private String unit;
 
     /**

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dataobject/DictValueDO.java → bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dataobject/DictValueVO.java

@@ -1,8 +1,5 @@
 package com.cloud.sa.management.domain.dataobject;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -14,10 +11,8 @@ import java.time.LocalDateTime;
  * @Date 2022/5/26 19:40:55
  */
 @Data
-@TableName("mate_dict_value")
-public class DictValueDO {
+public class DictValueVO {
 
-    @TableId(type = IdType.AUTO)
     private Long dictValueId;
 
     private Long dictKeyId;

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/BlinkRiskRuleCategoryDTO.java

@@ -1,8 +1,5 @@
 package com.cloud.sa.management.domain.dto;
 
-import com.cloud.sa.base.common.annoation.DataAdaptorMapping;
-import com.cloud.sa.base.common.json.deserializer.DictValueVoDeserializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 import java.util.List;
@@ -12,12 +9,12 @@ import java.util.List;
 @Data
 public class BlinkRiskRuleCategoryDTO {
 
-    private String parentId;
+    private String key;
     /**
      * 风险维度（标题）
      */
     private String title;
 
-    private List<ResultDTO> children;
+    private List<ChildrenDTO> children;
 
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/BlinkRiskRuleDTO.java

@@ -1,8 +1,5 @@
 package com.cloud.sa.management.domain.dto;
 
-import com.cloud.sa.base.common.annoation.DataAdaptorMapping;
-import com.cloud.sa.base.common.json.deserializer.DictValueVoDeserializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 @Data

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/BlinkRiskRuleFormDTO.java

@@ -66,7 +66,7 @@ public class BlinkRiskRuleFormDTO {
     /**
      *是否启用（true：启用、false：不启用）
      */
-    private String isEnable;
+    private String enable;
 
     /**
      *提醒人
@@ -86,14 +86,14 @@ public class BlinkRiskRuleFormDTO {
     /**
      *是否显示门户页面
      */
-    private String isPortalPage;
+    private String portalPage;
 
     /**
      *显示门户页面
      */
     @JsonDeserialize(using = DictValueVoDeserializer.class)
     @DataAdaptorMapping(type = "dict", value = "BLINK_PORTAL_PAGE")
-    private String portalPage;
+    private String showPortalPage;
 
     /**
      *统计数据
@@ -117,7 +117,7 @@ public class BlinkRiskRuleFormDTO {
     /**
      *是否发起风险任务
      */
-    private String isLaunchRiskTask;
+    private String launchRiskTask;
 
     /**
      *任务整改期限（天）

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/ResultDTO.java → bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/ChildrenDTO.java

@@ -3,9 +3,9 @@ package com.cloud.sa.management.domain.dto;
 import lombok.Data;
 
 @Data
-public class ResultDTO {
+public class ChildrenDTO {
 
-    private String parentId;
+    private String key;
 
     /**
      * 风险指标（标题）

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/qry/BlinkRiskRuleQry.java

@@ -4,20 +4,9 @@ import lombok.Data;
 
 @Data
 public class BlinkRiskRuleQry{
-
-    /**
-     * 一级分类的id
-     * */
-    private String parentId;
-
     /**
      * 风险指标
      * */
     private String riskMetrics;
 
-    /**
-     * 二级分类的id
-     * */
-    private Integer id;
-
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/manager/BlinkRiskRuleServiceImpl.java

@@ -1,15 +1,14 @@
 package com.cloud.sa.management.manager;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cloud.sa.base.common.code.UserErrorCode;
 import com.cloud.sa.base.common.domain.ResponseDTO;
 import com.cloud.sa.base.common.util.BlinkEntityUtil;
 import com.cloud.sa.management.domain.dataobject.BlinkRiskRuleDO;
-import com.cloud.sa.management.domain.dataobject.DictValueDO;
+import com.cloud.sa.management.domain.dataobject.DictValueVO;
 import com.cloud.sa.management.domain.dto.BlinkRiskRuleCategoryDTO;
 import com.cloud.sa.management.domain.dto.BlinkRiskRuleDTO;
 import com.cloud.sa.management.domain.dto.BlinkRiskRuleFormDTO;
-import com.cloud.sa.management.domain.dto.ResultDTO;
+import com.cloud.sa.management.domain.dto.ChildrenDTO;
 import com.cloud.sa.management.domain.qry.BlinkRiskRuleQry;
 import com.cloud.sa.management.objectmapper.BlinkRiskRuleMapper;
 import com.cloud.sa.management.repository.BlinkRiskRuleRepository;
@@ -18,8 +17,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Service
 public class BlinkRiskRuleServiceImpl implements BlinkRiskRuleService {
@@ -62,7 +59,7 @@ public class BlinkRiskRuleServiceImpl implements BlinkRiskRuleService {
      */
     @Override
     public ResponseDTO<List<BlinkRiskRuleDTO>> selectAll(BlinkRiskRuleQry qry) {
-        List<BlinkRiskRuleDTO> blinkRiskRuleDOList = blinkRiskRuleRepository.supportsRiskRule(qry);
+        List<BlinkRiskRuleDTO> blinkRiskRuleDOList = blinkRiskRuleRepository.supportsRiskRuleAll(qry);
         return ResponseDTO.ok(blinkRiskRuleDOList);
     }
 
@@ -75,20 +72,18 @@ public class BlinkRiskRuleServiceImpl implements BlinkRiskRuleService {
     @Override
     public ResponseDTO<List<BlinkRiskRuleCategoryDTO>> selectAllCategory() {
         String str = "parentId-";
-        List<DictValueDO> dictValueDOList = blinkRiskRuleRepository.query();
+        List<DictValueVO> dictValueVOList = blinkRiskRuleRepository.query();
 
         List<BlinkRiskRuleCategoryDTO> blinkRiskRuleCategoryDTOList = new ArrayList<>();
-        for (DictValueDO dictValue : dictValueDOList){
+        for (DictValueVO dictValue : dictValueVOList){
             BlinkRiskRuleCategoryDTO blinkRiskRuleCategoryDTO = new BlinkRiskRuleCategoryDTO();
-            blinkRiskRuleCategoryDTO.setParentId(str + dictValue.getValueCode());
+            blinkRiskRuleCategoryDTO.setKey(str + dictValue.getValueCode());
             blinkRiskRuleCategoryDTO.setTitle(dictValue.getValueName());
-            BlinkRiskRuleQry qry = new BlinkRiskRuleQry();
-            qry.setParentId(dictValue.getValueCode());
-            List<BlinkRiskRuleDTO> result = blinkRiskRuleRepository.supportsRiskRule(qry);
-            List<ResultDTO> resultDTOList = new ArrayList<>();
+            List<BlinkRiskRuleDTO> result = blinkRiskRuleRepository.supportsRiskRule(dictValue.getValueCode());
+            List<ChildrenDTO> resultDTOList = new ArrayList<>();
             for (BlinkRiskRuleDTO res : result){
-                ResultDTO resultDTO = new ResultDTO();
-                resultDTO.setParentId(str + dictValue.getValueCode() + '-' + res.getId());
+                ChildrenDTO resultDTO = new ChildrenDTO();
+                resultDTO.setKey(str + dictValue.getValueCode() + '-' + res.getId());
                 resultDTO.setTitle(res.getRiskMetrics());
                 resultDTOList.add(resultDTO);
             }
@@ -111,9 +106,7 @@ public class BlinkRiskRuleServiceImpl implements BlinkRiskRuleService {
         // 如果是一级分类的id，查询此分类下的所有风险
         if (parentId.split("-").length - 1 == 1){
             String riskDimension = parentId.substring(9);
-            BlinkRiskRuleQry qry = new BlinkRiskRuleQry();
-            qry.setParentId(riskDimension);
-            List<BlinkRiskRuleDTO> blinkRiskRuleDTOs = blinkRiskRuleRepository.supportsRiskRule(qry);
+            List<BlinkRiskRuleDTO> blinkRiskRuleDTOs = blinkRiskRuleRepository.supportsRiskRule(riskDimension);
             return ResponseDTO.ok(blinkRiskRuleDTOs);
         }
 

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/repository/BlinkRiskRuleRepository.java

@@ -1,12 +1,9 @@
 package com.cloud.sa.management.repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.sa.management.domain.dataobject.BlinkRiskRuleDO;
-import com.cloud.sa.management.domain.dataobject.DictValueDO;
-import com.cloud.sa.management.domain.dto.BlinkCustomerDTO;
+import com.cloud.sa.management.domain.dataobject.DictValueVO;
 import com.cloud.sa.management.domain.dto.BlinkRiskRuleDTO;
-import com.cloud.sa.management.domain.qry.BlinkCustomerQry;
 import com.cloud.sa.management.domain.qry.BlinkRiskRuleQry;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,13 +16,22 @@ import java.util.List;
 public interface BlinkRiskRuleRepository extends BaseMapper<BlinkRiskRuleDO> {
 
     /**
-     * 风险查询列表
+     * 全部风险查询列表
      *
      * @param qry
      * @param
      * @return
      */
-    List<BlinkRiskRuleDTO> supportsRiskRule(@Param("qry") BlinkRiskRuleQry qry);
+    List<BlinkRiskRuleDTO> supportsRiskRuleAll(@Param("qry") BlinkRiskRuleQry qry);
+
+    /**
+     * 某个一级分类下风险查询列表
+     *
+     * @param riskDimension
+     * @param
+     * @return
+     */
+    List<BlinkRiskRuleDTO> supportsRiskRule(@Param("riskDimension") String riskDimension);
 
     /**
      * 风险查询单个（根据风险指标）
@@ -52,7 +58,7 @@ public interface BlinkRiskRuleRepository extends BaseMapper<BlinkRiskRuleDO> {
      * @param
      * @return
      */
-    List<DictValueDO> query();
+    List<DictValueVO> query();
 
 
 

bound-link-api/blink-management/src/main/resources/mapper/BlinkRiskRuleRepositoryMapper.xml

@@ -2,17 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cloud.sa.management.repository.BlinkRiskRuleRepository">
 
-<!--    倒叙查询所有风险-->
+<!--    倒序查询所有风险-->
+    <select id="supportsRiskRuleAll" resultType="com.cloud.sa.management.domain.dto.BlinkRiskRuleDTO">
+        select *
+        from blink_risk_rule
+        where deleted_flag = '0'
+        order by create_time desc
+    </select>
+
+    <!--    倒序查询某个一级分类下所有风险-->
     <select id="supportsRiskRule" resultType="com.cloud.sa.management.domain.dto.BlinkRiskRuleDTO">
         select *
         from blink_risk_rule
-        <where>
-            <if test="qry.parentId != null">
-                risk_dimension = #{qry.parentId}
-                and
-            </if>
-            deleted_flag = '0'
-        </where>
+        where risk_dimension = #{riskDimension}
+        and deleted_flag = '0'
         order by create_time desc
     </select>
 
@@ -31,7 +34,7 @@
     </select>
 
 <!--    查询字典中的所有的一级标题-->
-    <select id="query" resultType="com.cloud.sa.management.domain.dataobject.DictValueDO">
+    <select id="query" resultType="com.cloud.sa.management.domain.dataobject.DictValueVO">
         select *
         from mate_dict_value
         where dict_key_id = '91' and deleted_flag = '0'