Merge remote-tracking branch 'origin/V0.1.0_zhulu' into V0.1.0_zhulu

project_data/sql/0.1.0_zhulu/升级说明

@@ -0,0 +1,3 @@
+1.nginx配置文件修改
+    1.1 在http下修改配置 keepalive_timeout  65;:
+        keepalive_timeout  300;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -44,7 +44,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     //  @RequiresPermissions("core:registration:list")
     @GetMapping("/list")
     public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
+        return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration));
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistration.java

@@ -99,4 +99,8 @@ public class CoreMonitoringTaskRegistration extends BaseEntity {
     @ApiModelProperty(value = "监控操作标识状态")
     @TableField(exist = false)
     private Integer monitorFlag;
+
+    @ApiModelProperty(value = "状态")
+    @TableField(exist = false)
+    private Integer status;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/CoreMonitoringTaskRegistrationMonitorMapper.java

@@ -71,7 +71,7 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
      * @param taskId
      * @return
      */
-    CoreMonitoringTaskRegistrationVO selectTaskName(Long taskId);
+    CoreMonitoringTaskRegistrationVO selectTaskName(@Param("taskId") Long taskId,@Param("status") Integer status);
 
     /**
      * 查询监控集合根据任务调阅任务登记扫描表id

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationMonitorService.java

@@ -2,6 +2,7 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
@@ -66,11 +67,11 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
     /**
      * 查询调阅任务登记监控数据
      *
-     * @param taskId
+     * @param
      * @return CoreMonitoringTaskRegistrationVO
      */
 
-    CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId);
+    CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
 
 //    CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationMonitorServiceImpl.java

@@ -113,9 +113,9 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
     }
 
     @Override
-    public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId) {
+    public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         //查询任务
-        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = coreMonitoringTaskRegistrationMonitorMapper.selectTaskName(taskId);
+        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = coreMonitoringTaskRegistrationMonitorMapper.selectTaskName(coreMonitoringTaskRegistration.getTaskId(),coreMonitoringTaskRegistration.getStatus());
         if (null != coreMonitoringTaskRegistrationVO) {
             //查询视频
             List<CoreMonitoringTaskRegistrationMonitorVO> coreMonitoringTaskRegistrationMonitorVOS = coreMonitoringTaskRegistrationMonitorMapper.selectMonitorByTaskRegistrationId(coreMonitoringTaskRegistrationVO.getId());

soc-modules/soc-modules-core/src/main/resources/mapper/access/CoreMonitoringTaskRegistrationMonitorMapper.xml

@@ -58,14 +58,20 @@
             cmrt.id AS id,
             cmrt.task_name AS taskName,
             cmrt.STATUS AS taskStatus,
-            cmtr.task_start_time AS taskStartTime,
-            cmrt.end_time AS taskEndTime ,
+            MIN(cmtr.task_start_time) AS taskStartTime,
+            MAX(cmrt.end_time) AS taskEndTime,
             cmrt.duration_total as taskTotalTime
         FROM
             core_monitoring_retrieval_task cmrt
                 LEFT JOIN core_monitoring_task_registration cmtr ON cmtr.task_id = cmrt.id
-        WHERE cmtr.task_end_time is null
-              and  cmtr.task_id = #{taskId}
+        WHERE 1=1
+            <if test="status != null and status == 1">
+                and cmtr.task_end_time is null
+            </if>
+            and  cmtr.task_id = #{taskId}
+            <if test="status != null and status == 2">
+                GROUP BY cmtr.task_id
+            </if>
     </select>
     <select id="selectMonitorByTaskRegistrationId"
             resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -107,7 +107,7 @@
                 and t.status=#{request.status}
             </if>
             <include refid="timeRangeSql"/>
-        order by field(t.status,1,4,0,2,3),t.title desc
+        order by field(t.status,1,4,0,2,3),t.title
     </select>
 
     <select id="selectEduTrainingTaskDetail"