From acc52f0e9812ca67abf1e39d07cf4bc03d43c915 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Fri, 16 Jun 2023 18:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=B1=BB=E5=88=AB6-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rms/api/risklevel/RiskLevel.java | 26 +++++++-- .../rms/api/risklevel/RiskLevelDto.java | 14 +++-- .../rms/api/risklevel/RiskLevelFeign.java | 3 +- .../rms/api/risklevel/RiskLevelQuery.java | 17 ++++++ .../rms/api/risklevel/RiskLevelVo.java | 17 ++++-- .../rms/biz/risklevel/RiskLevelMapper.java | 6 ++ .../rms/biz/risklevel/RiskLevelMapper.xml | 6 ++ .../rms/biz/risklevel/RiskLevelRest.java | 29 +++++++--- .../rms/biz/risklevel/RiskLevelService.java | 18 ++++++ .../rms/biz/risktype/RiskTypeMapper.java | 30 ++++++++++ .../rms/biz/risktype/RiskTypeMapper.xml | 19 +++++++ .../rms/biz/risktype/RiskTypeRest.java | 57 +++++++++++++++++++ 12 files changed, 220 insertions(+), 22 deletions(-) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelQuery.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.xml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeRest.java diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java index cf732804..0b1e2eb4 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java +++ b/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; - @ApiModelProperty("风险程度Sid") - private String riskDegreeSid; + private String code; + @ApiModelProperty("处理方式") + private String handlingMethod; + @ApiModelProperty("报送单位") + private Integer reportTarget; + @ApiModelProperty("备注信息") + private String remarks; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java index 4a83f886..9583ec51 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java +++ b/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; - @ApiModelProperty("风险程度Sid") - private String riskDegreeSid; + private String code; + @ApiModelProperty("处理方式") + private String handlingMethod; + @ApiModelProperty("报送单位") + private Integer reportTarget; + @ApiModelProperty("备注信息") + private String remarks; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java index 46e1deda..e9bf2ddc 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java +++ b/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); } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelQuery.java new file mode 100644 index 00000000..8b4284ae --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java index 6a10d8a0..91d86781 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java +++ b/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; - @ApiModelProperty("风险程度Sid") - private String riskDegreeSid; + private String code; + @ApiModelProperty("处理方式") + private String handlingMethod; + @ApiModelProperty("报送单位") + private Integer reportTarget; + @ApiModelProperty("备注信息") + private String remarks; } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java index 2c1dffea..17271785 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java +++ b/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 { + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml index 5c11194c..ce4774c7 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml @@ -2,4 +2,10 @@ + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java index 174e655f..04c0a9d5 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -@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 pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo riskLevelVoPagerVo = riskLevelService.listPage(pq); + return rb.success().setData(riskLevelVoPagerVo); + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java index 8da0e3a1..dba275bf 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java +++ b/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 listPage(PagerQuery pq){ + RiskLevelQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (params != null){ + + } + IPage page = PagerUtil.queryToPage(pq); + IPage iPage = baseMapper.listPage(page, wq); + PagerVo vo = PagerUtil.pageToVo(iPage, null); + return vo; + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.java new file mode 100644 index 00000000..32ed738b --- /dev/null +++ b/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 { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectRiskTypeFirst(); + + List selectRiskTypeSubordinate(@Param("sid") String sid); + + @Delete("delete from risk_type where parentSid = #{parentSid}") + void del(@Param("parentSid") String parentSid); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.xml new file mode 100644 index 00000000..5fb18229 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeRest.java new file mode 100644 index 00000000..1b5bac59 --- /dev/null +++ b/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 pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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); + } +}