From 4afb6f0a5e2db322b56ac419be185befbc685710 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Tue, 20 Jun 2023 18:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E6=8A=A5=E8=AD=A6=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E6=8A=A5=E8=AD=A6=E5=A4=84=E7=90=866-20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rms/api/riskalarm/RiskAlarm.java | 71 ++++++++++++++++++ .../rms/api/riskalarm/RiskAlarmDto.java | 64 ++++++++++++++++ .../rms/api/riskalarm/RiskAlarmFeign.java | 17 +++++ .../rms/api/riskalarm/RiskAlarmQuery.java | 21 ++++++ .../rms/api/riskalarm/RiskAlarmVo.java | 64 ++++++++++++++++ .../RiskAlarmTreatment.java | 40 ++++++++++ .../RiskAlarmTreatmentDto.java | 32 ++++++++ .../RiskAlarmTreatmentQuery.java | 13 ++++ .../RiskAlarmTreatmentVo.java | 42 +++++++++++ .../rms/biz/riskalarm/RiskAlarmMapper.java | 19 +++++ .../rms/biz/riskalarm/RiskAlarmMapper.xml | 11 +++ .../rms/biz/riskalarm/RiskAlarmRest.java | 44 +++++++++++ .../rms/biz/riskalarm/RiskAlarmService.java | 53 +++++++++++++ .../RiskAlarmTreatmentMapper.java | 23 ++++++ .../RiskAlarmTreatmentMapper.xml | 11 +++ .../RiskAlarmTreatmentRest.java | 43 +++++++++++ .../RiskAlarmTreatmentService.java | 74 +++++++++++++++++++ 17 files changed, 642 insertions(+) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmDto.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmQuery.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatment.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentDto.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentQuery.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.xml create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentRest.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentService.java diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java new file mode 100644 index 00000000..4252dc89 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java @@ -0,0 +1,71 @@ +package com.supervise.rms.api.riskalarm; + +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-19-11:28 + */ +@Data +@ApiModel(value = "风险报警表") +@TableName("risk_alarm") +public class RiskAlarm { + @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("客户Sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("风险处于位置1.主体2.供应商3.仓库4.门店") + private Integer positionCode; + @ApiModelProperty("风险处于位置Sid") + private String positionSid; + @ApiModelProperty("风险处于位置名称") + private String positionName; + @ApiModelProperty("风险触发时间") + private Date triggerTime; + @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结") + private Integer treatmentStatus; + @ApiModelProperty("风险处理时间") + private Date treatmentTime; + @ApiModelProperty("风险处理内容") + private String treatmentContent; + @ApiModelProperty("风险消除程度0.未消除1.已消除") + private Integer eliminationStatus; + @ApiModelProperty("风险消除时间") + private Date eliminationTime; + @ApiModelProperty("风险消除内容") + private String eliminationContent; + @ApiModelProperty("风险指标Sid") + private String indicatorSid; + @ApiModelProperty("风险指标代码") + private String indicatorCode; + @ApiModelProperty("风险指标名称") + private String indicatorName; + @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/riskalarm/RiskAlarmDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmDto.java new file mode 100644 index 00000000..038e8443 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmDto.java @@ -0,0 +1,64 @@ +package com.supervise.rms.api.riskalarm; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-19-11:34 + */ +@Data +public class RiskAlarmDto implements Dto { + private Integer id ; + private String sid; + + + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("风险处于位置1.主体2.供应商3.仓库4.门店") + private Integer positionCode; + @ApiModelProperty("风险处于位置Sid") + private String positionSid; + @ApiModelProperty("风险处于位置名称") + private String positionName; + @ApiModelProperty("风险触发时间") + private Date triggerTime; + @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结") + private Integer treatmentStatus; + @ApiModelProperty("风险处理时间") + private Date treatmentTime; + @ApiModelProperty("风险处理内容") + private String treatmentContent; + @ApiModelProperty("风险消除程度0.未消除1.已消除") + private Integer eliminationStatus; + @ApiModelProperty("风险消除时间") + private Date eliminationTime; + @ApiModelProperty("风险消除内容") + private String eliminationContent; + @ApiModelProperty("风险指标Sid") + private String indicatorSid; + @ApiModelProperty("风险指标代码") + private String indicatorCode; + @ApiModelProperty("风险指标名称") + private String indicatorName; + @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/riskalarm/RiskAlarmFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmFeign.java new file mode 100644 index 00000000..46281f16 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmFeign.java @@ -0,0 +1,17 @@ +package com.supervise.rms.api.riskalarm; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author feikefei + * @create 2023-06-20-17:30 + */ +@Api("风险报警中心表") +@FeignClient( + contextId = "supervise-rms-riskAlarm", + name = "supervise-rms", + path = "v1/riskAlarm" +) +public interface RiskAlarmFeign { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmQuery.java new file mode 100644 index 00000000..787ff938 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmQuery.java @@ -0,0 +1,21 @@ +package com.supervise.rms.api.riskalarm; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-19-11:36 + */ +@Data +public class RiskAlarmQuery implements Query { + @ApiModelProperty("风险类别名称") + private String typeName; + @ApiModelProperty("风险指标名称") + private String indicatorName; + private Date fromTime; + private Date toTime; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java new file mode 100644 index 00000000..6398fefd --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java @@ -0,0 +1,64 @@ +package com.supervise.rms.api.riskalarm; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-19-11:38 + */ +@Data +public class RiskAlarmVo implements Vo { + private Integer id ; + private String sid; + private Date createTime; + + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("风险处于位置1.主体2.供应商3.仓库4.门店") + private Integer positionCode; + @ApiModelProperty("风险处于位置Sid") + private String positionSid; + @ApiModelProperty("风险处于位置名称") + private String positionName; + @ApiModelProperty("风险触发时间") + private Date triggerTime; + @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结") + private Integer treatmentStatus; + @ApiModelProperty("风险处理时间") + private Date treatmentTime; + @ApiModelProperty("风险处理内容") + private String treatmentContent; + @ApiModelProperty("风险消除程度0.未消除1.已消除") + private Integer eliminationStatus; + @ApiModelProperty("风险消除时间") + private Date eliminationTime; + @ApiModelProperty("风险消除内容") + private String eliminationContent; + @ApiModelProperty("风险指标Sid") + private String indicatorSid; + @ApiModelProperty("风险指标代码") + private String indicatorCode; + @ApiModelProperty("风险指标名称") + private String indicatorName; + @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/riskalarmtreatment/RiskAlarmTreatment.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatment.java new file mode 100644 index 00000000..86b54aa7 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatment.java @@ -0,0 +1,40 @@ +package com.supervise.rms.api.riskalarmtreatment; + +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; + +/** + * @author feikefei + * @create 2023-06-19-14:23 + */ +@Data +@ApiModel("风险警报-处理记录表") +@TableName("risk_alarm_treatment") +public class RiskAlarmTreatment { + @ApiModelProperty("ID，唯一编号") + private Integer id; + @ApiModelProperty("记录创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime = new Date(); + @ApiModelProperty("备注说明") + private String remarks; + @ApiModelProperty("风险警报记录SID") + private String riskAlarmSid; + @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结") + private Integer treatmentStatus; + @ApiModelProperty("风险处理时间") + private Date treatmentTime; + @ApiModelProperty("风险处理内容") + private String treatmentContent; + @ApiModelProperty("处理人Sid") + private String userSid; + @ApiModelProperty("处理人姓名") + private String userName; + @ApiModelProperty("处理人电话") + private String userPhone; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentDto.java new file mode 100644 index 00000000..bfb58b6f --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentDto.java @@ -0,0 +1,32 @@ +package com.supervise.rms.api.riskalarmtreatment; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-19-14:54 + */ +@Data +public class RiskAlarmTreatmentDto implements Dto { + private Integer id; + @ApiModelProperty("备注说明") + private String remarks; + @ApiModelProperty("风险警报记录SID") + private String riskAlarmSid; + @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结") + private Integer treatmentStatus; + @ApiModelProperty("风险处理时间") + private Date treatmentTime; + @ApiModelProperty("风险处理内容") + private String treatmentContent; + @ApiModelProperty("处理人Sid") + private String userSid; + @ApiModelProperty("处理人姓名") + private String userName; + @ApiModelProperty("处理人电话") + private String userPhone; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentQuery.java new file mode 100644 index 00000000..b1f385db --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentQuery.java @@ -0,0 +1,13 @@ +package com.supervise.rms.api.riskalarmtreatment; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-06-19-14:55 + */ +@Data +public class RiskAlarmTreatmentQuery implements Query { + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentVo.java new file mode 100644 index 00000000..368e2d5a --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarmtreatment/RiskAlarmTreatmentVo.java @@ -0,0 +1,42 @@ +package com.supervise.rms.api.riskalarmtreatment; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-19-14:56 + */ +@Data +public class RiskAlarmTreatmentVo implements Vo { + @ApiModelProperty("ID，唯一编号") + private Integer id; + @ApiModelProperty("记录创建时间") + private Date createTime; + @ApiModelProperty("备注说明") + private String remarks; + @ApiModelProperty("风险警报记录SID") + private String riskAlarmSid; + @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结") + private Integer treatmentStatus; + @ApiModelProperty("风险处理时间") + private Date treatmentTime; + @ApiModelProperty("风险处理内容") + private String treatmentContent; + @ApiModelProperty("处理人Sid") + private String userSid; + @ApiModelProperty("处理人姓名") + private String userName; + @ApiModelProperty("处理人电话") + private String userPhone; + + private String positionName; + private String triggerTime; + private String indicatorName; + private String levelName; + private String typeName; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java new file mode 100644 index 00000000..3e70df1a --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java @@ -0,0 +1,19 @@ +package com.supervise.rms.biz.riskalarm; + +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.riskalarm.RiskAlarm; +import com.supervise.rms.api.riskalarm.RiskAlarmVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author feikefei + * @create 2023-06-19-11:42 + */ +@Mapper +public interface RiskAlarmMapper 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/riskalarm/RiskAlarmMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml new file mode 100644 index 00000000..e8f8553f --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java new file mode 100644 index 00000000..60db5ce6 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java @@ -0,0 +1,44 @@ +package com.supervise.rms.biz.riskalarm; + +import com.supervise.rms.api.riskalarm.RiskAlarmDto; +import com.supervise.rms.api.riskalarm.RiskAlarmFeign; +import com.supervise.rms.api.riskalarm.RiskAlarmQuery; +import com.supervise.rms.api.riskalarm.RiskAlarmVo; +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author feikefei + * @create 2023-06-19-11:40 + */ +@Api(tags = "风险报警表") +@RestController("com.supervise.rmc.biz.riskalarm.RiskAlarmRest") +@RequestMapping("v1/riskAlarm") +public class RiskAlarmRest implements RiskAlarmFeign { + + @Autowired + private RiskAlarmService riskAlarmService; + + @ApiOperation("分页查询") + @PostMapping("/listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pagerVo = riskAlarmService.listPage(pq); + return rb.success().setData(pagerVo); + } + + @ApiOperation("增加报警数据") + @PostMapping("/saveRiskAlarm") + public ResultBean saveRiskAlarm(@RequestBody RiskAlarmDto dto){ + return riskAlarmService.saveRiskAlarm(dto); + } + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java new file mode 100644 index 00000000..4e6c6b17 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java @@ -0,0 +1,53 @@ +package com.supervise.rms.biz.riskalarm; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; +import com.supervise.rms.api.riskalarm.RiskAlarm; +import com.supervise.rms.api.riskalarm.RiskAlarmDto; +import com.supervise.rms.api.riskalarm.RiskAlarmQuery; +import com.supervise.rms.api.riskalarm.RiskAlarmVo; +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.stereotype.Service; + +/** + * @author feikefei + * @create 2023-06-19-11:42 + */ +@Service +public class RiskAlarmService extends MybatisBaseService { + + public PagerVo listPage(PagerQuery pq){ + RiskAlarmQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (params != null){ + if (StringUtils.isBlank(params.getIndicatorName())){ + + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage page1 = baseMapper.listPage(page, wq); + PagerVo vo = PagerUtil.pageToVo(page1, null); + return vo; + } + + public ResultBean saveRiskAlarm(RiskAlarmDto dto){ + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(dto.getSid())){ + RiskAlarm riskAlarm = new RiskAlarm(); + BeanUtil.copyProperties(dto,riskAlarm); + baseMapper.insert(riskAlarm); + }else { + RiskAlarm riskAlarm = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto,riskAlarm,"sid","id"); + baseMapper.updateById(riskAlarm); + } + return rb.success().setMsg("更新成功"); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.java new file mode 100644 index 00000000..c7fd03e2 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.java @@ -0,0 +1,23 @@ +package com.supervise.rms.biz.riskalarmtreatment; + +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.riskalarmtreatment.RiskAlarmTreatment; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author feikefei + * @create 2023-06-19-15:11 + */ +@Mapper +public interface RiskAlarmTreatmentMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from risk_alarm_treatment where riskAlarmSid = #{riskAlarmSid}") + RiskAlarmTreatment selectRiskAlarmTreatmentByRiskAlarmSid(@Param("riskAlarmSid") String riskAlarmSid); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.xml new file mode 100644 index 00000000..8bf0e666 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentMapper.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentRest.java new file mode 100644 index 00000000..69b1273f --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentRest.java @@ -0,0 +1,43 @@ +package com.supervise.rms.biz.riskalarmtreatment; + +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentDto; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentQuery; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentVo; +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author feikefei + * @create 2023-06-19-14:57 + */ +@Api(tags = "风险警报-处理记录") +@RestController("com.supervise.rmc.biz.riskalarmtreatment.RiskAlarmTreatmentRest") +@RequestMapping("v1/riskAlarmTreatment") +public class RiskAlarmTreatmentRest { + + @Autowired + private RiskAlarmTreatmentService riskAlarmTreatmentService; + + @ApiOperation("添加警报处理记录") + @PostMapping("/saveRiskAlarmTreatment") + public ResultBean saveRiskAlarmTreatment(@RequestBody RiskAlarmTreatmentDto dto){ + return riskAlarmTreatmentService.saveRiskAlarmTreatment(dto); + } + + @ApiOperation("查询报警处理记录") + @PostMapping("/listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo vo = riskAlarmTreatmentService.listPage(pq); + return rb.success().setData(vo); + } + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentService.java new file mode 100644 index 00000000..6d927d83 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarmtreatment/RiskAlarmTreatmentService.java @@ -0,0 +1,74 @@ +package com.supervise.rms.biz.riskalarmtreatment; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.supervise.rms.api.riskalarm.RiskAlarmDto; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatment; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentDto; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentQuery; +import com.supervise.rms.api.riskalarmtreatment.RiskAlarmTreatmentVo; +import com.supervise.rms.biz.riskalarm.RiskAlarmService; +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.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-06-19-15:11 + */ +@Service +public class RiskAlarmTreatmentService extends MybatisBaseService { + + @Autowired + private RiskAlarmService riskAlarmService; + + public ResultBean saveRiskAlarmTreatment(RiskAlarmTreatmentDto dto){ + ResultBean rb = ResultBean.fireFail(); + RiskAlarmTreatment riskAlarmTreatment1 = baseMapper.selectRiskAlarmTreatmentByRiskAlarmSid(dto.getRiskAlarmSid()); + if (riskAlarmTreatment1 != null){ + BeanUtil.copyProperties(dto,riskAlarmTreatment1,"id"); + baseMapper.updateById(riskAlarmTreatment1); + RiskAlarmDto riskAlarmDto = new RiskAlarmDto(); + riskAlarmDto.setSid(dto.getRiskAlarmSid()); + riskAlarmDto.setTreatmentTime(new Date()); + riskAlarmDto.setTreatmentStatus(riskAlarmTreatment1.getTreatmentStatus()); + riskAlarmDto.setTreatmentContent(dto.getTreatmentContent()); + riskAlarmService.saveRiskAlarm(riskAlarmDto); + }else { + RiskAlarmTreatment riskAlarmTreatment = new RiskAlarmTreatment(); + BeanUtil.copyProperties(dto,riskAlarmTreatment); + riskAlarmTreatment.setTreatmentStatus(riskAlarmTreatment.getTreatmentStatus()+1); + riskAlarmTreatment.setCreateTime(new Date()); + baseMapper.insert(riskAlarmTreatment); + RiskAlarmDto riskAlarmDto = new RiskAlarmDto(); + riskAlarmDto.setSid(dto.getRiskAlarmSid()); + riskAlarmDto.setTreatmentTime(new Date()); + riskAlarmDto.setTreatmentStatus(riskAlarmTreatment.getTreatmentStatus()); + riskAlarmDto.setTreatmentContent(dto.getTreatmentContent()); + riskAlarmService.saveRiskAlarm(riskAlarmDto); + } + + return rb.success().setMsg("添加成功"); + } + + public PagerVo listPage(PagerQuery pq){ + RiskAlarmTreatmentQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (params != null){ + + } + IPage page = PagerUtil.queryToPage(pq); + IPage page1 = baseMapper.listPage(page, wq); + PagerVo objectPagerVo = PagerUtil.pageToVo(page1, null); + return objectPagerVo; + } +}