diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java index 828e1b4..82c31ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenManageController.java @@ -1,6 +1,8 @@ package com.ruoyi.screen.controller; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.screen.domain.response.ZongzhiActionResponse; +import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; import com.ruoyi.screen.service.ZongzhiScreenManageService; import io.swagger.annotations.Api; @@ -36,4 +38,25 @@ public class ZongzhiScreenManageController { + /** + * 举报总数 处置率 + */ + @ApiOperation(value = "举报总数和处置率", response = ZongzhiNetworkReportResponse.class) + @GetMapping("/networkreport") + private AjaxResult getNetworkReport() { + + return AjaxResult.success(zongzhiScreenManageService.getNetworkReport()); + } + + + /** + * 请朗专项行动数据统计 + */ + @ApiOperation(value = "请朗专项行动数据统计", response = ZongzhiActionResponse.class) + @GetMapping("/action") + private AjaxResult getaction() { + + return AjaxResult.success(zongzhiScreenManageService.getaction()); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java new file mode 100644 index 0000000..41c3a50 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiActionResponse.java @@ -0,0 +1,23 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 大屏数据请朗专项行动数据统计响应类 + */ +@Data +@ApiModel("大屏数据请朗专项行动数据统计响应类") +public class ZongzhiActionResponse { + + + @ApiModelProperty(value = "数量") + private Integer count; + + + @ApiModelProperty(value = "攻击源IP地址区域") + private String attackIpRegion; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoSystemResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoSystemResponse.java new file mode 100644 index 0000000..2827059 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoSystemResponse.java @@ -0,0 +1,24 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 等保系统响应类 + */ +@Data +@ApiModel("等保系统响应类") +public class ZongzhiDengbaoSystemResponse { + /** + * 等保系统名称 + */ + @ApiModelProperty(value = "等保系统名称") + private String name; + + /** + * 等保系统数量 + */ + @ApiModelProperty(value = "等保系统数量") + private int count; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java new file mode 100644 index 0000000..3564849 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiDengbaoUnitResponse.java @@ -0,0 +1,27 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 等保单位响应类 + */ +@Data +@ApiModel("等保单位响应类") +public class ZongzhiDengbaoUnitResponse { + + + /** + * 等保单位名称 + */ + @ApiModelProperty(value = "等保单位名称") + private String name1; + + /** + * 等保单位数量 + */ + @ApiModelProperty(value = "等保单位数量") + private int count1; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java new file mode 100644 index 0000000..303e139 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiIdcResponse.java @@ -0,0 +1,27 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * IDC响应类 + */ +@Data +@ApiModel("IDC响应类") +public class ZongzhiIdcResponse { + + + /** + * IDC单位名称 + */ + @ApiModelProperty(value = "IDC单位名称") + private String name3; + + /** + * IDC单位数量 + */ + @ApiModelProperty(value = "IDC单位数量") + private int count3; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNetworkReportResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNetworkReportResponse.java new file mode 100644 index 0000000..7a4525e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiNetworkReportResponse.java @@ -0,0 +1,23 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 大屏数据举报总数和处置率响应类 + */ +@Data +@ApiModel("大屏数据举报总数和处置率响应类") +public class ZongzhiNetworkReportResponse { + + + @ApiModelProperty(value = "举报总数") + private Integer count; + + + @ApiModelProperty(value = "处置率") + private Double handle; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java index 6034c1c..7b3171c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSuperviseResponse.java @@ -11,55 +11,32 @@ import lombok.Data; @ApiModel("安全检测监管对象响应类") public class ZongzhiSuperviseResponse { - /** - * 等保系统名称 - */ - @ApiModelProperty(value = "等保系统名称") - private String name; - - /** - * 等保系统数量 - */ - @ApiModelProperty(value = "等保系统数量") - private int count; - /** - * 等保单位名称 + * 等保系统响应类 */ - @ApiModelProperty(value = "等保单位名称") - private String name1; + @ApiModelProperty(value = "等保系统响应类") + private ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse; /** - * 等保单位数量 + * 等保单位响应类 */ - @ApiModelProperty(value = "等保单位数量") - private int count1; + @ApiModelProperty(value = "等保单位响应类") + private ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse; /** - * 政府网站名称 + * 政府网站响应类 */ - @ApiModelProperty(value = "政府网站名称") - private String name2; - - /** - * 政府网站数量 - */ - @ApiModelProperty(value = "政府网站数量") - private int count2; + @ApiModelProperty(value = "政府网站响应类") + private ZongzhiZhengfuResponse zongzhiZhengfuResponse; - /** - * IDC单位名称 - */ - @ApiModelProperty(value = "IDC单位名称") - private String name3; /** - * IDC单位数量 + * IDC响应类 */ - @ApiModelProperty(value = "IDC单位数量") - private int count3; + @ApiModelProperty(value = "IDC响应类") + private ZongzhiIdcResponse zongzhiIdcResponse; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java new file mode 100644 index 0000000..2abb802 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiZhengfuResponse.java @@ -0,0 +1,26 @@ +package com.ruoyi.screen.domain.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 政府网站响应类 + */ +@Data +@ApiModel("政府网站响应类") +public class ZongzhiZhengfuResponse { + + /** + * 政府网站名称 + */ + @ApiModelProperty(value = "政府网站名称") + private String name2; + + /** + * 政府网站数量 + */ + @ApiModelProperty(value = "政府网站数量") + private int count2; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java index db3fd17..e764e27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/mapper/ZongzhiScreenManageMapper.java @@ -1,5 +1,7 @@ package com.ruoyi.screen.mapper; +import com.ruoyi.screen.domain.response.ZongzhiActionResponse; +import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; import java.util.List; @@ -17,4 +19,16 @@ public interface ZongzhiScreenManageMapper { + /** + * 举报总数和处置率 + */ + public ZongzhiNetworkReportResponse getNetworkReport(); + + + + /** + * 请朗专项行动数据统计 + */ + public List getaction(); + } 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 c6c371d..ac7d024 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 @@ -29,12 +29,27 @@ public interface ZongzhiScreenSaftyMapper { */ public List getSafetyList(); + /** + * 等保系统 + */ + public ZongzhiDengbaoSystemResponse getDengbaoSystem(); + + + /** + * 等保单位 + */ + public ZongzhiDengbaoUnitResponse getDengbaoUnit(); + /** - * 安全检测监管对象 + * 政府网站 */ - public ZongzhiSuperviseResponse getsupervise(); + public ZongzhiZhengfuResponse getZhengfu(); + /** + * idc + */ + public ZongzhiIdcResponse getIdc(); /** * 各地区攻击次数 @@ -60,7 +75,6 @@ public interface ZongzhiScreenSaftyMapper { public List getHazardDisposal(); - /** * 隐患处置最新隐患 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java index c359bbe..376c34f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/ZongzhiScreenManageService.java @@ -1,5 +1,7 @@ package com.ruoyi.screen.service; +import com.ruoyi.screen.domain.response.ZongzhiActionResponse; +import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; import java.util.List; @@ -17,4 +19,16 @@ public interface ZongzhiScreenManageService { + /** + * 举报总数和处置率 + */ + public ZongzhiNetworkReportResponse getNetworkReport(); + + + + + /** + * 请朗专项行动数据统计 + */ + public List getaction(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java index 66c143d..591db8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/service/impl/ZongzhiScreenManageServiceImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.screen.service.impl; +import com.ruoyi.screen.domain.response.ZongzhiActionResponse; +import com.ruoyi.screen.domain.response.ZongzhiNetworkReportResponse; import com.ruoyi.screen.domain.response.ZongzhiWorkDynamicsResponse; import com.ruoyi.screen.mapper.ZongzhiScreenManageMapper; import com.ruoyi.screen.service.ZongzhiScreenManageService; @@ -22,5 +24,15 @@ public class ZongzhiScreenManageServiceImpl implements ZongzhiScreenManageServi return zongzhiScreenManageMapper.getWorkDynamics(); } + @Override + public ZongzhiNetworkReportResponse getNetworkReport() { + return zongzhiScreenManageMapper.getNetworkReport(); + } + + @Override + public List getaction() { + return zongzhiScreenManageMapper.getaction(); + } + } 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 d441ca3..01e69ea 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 @@ -15,6 +15,7 @@ import java.util.List; public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService { @Autowired private ZongzhiScreenSaftyMapper zongzhiScreenSaftyMapper; + @Override public List getSource() { return zongzhiScreenSaftyMapper.getSource(); @@ -32,7 +33,20 @@ public class ZongzhiScreenSaftyServiceImpl implements ZongzhiScreenSaftyService @Override public ZongzhiSuperviseResponse getsupervise() { - return zongzhiScreenSaftyMapper.getsupervise(); + ZongzhiSuperviseResponse zongzhiSuperviseResponse = new ZongzhiSuperviseResponse(); + //等保系统 + ZongzhiDengbaoSystemResponse zongzhiDengbaoSystemResponse = zongzhiScreenSaftyMapper.getDengbaoSystem(); + //等保单位 + ZongzhiDengbaoUnitResponse zongzhiDengbaoUnitResponse=zongzhiScreenSaftyMapper.getDengbaoUnit(); + //政府网站 + ZongzhiZhengfuResponse zongzhiZhengfuResponse=zongzhiScreenSaftyMapper.getZhengfu(); + //idc单位 + ZongzhiIdcResponse zongzhiIdcResponse=zongzhiScreenSaftyMapper.getIdc(); + zongzhiSuperviseResponse.setZongzhiDengbaoSystemResponse(zongzhiDengbaoSystemResponse); + zongzhiSuperviseResponse.setZongzhiDengbaoUnitResponse(zongzhiDengbaoUnitResponse); + zongzhiSuperviseResponse.setZongzhiZhengfuResponse(zongzhiZhengfuResponse); + zongzhiSuperviseResponse.setZongzhiIdcResponse(zongzhiIdcResponse); + return zongzhiSuperviseResponse; } @Override diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml index 38b02eb..feff147 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenManageMapper.xml @@ -10,5 +10,13 @@ FROM `tc_work_dongtai` GROUP BY type, materialsName + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml index f61b1f6..111568b 100644 --- a/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/screen/ZongzhiScreenOpinionMapper.xml @@ -12,7 +12,7 @@ GROUP BY sentiment_type - select unit_name as unitName , ip_dns as ipDns, state from tc_safety_danger + + + + \ No newline at end of file