监控接口修改

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

@@ -39,7 +39,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 					,"/safetyInfor/getSysStatusByOrg","/SystemRisk/getHighStatus","/SystemRisk/getHighStatusByMonth","/AttackEvent/getAttackEventByInfo"
 					,"/AttackType/getAttackTypeByMonth","/SystemAttacked/getSystemAttackedByInfo","/safetyInfor/getWebSafetyStatusByOrg"
 					,"/OfficeVirus/getOfficeSafetyInfo","/AttackType/getAttackTypeByMonth","/SystemAttacked/getSystemAttackedByInfo","/businessSystem/getSystemInfoByVoiceKeyword"
-					,"/GuaranteeGroup/getAllGuaranteeGroup","/SystemRisk/GetSystemRiskList","/SystemRisk/getSysInfoByOffice","/monitoringResources/creatRelay","/monitoringResources/closeAllRelay"
+					,"/GuaranteeGroup/getAllGuaranteeGroup","/SystemRisk/GetSystemRiskList","/SystemRisk/getSysInfoByOffice","/monitoringResources/getMonitorListByName","/monitoringResources/creatRelay","/monitoringResources/closeAllRelay"
 					,"/monitoringResources/getStreamForKaiKang","/flat/door/personRegister","/flat/sendMessage","/businessSystem/getSystemInfoByShow"
 					).permitAll()			.anyRequest()
 			.authenticated()

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

@@ -145,9 +145,9 @@ private MonitoringResourcesService monitoringResourcesService;
      */
     @GetMapping("getMonitorListByName")
     public Map<String, Object> getMonitorListByName(String monitorName) {
-        if (Blank.isEmpty(monitorName)) {
-            return SendUtil.send(false, ConstString.REQUEST_WRONGPARAMS);
-        }
+//        if (Blank.isEmpty(monitorName)) {
+//            return SendUtil.send(false, ConstString.REQUEST_WRONGPARAMS);
+//        }
         return monitoringResourcesService.getMonitorListByName(monitorName);
     }
 

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

@@ -120,6 +120,12 @@ public class MonitoringResourcesServiceImpl implements MonitoringResourcesServic
     @Override
     public Map<String, Object> creatRelay(Integer monitorId) {
         Map<String, Object> monitorInfo = monitoringResourcesMapper.getOneById(monitorId);
+        // 如果relay任务已创建，直接返回streamName
+        String relay_id = Convert.toStr(monitorInfo.get("relay_id"));
+        String stream_name = Convert.toStr(monitorInfo.get("stream_name"));
+        if (Blank.isNotEmpty(relay_id) && Blank.isNotEmpty(stream_name)) {
+            return SendUtil.send(true, ConstString.RESULT_SUCCESS, stream_name);
+        }
 
         // 获取请求URL
         Map<String, Object> oneBasicDataByType = basicDataMapper.getOneBasicDataByType("nodeMediaServer-api-url");

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

@@ -111,6 +111,8 @@
         <if test="manufacturer = 20">
             tnp.username,
             tnp.`password`,
+            tnp.relay_id,
+            tnp.stream_name,
             tnp.in_host,
             tnp.vendor,
             tnp.nvr_port,
@@ -151,8 +153,11 @@
             t_monitoring_resources tmr
                 LEFT JOIN t_haikang_parameter thp ON tmr.id = thp.monitoring_resources_id
                 LEFT JOIN t_nodemedia_parameter tnp ON tmr.id = tnp.monitoring_resources_id
-        WHERE
-            tmr.monitoring_point_name LIKE CONCAT('%', #{monitoringPointName},'%')
+        <where>
+            <if test="monitoringPointName != null and monitoringPointName != ''">
+                and monitoring_point_name = #{monitoringPointName}
+            </if>
+        </where>
         ORDER BY
             tmr.create_time
     </select>