From 8270d62984c05258e7064f006cdd5d215e3134a2 Mon Sep 17 00:00:00 2001 From: ASxx <2075995406@qq.com> Date: Wed, 16 Aug 2023 10:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=96=87=E7=AB=A0=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0=E8=AF=84=E4=BB=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZongzhiScreenSaftyController.java | 21 +++++++++++ .../ZongzhiHazardDisposalResponse.java | 37 +++++++++++++++++++ .../response/ZongzhiNotificationResponse.java | 33 +++++++++++++++++ .../mapper/ZongzhiScreenSaftyMapper.java | 13 +++++++ .../service/ZongzhiScreenSaftyService.java | 16 ++++++++ .../impl/ZongzhiScreenSaftyServiceImpl.java | 10 +++++ .../zongzhi/domain/TcNetworkArticle.java | 10 +++++ .../screen/ZongzhiScreenSaftyMapper.xml | 7 ++++ .../mapper/zongzhi/TcNetworkArticleMapper.xml | 5 +++ 9 files changed, 152 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiHazardDisposalResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNotificationResponse.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java index d36e903..492b2a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java @@ -104,4 +104,25 @@ public class ZongzhiScreenSaftyController { + /** + * 隐患处置最新隐患 + */ + @ApiOperation(value = "隐患处置最新隐患", response = ZongzhiHazardDisposalResponse.class) + @GetMapping("/hazarddisposal") + private AjaxResult getHazardDisposal() { + return AjaxResult.success(zongzhiScreenSaftyService.getHazardDisposal()); + } + + + /** + * 隐患处置通报处置 + */ + @ApiOperation(value = "隐患处置通报处置", response = ZongzhiNotificationResponse.class) + @GetMapping("/notification ") + private AjaxResult getNotification() { + return AjaxResult.success(zongzhiScreenSaftyService.getNotification()); + } + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiHazardDisposalResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiHazardDisposalResponse.java new file mode 100644 index 0000000..4020fce --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiHazardDisposalResponse.java @@ -0,0 +1,37 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 隐患处置最新隐患响应类 + */ +@Data +@ApiModel("隐患处置最新隐患响应类") +public class ZongzhiHazardDisposalResponse { + + /** + * 隐患名称 + */ + @ApiModelProperty(value = "隐患名称") + private String riskName; + + /** + *等级1.低级 2.中级 3.高级 + */ + @ApiModelProperty(value = "等级1.低级 2.中级 3.高级") + private Integer level; + + /** + * 单位名称 + */ + @ApiModelProperty(value = "单位名称") + private String unitName; + + /** + *隐患来源1.众测2.态势感知平台3.网信办 + */ + @ApiModelProperty(value = "隐患来源1.众测2.态势感知平台3.网信办") + private Integer riskSource; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNotificationResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNotificationResponse.java new file mode 100644 index 0000000..1d40c09 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNotificationResponse.java @@ -0,0 +1,33 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 隐患处置通报处置响应类 + */ +@Data +@ApiModel("隐患处置通报处置响应类") +public class ZongzhiNotificationResponse { + + + /** + * 单位名称 + */ + @ApiModelProperty(value = "单位名称") + private String unitName; + + /** + *处置情况1.已归档，2.未归档 + */ + @ApiModelProperty(value = "处置情况1.已归档，2.未归档") + private Integer state; + + + /** + *目标IP/域名 + */ + @ApiModelProperty(value = "目标IP/域名") + private String ipDns; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java index 8b1b3b8..c6c371d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenSaftyMapper.java @@ -52,4 +52,17 @@ public interface ZongzhiScreenSaftyMapper { * 安全隐患 */ public List getSafetyHazard(); + + + /** + * 隐患处置最新隐患 + */ + public List getHazardDisposal(); + + + + /** + * 隐患处置最新隐患 + */ + public List getNotification(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java index f78ad10..3557adf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenSaftyService.java @@ -52,4 +52,20 @@ public interface ZongzhiScreenSaftyService { * 安全隐患 */ public List getSafetyHazard(); + + + /** + * 隐患处置最新隐患 + */ + public List getHazardDisposal(); + + + + /** + * 隐患处置通报处置 + */ + public List getNotification(); + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java index 8c0f138..d441ca3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenSaftyServiceImpl.java @@ -49,4 +49,14 @@ public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService public List getSafetyHazard() { return zongzhiScreenSaftyMapper.getSafetyHazard(); } + + @Override + public List getHazardDisposal() { + return zongzhiScreenSaftyMapper.getHazardDisposal(); + } + + @Override + public List getNotification() { + return zongzhiScreenSaftyMapper.getNotification(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java index 82d1198..983344a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java @@ -3,6 +3,7 @@ package com.ruoyi.zongzhi.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.models.auth.In; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -71,6 +72,13 @@ public class TcNetworkArticle extends BaseEntity { @ApiModelProperty(value = "文章地址") private String url; + /** + * 文章评价状态 + */ + @Excel(name = "文章评价状态") + @ApiModelProperty(value = "文章评价状态") + private Integer status; + /** * 创建人ID */ @@ -85,4 +93,6 @@ public class TcNetworkArticle extends BaseEntity { @ApiModelProperty(value = "修改人ID") private Long updateId; + + } diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml index 84c6fc9..e186e02 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenSaftyMapper.xml @@ -48,4 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/zongzhi/TcNetworkArticleMapper.xml b/ruoyi-system/src/main/resources/mapper/zongzhi/TcNetworkArticleMapper.xml index 7f5139b..0c16f99 100644 --- a/ruoyi-system/src/main/resources/mapper/zongzhi/TcNetworkArticleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zongzhi/TcNetworkArticleMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -34,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and release_time = #{releaseTime} and source = #{source} and url = #{url} + and status = #{status} and create_id = #{createId} and update_id = #{updateId} @@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" release_time, source, url, + status, create_id, create_by, create_time, @@ -70,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{releaseTime}, #{source}, #{url}, + #{status}, #{createId}, #{createBy}, #{createTime}, @@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" release_time = #{releaseTime}, source = #{source}, url = #{url}, + status = #{status}, create_id = #{createId}, create_by = #{createBy}, create_time = #{createTime},