diff --git a/docs/databases/table_create_rms.sql b/docs/databases/table_create_rms.sql index 7a69f8be..52a4746e 100644 --- a/docs/databases/table_create_rms.sql +++ b/docs/databases/table_create_rms.sql @@ -228,4 +228,24 @@ CREATE TABLE `push_information` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '推送人员表' ROW_FORMAT = Dynamic; +SET FOREIGN_KEY_CHECKS = 1; + +DROP TABLE IF EXISTS `risk_index`; +CREATE TABLE `risk_index` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid', + `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间', + `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息', + `code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '代码', + `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', + `content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '指标说明', + `levelSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险等级(程度)Sid', + `levelCode` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险等级(程度)代码', + `levelName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险等级(程度)名称', + `typeSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险类别Sid', + `typeCode` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险类别代码', + `typeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '风险类别名称', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '监控指标' ROW_FORMAT = Dynamic; + SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndex.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndex.java new file mode 100644 index 00000000..578b774f --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndex.java @@ -0,0 +1,47 @@ +package com.supervise.rms.api.riskindex; + +import com.baomidou.mybatisplus.annotation.TableName; +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; + +/** + * @author feikefei + * @create 2023-06-16-10:11 + */ +@Data +@ApiModel(value = "监控指标表", description = "监控指标表") +@TableName("risk_index") +public class RiskIndex { + @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 remarks; + @ApiModelProperty("代码") + private String code; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("指标说明") + private String content; + @ApiModelProperty("风险等级(程度)Sid") + private String levelSid; + @ApiModelProperty("风险等级(程度)代码") + private String levelCode; + @ApiModelProperty("风险等级(程度)名称") + private String levelName; + @ApiModelProperty("风险类别Sid") + private String typeSid; + @ApiModelProperty("风险类别代码") + private String typeCode; + @ApiModelProperty("风险类别名称") + private String typeName; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexDto.java new file mode 100644 index 00000000..313a13cb --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexDto.java @@ -0,0 +1,38 @@ +package com.supervise.rms.api.riskindex; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-16-10:11 + */ +@Data +public class RiskIndexDto implements Dto { + private Integer id; + private String sid; + private Date createTime; + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("代码") + private String code; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("指标说明") + private String content; + @ApiModelProperty("风险等级(程度)Sid") + private String levelSid; + @ApiModelProperty("风险等级(程度)代码") + private String levelCode; + @ApiModelProperty("风险等级(程度)名称") + private String levelName; + @ApiModelProperty("风险类别Sid") + private String typeSid; + @ApiModelProperty("风险类别代码") + private String typeCode; + @ApiModelProperty("风险类别名称") + private String typeName; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexQuery.java new file mode 100644 index 00000000..2181b8d5 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexQuery.java @@ -0,0 +1,28 @@ +package com.supervise.rms.api.riskindex; + +import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-16-10:11 + */ +@Data +public class RiskIndexQuery implements Query { + @ApiModelProperty("代码") + private String code; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("风险等级(程度)代码") + private String levelCode; + @ApiModelProperty("风险等级(程度)名称") + private String levelName; + @ApiModelProperty("风险类别代码") + private String typeCode; + @ApiModelProperty("风险类别名称") + private String typeName; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexVo.java new file mode 100644 index 00000000..d028e203 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindex/RiskIndexVo.java @@ -0,0 +1,40 @@ +package com.supervise.rms.api.riskindex; + +import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-16-10:11 + */ +@Data +public class RiskIndexVo implements Vo { + private Integer id; + private String sid; + private Date createTime; + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("代码") + private String code; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("指标说明") + private String content; + @ApiModelProperty("风险等级(程度)Sid") + private String levelSid; + @ApiModelProperty("风险等级(程度)代码") + private String levelCode; + @ApiModelProperty("风险等级(程度)名称") + private String levelName; + @ApiModelProperty("风险类别Sid") + private String typeSid; + @ApiModelProperty("风险类别代码") + private String typeCode; + @ApiModelProperty("风险类别名称") + private String typeName; + private String bigTypeName; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java index 99c04223..2b985bcd 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsQuery.java @@ -32,4 +32,5 @@ public class RiskIndicatorsQuery implements Query { private String typeCode; @ApiModelProperty("风险类别名称") private String typeName; + private String bigTypeName; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java index 3ae7379a..c26c8b9f 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author feikefei * @create 2023-06-16-10:16 @@ -35,4 +37,5 @@ public class RiskIndicatorsVo implements Vo { @ApiModelProperty("风险类别名称") private String typeName; private String bigTypeName; + private List list; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.java new file mode 100644 index 00000000..b54b6ca5 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.java @@ -0,0 +1,19 @@ +package com.supervise.rms.biz.riskindex; + +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.riskindex.RiskIndex; +import com.supervise.rms.api.riskindex.RiskIndexVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author feikefei + * @create 2023-06-16-10:19 + */ +@Mapper +public interface RiskIndexMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.xml new file mode 100644 index 00000000..c64ed38c --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexMapper.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexRest.java new file mode 100644 index 00000000..7c58fdea --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexRest.java @@ -0,0 +1,47 @@ +package com.supervise.rms.biz.riskindex; + +import com.supervise.rms.api.riskindex.RiskIndexDto; +import com.supervise.rms.api.riskindex.RiskIndexQuery; +import com.supervise.rms.api.riskindex.RiskIndexVo; +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-16-10:18 + */ +@Api(tags = "监控指标表") +@RestController("com.supervise.rmc.biz.riskindex.RiskIndexRest") +@RequestMapping("v1/riskIndex") +public class RiskIndexRest { + + @Autowired + private RiskIndexService riskIndicatorService; + + @ApiOperation("保存监控指标") + @PostMapping("/saveRiskIndex") + public ResultBean saveRiskIndex(@RequestBody RiskIndexDto dto) { + return riskIndicatorService.saveRiskIndex(dto); + } + + @ApiOperation("查询监控指标分页列表") + @PostMapping("/listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo listPage = riskIndicatorService.listPage(pq); + return rb.success().setData(listPage); + } + + @ApiOperation("删除监控指标") + @GetMapping("/del/{sid}") + public ResultBean del(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + riskIndicatorService.deleteBySid(sid); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexService.java new file mode 100644 index 00000000..23b4ba35 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindex/RiskIndexService.java @@ -0,0 +1,67 @@ +package com.supervise.rms.biz.riskindex; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.supervise.rms.api.riskindex.RiskIndex; +import com.supervise.rms.api.riskindex.RiskIndexDto; +import com.supervise.rms.api.riskindex.RiskIndexQuery; +import com.supervise.rms.api.riskindex.RiskIndexVo; +import com.supervise.rms.api.riskindicators.RiskIndicators; +import com.supervise.rms.api.riskindicators.RiskIndicatorsDto; +import com.supervise.rms.api.riskindicators.RiskIndicatorsQuery; +import com.supervise.rms.api.riskindicators.RiskIndicatorsVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +/** + * @author feikefei + * @create 2023-06-16-10:18 + */ +@Service +public class RiskIndexService extends MybatisBaseService { + + public ResultBean saveRiskIndex(RiskIndexDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if(StringUtils.isBlank(sid)){ + //新增 + RiskIndex riskIndex = new RiskIndex(); + BeanUtils.copyProperties(dto, riskIndex,"sid"); + boolean isSave = save(riskIndex); + if(!isSave){ + return rb.setMsg("保存失败"); + } + sid = riskIndex.getSid(); + }else{ + //更新 + RiskIndex riskIndex = fetchBySid(dto.getSid()); + if(riskIndex == null){ + return rb.setMsg("该条记录不存在"); + } + BeanUtils.copyProperties(dto, riskIndex); + boolean isUpdate = updateById(riskIndex); + if(!isUpdate){ + return rb.setMsg("更新失败"); + } + } + return rb.success().setData(sid).setMsg("保存成功"); + } + + public PagerVo listPage(PagerQuery pq){ + RiskIndexQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (StringUtils.isNotNull(params)){ + + } + IPage page = PagerUtil.queryToPage(pq); + IPage iPage = baseMapper.listPage(page, wq); + PagerVo pageToVo = PagerUtil.pageToVo(iPage, null); + return pageToVo; + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java index cd6c25c6..9dab41ce 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java @@ -15,6 +15,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * @author feikefei * @create 2023-06-16-10:18 @@ -53,10 +56,26 @@ public class RiskIndicatorsService extends MybatisBaseService wq = new QueryWrapper<>(); if (StringUtils.isNotNull(params)){ - + if (!StringUtils.isBlank(params.getName())){ + wq.eq("i.name",params.getName()); + } + if (!StringUtils.isBlank(params.getLevelName())){ + wq.eq("i.levelName",params.getLevelName()); + } + if (!StringUtils.isBlank(params.getTypeName())){ + wq.eq("i.typeName",params.getTypeName()); + } + if (!StringUtils.isBlank(params.getBigTypeName())){ + wq.eq("t.name",params.getBigTypeName()); + } } IPage page = PagerUtil.queryToPage(pq); IPage iPage = baseMapper.listPage(page, wq); + List records = iPage.getRecords(); + for (RiskIndicatorsVo record : records) { + List objects = new ArrayList<>(); + record.setList(objects); + } PagerVo pageToVo = PagerUtil.pageToVo(iPage, null); return pageToVo; }