监控调阅任务

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -73,7 +73,7 @@ public interface RemoteOrgService {
      */
     @GetMapping("/org/getUpOrgs/{orgId}")
     List<Long> getUpOrgs(@PathVariable("orgId") Long orgId);
-    @GetMapping("/list/findAllOrg")
+    @GetMapping("/org/list/findAllOrg")
     List<SysOrg> findAllOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -9,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.ArrayList;

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

@@ -69,7 +69,7 @@ private static final long serialVersionUID=1L;
     private Integer ymdDay;
 
     /** 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6） */
-    private Integer cycle;
+    private String cycle;
 
     /** 开始时间 */
             @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -93,7 +93,7 @@ private static final long serialVersionUID=1L;
 
     /** 状态 */
             @ApiModelProperty(value = "状态")
-    private Integer status;
+    private String status;
 
     /** 角色id */
     private Long roleId;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/dto/RetrievalTaskPageDto.java

@@ -37,9 +37,9 @@ public class RetrievalTaskPageDto extends BaseEntity
 
 
     /** 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6） */
-    private Integer cycle;
+    private String cycle;
     /** 状态 */
-    private Integer status;
+    private String status;
 
     /** 角色id */
     private Long roleId;

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 监控调阅任务对象 core_monitoring_retrieval_task
@@ -16,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "CoreMonitoringRetrievalTask对象", description = "监控调阅任务")
-public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
+public class CoreMonitoringRetrievalTaskOneVo {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -68,7 +69,7 @@ public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
      * 状态
      */
     @ApiModelProperty(value = "状态")
-    private Long status;
+    private String status;
 
 
     private String roleName;
@@ -76,6 +77,8 @@ public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
 
     private String retrievalUserName;
 
+    List<TaskDataVo> taskDataVoList;
+
 
 
 }

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

@@ -64,37 +64,37 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 年
      */
-    private Long ymdYear;
+    private Integer ymdYear;
 
     /**
      * 半年
      */
-    private Long ymdHalfyear;
+    private Integer ymdHalfyear;
 
     /**
      * 季度
      */
-    private Long ymdQuarter;
+    private Integer ymdQuarter;
 
     /**
      * 月
      */
-    private Long ymdMonth;
+    private Integer ymdMonth;
 
     /**
      * 周
      */
-    private Long ymdWeek;
+    private Integer ymdWeek;
 
     /**
      * 日
      */
-    private Long ymdDay;
+    private Integer ymdDay;
 
     /**
      * 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6）
      */
-    private Long cycle;
+    private String cycle;
 
     /**
      * 开始时间
@@ -128,7 +128,7 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
      * 状态
      */
     @ApiModelProperty(value = "状态")
-    private Long status;
+    private String status;
 
     private String statusText;
 

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

@@ -0,0 +1,31 @@
+package com.xunmei.common.core.domain.retrieval.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xunmei.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 监控调阅任务对象 core_monitoring_retrieval_task
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Data
+@ApiModel(value = "CoreMonitoringRetrievalTask对象", description = "监控调阅任务")
+public class TaskDataVo {
+    private static final long serialVersionUID = 1L;
+
+    private String hostName;
+    private String channelName;
+    private String project;
+    private String remark;
+    private String situation;
+
+
+
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/DateUtils.java

@@ -262,13 +262,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
     public static void main(String[] args) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date startDate = sdf.parse("2023-01-01 00:00:00");
-        Date endDate = sdf.parse("2023-01-01 00:00:02");
-        Map<Integer, DateRange> dateRanges = splitDateRange(startDate, endDate, 2);
+        /*Date startDate = sdf.parse("2023-09-01 00:00:00");
+       // Date endDate = sdf.parse("2023-01-01 00:00:02");
+        DateRange startAndEnd = getStartAndEnd(startDate, 3);*/
+        Date dateTime = Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        DateRange startAndEnd = DateUtils.getStartAndEnd(dateTime, 3);
 
-        for (Map.Entry<Integer, DateRange> entry : dateRanges.entrySet()) {
-            System.out.println("Key: " + entry.getKey() + ", Start Time: " + sdf.format(entry.getValue().getStartTime()) + ", End Time: " + sdf.format(entry.getValue().getEndTime()));
-        }
+            System.out.println( " Start Time: " + sdf.format(startAndEnd.getStartTime()) + ", End Time: " + sdf.format(startAndEnd.getEndTime()));
     }
 }
 

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

@@ -26,8 +26,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
-  private static  final Integer ONE=1;
-  private static final Integer TWO=2;
+  private static  final String ONE="1";
+  private static final String TWO="2";
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
 @Autowired

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -5,6 +5,7 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
+import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
@@ -113,12 +114,14 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      * 如果当天是周一还需生成周任务
      * @return
      */
+    @InnerAuth
     @GetMapping("/dayTask")
-    public AjaxResult dayTask(@RequestParam("taskTime") LocalDate taskTime) {
+    public AjaxResult dayTask(@RequestParam(value = "taskTime",required = false) LocalDate taskTime) {
         try {
             coreMonitoringRetrievalTaskService.dayTask(taskTime);
             return AjaxResult.success("任务生成成功");
         } catch (Exception e) {
+            e.printStackTrace();
             return AjaxResult.error("任务生成失败" + e.getMessage());
         }
 
@@ -131,8 +134,9 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      * 其他日期生成月任务
      * @return
      */
+    @InnerAuth
     @GetMapping("/monthTask")
-    public AjaxResult monthTask(@RequestParam("taskTime")  LocalDate taskTime) {
+    public AjaxResult monthTask(@RequestParam(value = "taskTime",required = false)  LocalDate taskTime) {
         try {
             coreMonitoringRetrievalTaskService.monthTask(taskTime);
             return AjaxResult.success("任务生成成功");

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.common.core.domain.retrieval.vo.TaskDataVo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import org.apache.ibatis.annotations.Param;
 
@@ -68,4 +70,8 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
     Page<CoreMonitoringRetrievalTaskVo> selectPageList(Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
 
     List<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO);
+
+    List<TaskDataVo> selectTaskDataVoListByRetrievalTaskId(@Param("taskId") Long id);
+
+    CoreMonitoringRetrievalTaskOneVo selectOneById(@Param("taskId") Long id);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -14,6 +14,7 @@ import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTas
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.common.core.domain.retrieval.vo.TaskDataVo;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
 import com.xunmei.common.core.utils.*;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -321,11 +322,12 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id) {
-        CoreMonitoringRetrievalTaskOneVo retrievalTaskOneVo = new CoreMonitoringRetrievalTaskOneVo();
-        CoreMonitoringRetrievalTask retrievalTask = coreMonitoringRetrievalTaskMapper.selectById(id);
-        BeanHelper.copyProperties(retrievalTaskOneVo, retrievalTask);
-
-        return null;
+        CoreMonitoringRetrievalTaskOneVo retrievalTaskOneVo = coreMonitoringRetrievalTaskMapper.selectOneById(id);
+       /* CoreMonitoringRetrievalTask retrievalTask = this.getById(id);
+        BeanHelper.copyProperties(retrievalTaskOneVo, retrievalTask);*/
+        List<TaskDataVo>  taskDataVoList = coreMonitoringRetrievalTaskMapper.selectTaskDataVoListByRetrievalTaskId(id);
+        retrievalTaskOneVo.setTaskDataVoList(taskDataVoList);
+        return retrievalTaskOneVo;
     }
 
     /**
@@ -390,8 +392,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         DateRange dateRange = null;
         if (Integer.parseInt(plan.getPlanCycle()) == RetrievalTaskCycle.NOCYCLE.getCode()) {
             //无周期任务获取计划时间//重计划中获取
-            dateRange.setStartTime(plan.getStartTime());
-            dateRange.setEndTime(plan.getEndTime());
+            dateRange = new  DateRange(plan.getStartTime(), plan.getEndTime());
         } else {
             //周期任务获取计划时间
             dateRange = DateUtils.getStartAndEnd(dateTime, Integer.parseInt(plan.getPlanCycle()));
@@ -399,14 +400,15 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         CoreMonitoringRetrievalTask task = new CoreMonitoringRetrievalTask();
         task.setId(IDHelper.id());
         task.setTaskName(plan.getPlanName() + "第" + frequency + "次调阅");
-        task.setCycle(Integer.parseInt(plan.getPlanCycle()));
+        task.setCycle(plan.getPlanCycle());
         task.setOrgId(sysOrg.getId());
         task.setOrgPath(sysOrg.getPath());
         task.setOrgName(sysOrg.getName());
         task.setBatchNum(batchNum);
         task.setPlanId(plan.getId());
         task.setOrderNum(frequency);
-        task.setPlanEndTime(dateRange.getStartTime());
+        System.out.println(dateRange.getStartTime() + "---" + dateRange.getEndTime());
+        task.setPlanStartTime(dateRange.getStartTime());
         task.setPlanEndTime(dateRange.getEndTime());
         task.setYmdDate(ymd.getDate());
         task.setYmdYear(ymd.getYear());
@@ -416,7 +418,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         task.setYmdWeek(ymd.getWeek());
         task.setYmdDay(ymd.getDay());
         task.setRoleId(plan.getRoleId());
-        task.setStatus(0);
+        task.setStatus("0");
         return task;
     }
 

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

@@ -108,6 +108,20 @@
          and ymdDate like concat('%', #{ymd_date}, '%')
      </if>
     </select>
+    <select id="selectTaskDataVoListByRetrievalTaskId"
+            resultType="com.xunmei.common.core.domain.retrieval.vo.TaskDataVo">
+        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>
+    <select id="selectOneById"
+            resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo">
+        select  a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
+        where a.id=#{taskId}
+    </select>
 
     <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         insert into core_monitoring_retrieval_task

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/RetrievalTask.java

@@ -24,7 +24,7 @@ public class RetrievalTask {
     /**
      * 每天生成日任务 如果当天是周一还需生成周任务
      */
-    public void retrieveDayTask(LocalDate taskTime)
+    public void retrieveDayTaskByDate(LocalDate taskTime)
     {   System.out.println("监控调阅每日每周任务生产服务有参"+taskTime);
         AjaxResult result = remoteRetrievalTaskService.dayTask(taskTime, SecurityConstants.INNER);
         System.out.println(JSON.toJSONString(result));
@@ -36,7 +36,7 @@ public class RetrievalTask {
      * 其他日期生成月任务
      *
      */
-    public void retrieveMonthTask(LocalDate taskTime)
+    public void retrieveMonthTaskByDate(LocalDate taskTime)
     {   System.out.println("监控调阅每月任务生产服务有参"+taskTime);
         AjaxResult result = remoteRetrievalTaskService.monthTask(taskTime,SecurityConstants.INNER);
         System.out.println(JSON.toJSONString(result));

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -54,7 +54,8 @@
                org_extend_id,
                source,
                short_name,
-               remark
+               remark,
+               path
         from sys_org
     </sql>