单位接口

spring-cloud/configer/src/main/resources/config/dev/gateway-dev.yml

@@ -88,7 +88,7 @@ filter:
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,\
     /monitoringResources/closeAllRelay,/monitoringResources/getStreamForKaiKang,/SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,\
     /commandTranscription/insertCommandTranscription,/safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,\
-    /hotSearch/getAllHotSearch"
+    /hotSearch/getAllHotSearch,/Office/getAllOffice"
 
   # 不需要过参数过滤器的uri
   parameter:
@@ -102,7 +102,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
     /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/businessSystem/getSystemInfoByShow,\
-    /safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch"
+    /safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch,/Office/getAllOffice"
 
   # 不需要过返回封装过滤器的uri
   response:
@@ -116,7 +116,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
     /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,\
-    /commandTranscription/insertCommandTranscription,/safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch"
+    /commandTranscription/insertCommandTranscription,/safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch,/Office/getAllOffice"
 
   # 登录接口
   login:

spring-cloud/configer/src/main/resources/config/prod/gateway-prod.yml

@@ -87,7 +87,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,\
     /monitoringResources/closeAllRelay,/monitoringResources/getStreamForKaiKang,/SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,\
-    /safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch"
+    /safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch,/Office/getAllOffice"
 
   # 不需要过参数过滤器的uri
   parameter:
@@ -101,7 +101,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
     /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/businessSystem/getSystemInfoByShow,/safetyInfor/analysisWebSafetyInfo,\
-    /safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch"
+    /safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch,/Office/getAllOffice"
 
   # 不需要过返回封装过滤器的uri
   response:
@@ -115,7 +115,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
     /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,/safetyInfor/analysisWebSafetyInfo,\
-    /safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch"
+    /safetyInfor/analysisSafetyStatus,/hotSearch/getAllHotSearch,/Office/getAllOffice"
   # 登录接口
   login:
     skip-uri: /user/userLogin,/flat/guide/login

spring-cloud/server-basic/src/main/java/com/jd/configer/ResourceServerConfig.java

@@ -41,7 +41,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 					,"/OfficeVirus/getOfficeSafetyInfo","/AttackType/getAttackTypeByMonth","/SystemAttacked/getSystemAttackedByInfo","/businessSystem/getSystemInfoByVoiceKeyword"
 					,"/GuaranteeGroup/getAllGuaranteeGroup","/SystemRisk/GetSystemRiskList","/SystemRisk/getSysInfoByOffice","/monitoringResources/getMonitorListByName","/monitoringResources/creatRelay","/monitoringResources/closeAllRelay"
 					,"/monitoringResources/getStreamForKaiKang","/flat/door/personRegister","/flat/sendMessage","/businessSystem/getSystemInfoByShow","/commandTranscription/insertCommandTranscription","/ssoUser/userLogin"
-					,"/safetyInfor/analysisWebSafetyInfo","/safetyInfor/analysisSafetyStatus","/hotSearch/getAllHotSearch"
+					,"/safetyInfor/analysisWebSafetyInfo","/safetyInfor/analysisSafetyStatus","/hotSearch/getAllHotSearch","/Office/getAllOffice"
 					).permitAll().anyRequest()
 			.authenticated()
 		.and()

spring-cloud/server-basic/src/main/java/com/jd/controller/SafetyInforController.java

@@ -110,9 +110,6 @@ public class SafetyInforController {
     @GetMapping("analysisWebSafetyInfo")
     @ApiOperation(value = "查询门户网站安全态势")
     Map<String, Object> analysisWebSafetyInfo(String orgType){
-        if (Blank.isEmpty(orgType)){
-            return SendUtil.send(false, ConstString.REQUEST_WRONGPARAMS);
-        }
         return safetyInfoService.analysisWebSafetyInfo(orgType);
     }
 

spring-cloud/server-basic/src/main/java/com/jd/entity/OtherBusinessSystem.java

@@ -0,0 +1,76 @@
+package com.jd.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ApplicationName: commons
+ * @Title: Role.java
+ * @Package: com.jd.entity
+ * @Description: 业务系统
+ * @author: ll
+ * @date: 2021年10月18日上午9:18:57
+ * @version: V1.0
+ */
+@SuppressWarnings("serial")
+@Data
+@ApiModel("业务系统")
+@Accessors(chain = true)//开启链式操作
+public class OtherBusinessSystem implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 系统ID
+	 */
+	@ApiModelProperty("系统ID")
+	private Integer systemId;
+
+	/**
+	 * 系统名称
+	 */
+	@ApiModelProperty("系统名称")
+	private String systemName;
+
+	/**
+	 * 所属单位
+	 */
+	@ApiModelProperty("所属单位")
+	private Integer officeId;
+
+	/**
+	 * 所属板块
+	 */
+	@ApiModelProperty("所属板块")
+	private Integer orgType;
+
+	/**
+	 * 等保评级
+	 */
+	@ApiModelProperty("等保评级")
+	private String gradeEval;
+
+	/**
+	 * 评级时间
+	 */
+	@ApiModelProperty("评级时间")
+	private Date evalTime;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+
+}

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SystemRiskServiceImpl.java

@@ -5,6 +5,7 @@ import com.jd.code.ConstString;
 import com.jd.entity.SafetyInfo;
 import com.jd.entity.SystemRiskInfo;
 import com.jd.mapper.BusinessSystemMapper;
+import com.jd.mapper.OfficeVirusMapper;
 import com.jd.mapper.SafetyInfoMapper;
 import com.jd.mapper.SystemRiskMapper;
 import com.jd.service.SystemRiskService;
@@ -35,6 +36,9 @@ public class SystemRiskServiceImpl implements SystemRiskService {
     @Autowired
     private SystemRiskMapper systemRiskMapper;
 
+    @Autowired
+    private OfficeVirusMapper officeVirusMapper;
+
     @Override
     public Map<String, Object> getSystemRiskInfo(Map<String, Object> param) {
         Integer count = systemRiskMapper.getCountSystemRiskInfo(param);
@@ -283,6 +287,7 @@ public class SystemRiskServiceImpl implements SystemRiskService {
 
     @Override
     public Map<String, Object> getSysInfoByOffice(Map<String, Object> param) {
+        Map<String, Object> resultMap = new HashMap<>();
         List<Map<String, Object>> resultList = new ArrayList<>();
         //获取当前年月
         Map<String, Object> timeMap = new HashMap<>();
@@ -291,16 +296,32 @@ public class SystemRiskServiceImpl implements SystemRiskService {
         Integer month = (calender.get(Calendar.MONTH)==0?12:calender.get(Calendar.MONTH));
         timeMap.put("createYear", year);
         timeMap.put("createMonth", month);
+        Integer infectedNumber = 0;
+        Integer virusesNumber = 0;
         List<Map<String, Object>> infoList = safetyInfoMapper.getSafetyListByMonth(timeMap);
         for (Map<String, Object> map : infoList) {
             if(Blank.isNotEmpty(map.get("id"))){
+                //系统漏洞列表
                 Integer infoId = Convert.toInt(map.get("id").toString());
                 param.put("infoId", infoId);
                 List<Map<String, Object>> sysInfoList = systemRiskMapper.getSysInfoByOffice(param);
                 resultList.addAll(sysInfoList);
+                //病毒感染台数感染总数
+                List<Map<String, Object>> virusList = officeVirusMapper.getOfficeVirusById(param);
+                for (Map<String, Object> virusMap : virusList) {
+                    if (Blank.isNotEmpty(virusMap.get("infected_number"))){
+                        infectedNumber += Convert.toInt(virusMap.get("infected_number").toString());
+                    }
+                    if (Blank.isNotEmpty(virusMap.get("viruses_Tnumber"))){
+                        virusesNumber += Convert.toInt(virusMap.get("viruses_Tnumber").toString());
+                    }
+                }
             }
         }
-        return SendUtil.send(resultList);
+        resultMap.put("infectedNumber", infectedNumber);
+        resultMap.put("virusesNumber", virusesNumber);
+        resultMap.put("resultList", resultList);
+        return SendUtil.send(resultMap);
     }
 
     @Override

spring-cloud/server-basic/src/main/resources/mapper/OfficeVirusMapper.xml

@@ -52,6 +52,9 @@
         FROM
         office_virus
         <where>
+            <if test="officeId != null and officeId != ''">
+                AND office_id = #{officeId}
+            </if>
             <if test="infoId != null and infoId != ''">
                 AND info_id = #{infoId}
             </if>