Merge branch 'master' of http://116.63.33.55/git/dt2

dh-api/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.5.4</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.jd</groupId>
+    <artifactId>dh-api</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>dh-api</name>
+    <description>Demo project for Spring Boot</description>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version><!-- 使用是请在maven仓库搜索最新版本 -->
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

dh-api/src/main/java/com/jd/dh/DhApiApplication.java

@@ -0,0 +1,13 @@
+package com.jd.dh;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DhApiApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(DhApiApplication.class, args);
+    }
+
+}

dh-api/src/main/java/com/jd/dh/config/StaticConfig.java

@@ -0,0 +1,38 @@
+package com.jd.dh.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 目的: 跨域访问控制
+ *       做前后分离的话，这个也是必配的
+ * 备注说明：
+ */
+@Configuration
+public class StaticConfig implements WebMvcConfigurer {
+
+    private CorsConfiguration buildConfig() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 允许任何域名使用
+        corsConfiguration.addAllowedOriginPattern("*");
+        // 允许任何头
+        corsConfiguration.addAllowedHeader("*");
+        // 允许任何方法（post、get等）
+        corsConfiguration.addAllowedMethod("*");
+        corsConfiguration.setAllowCredentials(true);
+        return corsConfiguration;
+    }
+
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        // 对接口配置跨域设置
+        source.registerCorsConfiguration("/**", buildConfig());
+        return new CorsFilter(source);
+    }
+}

dh-api/src/main/java/com/jd/dh/controller/DhController.java

@@ -0,0 +1,55 @@
+package com.jd.dh.controller;
+
+import com.jd.dh.service.DhService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/dh")
+public class DhController {
+    @Resource
+    private DhService dhService;
+
+    @ApiOperation("根据楼层关键字查询机房平均温湿度")
+    @ApiImplicitParam(name = "keyword", value = "楼层关键字")
+    @GetMapping("/getTemperatureHumidity/{keyword}")
+    public List<Map<String, Object>> getTemperatureHumidity(@PathVariable("keyword") String keyword) {
+        return dhService.getTemperatureHumidity(keyword);
+    }
+
+    @ApiOperation("根据楼层关键字查询机房平均温湿度")
+    @ApiImplicitParam(name = "keyword", value = "楼层关键字")
+    @GetMapping("/getTemperatureHumidityDetails/{keyword}")
+    public List<Map<String, Object>> getTemperatureHumidityDetails(@PathVariable("keyword") String keyword) {
+        return dhService.getTemperatureHumidityDetails(keyword);
+    }
+
+    @ApiOperation("根据楼层关键字查询水浸情况")
+    @ApiImplicitParam(name = "keyword", value = "楼层关键字")
+    @GetMapping("/getWaterImmersion/{keyword}")
+    public List<Map<String, Object>> getWaterImmersion(@PathVariable("keyword") String keyword) {
+        return dhService.getWaterImmersion(keyword);
+    }
+
+    @ApiOperation("根据楼层关键字查询监控类型统计")
+    @ApiImplicitParam(name = "keyword", value = "楼层关键字")
+    @GetMapping("/getMonitorClassificationStatistics/{keyword}")
+    public List<Map<String, Object>> getMonitorClassificationStatistics(@PathVariable("keyword") String keyword) {
+        return dhService.getMonitorClassificationStatistics(keyword);
+    }
+
+    @ApiOperation("根据楼层关键字查询消防模块")
+    @ApiImplicitParam(name = "keyword", value = "楼层关键字")
+    @GetMapping("/getFireControl/{keyword}")
+    public List<Map<String, Object>> getFireControl(@PathVariable("keyword") String keyword) {
+        return dhService.getFireControl(keyword);
+    }
+}

dh-api/src/main/java/com/jd/dh/mapper/DhMapper.java

@@ -0,0 +1,57 @@
+package com.jd.dh.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DhMapper {
+
+    /**
+     *
+     * 根据楼层关键字查询机房平均温湿度
+     * @param keyword
+     * @return
+     */
+    @Select("SELECT * FROM computer_room_temperature_humidity WHERE lou LIKE CONCAT(#{keyword},'%')")
+    List<Map<String, Object>> getTemperatureHumidity(@Param("keyword") String keyword);
+
+    /**
+     *
+     * 根据楼层关键字查询机房温湿度详情
+     * @param keyword
+     * @return
+     */
+    @Select("SELECT * FROM computer_room_temperature_humidity_details WHERE devicename LIKE CONCAT(#{keyword},'%')")
+    List<Map<String, Object>> getTemperatureHumidityDetails(@Param("keyword") String keyword);
+
+    /**
+     *
+     * 根据楼层关键字查询水浸情况
+     * @param keyword
+     * @return
+     */
+    @Select("SELECT * FROM computer_room_water_immersion WHERE devicename LIKE CONCAT(#{keyword},'%')")
+    List<Map<String, Object>> getWaterImmersion(@Param("keyword") String keyword);
+
+    /**
+     *
+     * 根据楼层关键字查询监控类型统计
+     * @param keyword
+     * @return
+     */
+    @Select("SELECT * FROM monitor_classification_statistics WHERE lou LIKE CONCAT(#{keyword},'%')")
+    List<Map<String, Object>> getMonitorClassificationStatistics(@Param("keyword") String keyword);
+
+    /**
+     *
+     * 根据楼层关键字查询监控类型统计
+     * @param keyword
+     * @return
+     */
+    @Select("SELECT * FROM computer_room_fire_control WHERE devicename LIKE CONCAT(#{keyword},'%')")
+    List<Map<String, Object>> getFireControl(@Param("keyword") String keyword);
+}

dh-api/src/main/java/com/jd/dh/service/DhService.java

@@ -0,0 +1,34 @@
+package com.jd.dh.service;
+
+import com.jd.dh.mapper.DhMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class DhService {
+    @Resource
+    private DhMapper dhMapper;
+
+    public List<Map<String, Object>> getTemperatureHumidity(String keyword) {
+        return dhMapper.getTemperatureHumidity(keyword);
+    }
+
+    public List<Map<String, Object>> getTemperatureHumidityDetails(String keyword) {
+        return dhMapper.getTemperatureHumidityDetails(keyword);
+    }
+
+    public List<Map<String, Object>> getWaterImmersion(String keyword) {
+        return dhMapper.getWaterImmersion(keyword);
+    }
+
+    public List<Map<String, Object>> getMonitorClassificationStatistics(String keyword) {
+        return dhMapper.getMonitorClassificationStatistics(keyword);
+    }
+
+    public List<Map<String, Object>> getFireControl(String keyword) {
+        return dhMapper.getFireControl(keyword);
+    }
+}

dh-api/src/main/resources/application.yaml

@@ -0,0 +1,9 @@
+server:
+  port: 18081
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://23.37.100.33:3306/jddb?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    username: root
+    password: root

spring-cloud/server-basic/pom.xml

@@ -104,13 +104,12 @@
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
 		</dependency>
-		
-        <dependency>
-            <groupId>it.sauronsoftware</groupId>
-            <artifactId>jave</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-		
+
+		<dependency>
+			<groupId>it.sauronsoftware</groupId>
+			<artifactId>jave</artifactId>
+			<version>1.0.2</version>
+		</dependency>
 
 	</dependencies>
 
@@ -120,10 +119,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId>
 				<configuration> <archive> <manifest> <addClasspath>true</addClasspath> <classpathPrefix>lib/</classpathPrefix> 
 				<mainClass>com.jd.ServerBasicApplication</mainClass> </manifest> </archive> 
-				</configuration> </plugin> -->
+				</configuration> </plugin>-->
 			<!-- 添加配置跳过测试 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

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

@@ -60,9 +60,12 @@ public class OtherBusinessSystemController {
 
     @GetMapping("getAllOtherSystem")
     @ApiOperation(value = "分页查询单位")
-    public Map<String, Object> getAllOtherSystem() {
-        return otherBusinessSystemService.getAllOtherSystem();
+    public Map<String, Object> getAllOtherSystem(String orgType) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("orgType", orgType);
+        return otherBusinessSystemService.getAllOtherSystem(map);
     }
+
     /**
      * 插入攻击类型
      * @param request

spring-cloud/server-basic/src/main/java/com/jd/mapper/OtherBusinessSystemMapper.java

@@ -33,7 +33,7 @@ public interface OtherBusinessSystemMapper {
      * 查询所有单位方法
      * @return
      */
-    List<Map<String, Object>> getAllOtherSystem();
+    List<Map<String, Object>> getAllOtherSystem(Map<String, Object> param);
 
     /**
      * 通过NMAE查询单位数量

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

@@ -31,7 +31,7 @@ public interface OtherBusinessSystemService {
      * 获取所有单位
      * @return
      */
-    Map<String, Object> getAllOtherSystem();
+    Map<String, Object> getAllOtherSystem(Map<String, Object> param);
 
     /**
      * 新增单位

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

@@ -45,8 +45,8 @@ public class OtherBusinessSystemServiceImpl implements OtherBusinessSystemServic
     }
 
     @Override
-    public Map<String, Object> getAllOtherSystem() {
-        return SendUtil.send(otherBusinessSystemMapper.getAllOtherSystem());
+    public Map<String, Object> getAllOtherSystem(Map<String, Object> param) {
+        return SendUtil.send(true, null, otherBusinessSystemMapper.getAllOtherSystem(param));
     }
 
     @Override

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

@@ -146,7 +146,7 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
         String month = "";
         //获取数据库中的数据显示时间
         List<Map<String, Object>> basicTimeList = basicDataMapper.getAllBasicDataByType("SAFETY_TIME");
-        if(Blank.isNotEmpty(basicTimeList)){
+       if(Blank.isNotEmpty(basicTimeList)){
             Map<String, Object> basicTime = basicTimeList.get(0);
             String showTime = basicTime.get("data_value").toString();
             String[] timeList = showTime.split("-");
@@ -342,9 +342,8 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
         apiUrl.setUrlPrefix("https://23.37.0.200");
         apiUrl.setUrlApi("/api/security/incident/overview");
         apiUrl.setUrlMethod("GET");
-        apiUrl.setUrlParamType(1);
-        String params = "{\"keyword\":\"\",\"startTime\":\"2022-05-01 00:00:00\"," +
-                "\"endTime\":\"2022-05-30 17:05:00\"}";
+        apiUrl.setUrlParamType(2);
+        String params = "{\"keyword\":\"\",\"startTime\":\"2022-05-25+00:00:00\",\"endTime\":\"2022-05-30+17:05:00\",\"threatSeverity\":\"\"}";
         //通过threeAPI调用第三方接口
         //Map<String, Object> apiMap = threeApiClient.sendApiUrlAndParam(urlCode, params);
         String apiString = sendHttpRequest(apiUrl, params);

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

@@ -80,10 +80,10 @@ public class SystemRiskServiceImpl implements SystemRiskService {
         Map<String, Object> safetyInfo = safetyInfoMapper.getSafetyInfoByMonth(timeMap);
         //准备返回参数
         if(Blank.isEmpty(safetyInfo)){
-            return SendUtil.send(false);
+            return SendUtil.send(false, "无安全数据信息");
         }
         if(Blank.isEmpty(safetyInfo.get("high_risk_number")) || Blank.isEmpty(safetyInfo.get("middle_risk_number"))){
-            return SendUtil.send(false);
+            return SendUtil.send(false, "无高中危漏洞信息");
         }
         //高危漏洞数
         Integer countHighRisk = Convert.toInt(safetyInfo.get("high_risk_number").toString());
@@ -107,36 +107,36 @@ public class SystemRiskServiceImpl implements SystemRiskService {
                 infoId = Integer.parseInt(safetyMap.get("id").toString());
             }catch (Exception e){
                 e.printStackTrace();
-                return SendUtil.send(false);
+                return SendUtil.send(false, "安全信息id格式错误");
             }
             //通过信息ID获取漏洞数据
             List<Map<String, Object>> riskList = systemRiskMapper.getSystemRiskByInfoId(infoId);
             //遍历每条安全信息中的系统漏洞统计系统漏洞数
             for (Map<String, Object> map : riskList) {
-                if(Blank.isEmpty(map.get("high_risk_number")) || Blank.isEmpty(map.get("middle_risk_number")) || Blank.isEmpty(map.get("system_name"))){
-                    return SendUtil.send(false);
-                }
-                Integer highRisk = Integer.parseInt(map.get("high_risk_number").toString());
-                Integer middleRisk = Integer.parseInt(map.get("middle_risk_number").toString());
-                String systemName = map.get("system_name").toString();
-                Map<String, Object> businessSystem = businessSystemMapper.getOfficeBySysName(systemName);
-                Integer officeType = 0;
-                if(Blank.isEmpty(businessSystem)){
-                    return SendUtil.send(false);
-                }
-                if(Blank.isEmpty(businessSystem.get("office_type"))){
-                    return SendUtil.send(false);
-                }
-                officeType =  Integer.parseInt(businessSystem.get("office_type").toString());
-                //局本部
-                if(officeType == 1){
-                    countOfficeHighRisk += highRisk;
-                    countOfficeMiddleRisk += middleRisk;
-                //二级单位
-                }else{
-                    countCompanyHighRisk += highRisk;
-                    countCompanyMiddleRisk += middleRisk;
+                if(Blank.isNotEmpty(map.get("high_risk_number")) && Blank.isNotEmpty(map.get("middle_risk_number")) && Blank.isNotEmpty(map.get("system_name"))){
+                    Integer highRisk = Integer.parseInt(map.get("high_risk_number").toString());
+                    Integer middleRisk = Integer.parseInt(map.get("middle_risk_number").toString());
+                    String systemName = map.get("system_name").toString();
+                    Map<String, Object> businessSystem = businessSystemMapper.getOfficeBySysName(systemName);
+                    Integer officeType = 0;
+                    if(Blank.isNotEmpty(businessSystem)){
+                        if(Blank.isEmpty(businessSystem.get("office_type"))){
+                            return SendUtil.send(false, "系统未匹配单位");
+                        }
+                        officeType =  Integer.parseInt(businessSystem.get("office_type").toString());
+                        //局本部
+                        if(officeType == 1){
+                            countOfficeHighRisk += highRisk;
+                            countOfficeMiddleRisk += middleRisk;
+                            //二级单位
+                        }else{
+                            countCompanyHighRisk += highRisk;
+                            countCompanyMiddleRisk += middleRisk;
+                        }
+                    }
+
                 }
+
             }
         }
 
@@ -233,7 +233,6 @@ public class SystemRiskServiceImpl implements SystemRiskService {
                 timeMap.put("orgType", orgType);
             }
             //查询单月安全信息数据
-
             Map<String, Object> safetyInfo = safetyInfoMapper.getSafetyInfoByMonth(timeMap);
             Integer countHighRisk = 0;
             Integer countMiddleRisk = 0;

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

@@ -41,6 +41,11 @@
             update_time
         FROM
         t_other_business_system
+        <where>
+            <if test="orgType != null and orgType != ''">
+                AND org_type = #{orgType}
+            </if>
+        </where>
     </select>
 
     <!-- 查询其他业务系统 -->

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

@@ -122,7 +122,7 @@
         FROM
             system_risk sr
         LEFT JOIN
-            t_business_system bs ON sr.system_name = bs.system_name
+            t_other_business_system bs ON sr.system_name = bs.system_name
         LEFT JOIN t_office o ON bs.office_id = o.id
         <where>
             <if test="infoId != null and infoId != ''">
@@ -146,7 +146,7 @@
                bs.grade_eval,
                bs.eval_time
         from t_office o
-        LEFT JOIN t_business_system bs ON o.id = bs.office_id
+        LEFT JOIN t_other_business_system bs ON o.id = bs.office_id
         LEFT JOIN system_risk sr ON bs.system_name = sr.system_name
         <where>
             <if test="infoId != null and infoId != ''">

spring-cloud/server-page/src/main/resources/static/page/js/basic/systemRisk.js

@@ -330,7 +330,7 @@ function initBusinessSystemType(orgType) {
 	//初始化下拉框
 	ly.ajax({
 	    type: 'get',
-	    url: PAGE_BASIC + '/businessSystem/getAllSystem',
+	    url: PAGE_BASIC + '/otherBusinessSystem/getAllOtherSystem',
 	    dataType: 'json',
 	    data: {
 			orgType: orgType

spring-cloud/server-threeapi/src/main/java/com/jd/util/ApiUrlUtil.java

@@ -56,9 +56,11 @@ public class ApiUrlUtil {
 		}else if(urlParamType == 1){
 			//参数为json字符串
 			String urlParam = apiUrl.getUrlParam();
-			if(StrUtil.isNotEmpty(urlParam)) {
-				JSONObject urlParamObj = JSONUtil.parseObj(urlParam);
-				paramsObj.putAll(urlParamObj);
+			if(StrUtil.isEmpty(params)){
+				if(StrUtil.isNotEmpty(urlParam)) {
+					JSONObject urlParamObj = JSONUtil.parseObj(urlParam);
+					paramsObj.putAll(urlParamObj);
+				}
 			}
 			String jsonStr = paramsObj.toJSONString(0);
 			httpRequest = httpRequest.body(jsonStr);
@@ -66,9 +68,11 @@ public class ApiUrlUtil {
 		}else if(urlParamType == 2){
 			//参数为form表单
 			String urlParam = apiUrl.getUrlParam();
-			if(StrUtil.isNotEmpty(urlParam)) {
-				JSONObject urlParamObj = JSONUtil.parseObj(urlParam);
-				paramsObj.putAll(urlParamObj);
+			if(StrUtil.isEmpty(params)) {
+				if (StrUtil.isNotEmpty(urlParam)) {
+					JSONObject urlParamObj = JSONUtil.parseObj(urlParam);
+					paramsObj.putAll(urlParamObj);
+				}
 			}
 			httpRequest = httpRequest.form(paramsObj);
 			log.info("请求参数(form表单): " + paramsObj.toJSONString(0));