风险类别6-16

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java

@@ -1,19 +1,33 @@
 package com.supervise.rms.api.risklevel;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.UUID;
+
 @Data
 @ApiModel(value = "风险等级表", description = "风险名单表")
 @TableName("risk_level")
-public class RiskLevel extends BaseEntity {
+public class RiskLevel {
+    @ApiModelProperty("ID，唯一编号")
+    private Integer id;
+    @ApiModelProperty("字符型编号")
+    private String sid = UUID.randomUUID().toString();
+    @ApiModelProperty("记录创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime = new Date();
     @ApiModelProperty("风险等级名称")
-    private String riskLevelName;
+    private String name;
     @ApiModelProperty("风险等级代码")
-    private String riskLevelCode;
+    private String code;
-    @ApiModelProperty("风险程度Sid")
+    @ApiModelProperty("处理方式")
-    private String riskDegreeSid;
+    private String handlingMethod;
+    @ApiModelProperty("报送单位")
+    private Integer reportTarget;
+    @ApiModelProperty("备注信息")
+    private String remarks;
 }

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java

@@ -6,11 +6,17 @@ import lombok.Data;
 
 @Data
 public class RiskLevelDto implements Dto {
+    private Integer id;
     private String sid;
+
     @ApiModelProperty("风险等级名称")
-    private String riskLevelName;
+    private String name;
     @ApiModelProperty("风险等级代码")
-    private String riskLevelCode;
+    private String code;
-    @ApiModelProperty("风险程度Sid")
+    @ApiModelProperty("处理方式")
-    private String riskDegreeSid;
+    private String handlingMethod;
+    @ApiModelProperty("报送单位")
+    private Integer reportTarget;
+    @ApiModelProperty("备注信息")
+    private String remarks;
 }

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @Api(tags = "风险指标类别表")
 @FeignClient(
@@ -15,5 +16,5 @@ import org.springframework.web.bind.annotation.PostMapping;
 public interface RiskLevelFeign {
     @ApiOperation("保存风险等级")
     @PostMapping("/saveRiskLevel")
-    ResultBean saveRiskLevel(RiskLevelDto riskLevelDto);
+    ResultBean saveRiskLevel(@RequestBody RiskLevelDto riskLevelDto);
 }

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelQuery.java

@@ -0,0 +1,17 @@
+package com.supervise.rms.api.risklevel;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-16-9:31
+ */
+@Data
+public class RiskLevelQuery implements Query {
+    @ApiModelProperty("风险等级名称")
+    private String name;
+    @ApiModelProperty("风险等级代码")
+    private String code;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java

@@ -4,13 +4,22 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class RiskLevelVo implements Vo {
+    private Integer id;
     private String sid;
+    private Date createTime;
+
     @ApiModelProperty("风险等级名称")
-    private String riskLevelName;
+    private String name;
     @ApiModelProperty("风险等级代码")
-    private String riskLevelCode;
+    private String code;
-    @ApiModelProperty("风险程度Sid")
+    @ApiModelProperty("处理方式")
-    private String riskDegreeSid;
+    private String handlingMethod;
+    @ApiModelProperty("报送单位")
+    private Integer reportTarget;
+    @ApiModelProperty("备注信息")
+    private String remarks;
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java

@@ -24,12 +24,18 @@
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
 package com.supervise.rms.biz.risklevel;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.supervise.rms.api.risklevel.RiskLevel;
+import com.supervise.rms.api.risklevel.RiskLevelVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface RiskLevelMapper extends BaseMapper<RiskLevel> {
 
+    IPage<RiskLevelVo> listPage(IPage<RiskLevel> page, @Param(Constants.WRAPPER) Wrapper<RiskLevel> qw);
 
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.supervise.rms.biz.risklevel.RiskLevelMapper">
 
+    <select id="listPage" resultType="com.supervise.rms.api.risklevel.RiskLevelVo">
+        select * from risk_level
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java

@@ -1,19 +1,18 @@
 package com.supervise.rms.biz.risklevel;
 
-import com.supervise.rms.api.risk.RiskFeign;
-import com.supervise.rms.api.riskdegree.RiskDegreeDto;
 import com.supervise.rms.api.risklevel.RiskLevelDto;
 import com.supervise.rms.api.risklevel.RiskLevelFeign;
-import com.supervise.rms.biz.riskdegree.RiskDegreeService;
+import com.supervise.rms.api.risklevel.RiskLevelQuery;
+import com.supervise.rms.api.risklevel.RiskLevelVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-@Api(tags = "风险名单表")
+@Api(tags = "风险等级表")
 @RestController("com.supervise.rmc.biz.risklevel.RiskLevelRest")
 @RequestMapping("v1/riskLevel")
 public class RiskLevelRest implements RiskLevelFeign {
@@ -26,4 +25,20 @@ public class RiskLevelRest implements RiskLevelFeign {
     public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto) {
         return  riskLevelService.saveRiskLevel(riskLevelDto);
     }
+
+    @ApiOperation("删除风险等级")
+    @GetMapping("/del/{sid}")
+    public ResultBean del(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        riskLevelService.deleteBySid(sid);
+        return rb.success().setMsg("删除成功");
+    }
+
+    @ApiOperation("分页查询")
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<RiskLevelQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskLevelVo> riskLevelVoPagerVo = riskLevelService.listPage(pq);
+        return rb.success().setData(riskLevelVoPagerVo);
+    }
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java

@@ -1,9 +1,16 @@
 package com.supervise.rms.biz.risklevel;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervise.rms.api.risklevel.RiskLevel;
 import com.supervise.rms.api.risklevel.RiskLevelDto;
+import com.supervise.rms.api.risklevel.RiskLevelQuery;
+import com.supervise.rms.api.risklevel.RiskLevelVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -38,4 +45,15 @@ public class RiskLevelService extends MybatisBaseService<RiskLevelMapper, RiskLe
         return rb.success().setData(sid).setMsg("保存成功");
     }
 
+    public PagerVo<RiskLevelVo> listPage(PagerQuery<RiskLevelQuery> pq){
+        RiskLevelQuery params = pq.getParams();
+        QueryWrapper<RiskLevel> wq = new QueryWrapper<>();
+        if (params != null){
+
+        }
+        IPage<RiskLevel> page = PagerUtil.queryToPage(pq);
+        IPage<RiskLevelVo> iPage = baseMapper.listPage(page, wq);
+        PagerVo<RiskLevelVo> vo = PagerUtil.pageToVo(iPage, null);
+        return vo;
+    }
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.java

@@ -0,0 +1,30 @@
+package com.supervise.rms.biz.risktype;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.supervise.rms.api.risktype.RiskType;
+import com.supervise.rms.api.risktype.RiskTypeVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-14-16:18
+ */
+@Mapper
+public interface RiskTypeMapper extends BaseMapper<RiskType> {
+
+    IPage<RiskTypeVo> listPage(IPage<RiskType> page, @Param(Constants.WRAPPER) Wrapper<RiskType> qw);
+
+    List<RiskType> selectRiskTypeFirst();
+
+    List<RiskType> selectRiskTypeSubordinate(@Param("sid") String sid);
+
+    @Delete("delete from risk_type where parentSid = #{parentSid}")
+    void del(@Param("parentSid") String parentSid);
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.xml

@@ -0,0 +1,19 @@
+<?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="com.supervise.rms.biz.risktype.RiskTypeMapper">
+
+    <select id="listPage" resultType="com.supervise.rms.api.risktype.RiskTypeVo">
+        select * from risk_type
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectRiskTypeFirst" resultType="com.supervise.rms.api.risktype.RiskType">
+        select * from risk_type where hierarchy = 1
+    </select>
+
+    <select id="selectRiskTypeSubordinate" resultType="com.supervise.rms.api.risktype.RiskType">
+        select * from risk_type where parentSid = #{sid}
+    </select>
+</mapper>

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeRest.java

@@ -0,0 +1,57 @@
+package com.supervise.rms.biz.risktype;
+
+import com.supervise.rms.api.risktype.RiskTypeDto;
+import com.supervise.rms.api.risktype.RiskTypeQuery;
+import com.supervise.rms.api.risktype.RiskTypeVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author feikefei
+ * @create 2023-06-14-16:14
+ */
+@Api(tags = "风险类别表")
+@RestController("com.supervise.rmc.biz.risktype.RiskType")
+@RequestMapping("v1/riskType")
+public class RiskTypeRest {
+
+    @Autowired
+    private RiskTypeService riskTypeService;
+
+    @ApiOperation("保存风险类别")
+    @PostMapping("/saveRiskType")
+    public ResultBean saveRiskType(@RequestBody RiskTypeDto dto){
+        return riskTypeService.saveRiskType(dto);
+    }
+
+    @ApiOperation("分页查询")
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<RiskTypeQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskTypeVo> pagerVo = riskTypeService.listPage(pq);
+        return rb.success().setData(pagerVo);
+    }
+
+    @ApiOperation("查询所有一级风险类别")
+    @GetMapping("/selectRiskTypeFirst")
+    public ResultBean selectRiskTypeFirst(){
+        return riskTypeService.selectRiskTypeFirst();
+    }
+
+    @ApiOperation("查询所有一级下的风险类别")
+    @GetMapping("/selectRiskTypeSubordinate/{sid}")
+    public ResultBean selectRiskTypeSubordinate(@PathVariable String sid){
+        return riskTypeService.selectRiskTypeSubordinate(sid);
+    }
+
+    @ApiOperation("删除一级下的风险类别")
+    @GetMapping("/del/{sid}")
+    public ResultBean del(@PathVariable String sid){
+        return riskTypeService.del(sid);
+    }
+}