监控调阅任务跟踪 详情查询 返回区域

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/TaskDataVo.java

@@ -21,6 +21,8 @@ public class TaskDataVo {
 
     private String hostName;
     private String channelName;
+    private String areaCode;
+    private String areaName;
     private String project;
     private String remark;
     private String situation;

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -182,16 +182,26 @@
     </select>
     <select id="selectTaskDataVoListByRetrievalTaskId"
             resultType="com.xunmei.common.core.domain.retrieval.vo.TaskDataVo">
-        select e.device_name         as hostName,
-               d.device_name         as channelName,
+<!--        select e.device_name         as hostName,-->
+<!--               d.device_name         as channelName,-->
+<!--               c.project,-->
+<!--               c.abnormal_illustrate as remark,-->
+<!--               c.situation-->
+<!--        from core_monitoring_task_registration a-->
+<!--                 left join core_monitoring_task_registration_monitor b on a.id = b.task_registration_id-->
+<!--                 inner join core_monitoring_task_monitor_info c on b.id = c.task_monitor_id-->
+<!--                 inner join sys_device d on d.id = b.video_channel-->
+<!--                 inner join sys_device e on e.id = b.`host`-->
+<!--        where a.task_id = #{taskId}-->
+        select
+               b.area_code,
+               b.area_name,
                c.project,
                c.abnormal_illustrate as remark,
                c.situation
         from core_monitoring_task_registration a
                  left join core_monitoring_task_registration_monitor b on a.id = b.task_registration_id
                  inner join core_monitoring_task_monitor_info c on b.id = c.task_monitor_id
-                 inner join sys_device d on d.id = b.video_channel
-                 inner join sys_device e on e.id = b.`host`
         where a.task_id = #{taskId}
     </select>
     <select id="selectOneById"