Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/quartz/quartz.sql

@@ -1,7 +1,9 @@
-delete from sys_job where job_id in(129,128,125);
+delete from sys_job where job_id in(129,128,125,138);
 INSERT INTO `sys_job`(`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (129, '恶劣天气预警', 'DEFAULT', 'WeatherTask.getDataFromApi', '0 0 7,10,14,17 * * ? *', '1', '1', '0', '超级管理员', '2023-09-25 11:46:50', '', NULL);
 INSERT INTO `sys_job` VALUES (128, '履职临期提醒(除了每日的）', 'DEFAULT', 'CoreMessageSendTask.resumptionRemind', '0 0 0 * * ?', '1', '1', '0', '超级管理员', '2023-09-22 17:03:31', '', '2023-09-22 20:29:13');
 INSERT INTO `sys_job` VALUES (125, '消息发送管理(每日凌晨零点）', 'DEFAULT', 'CoreMessageSendTask.messageSendTask', '0 0 0 * * ? *', '1', '1', '0', '超级管理员', '2023-09-21 12:30:22', '超级管理员', '2023-09-22 19:04:39');
+
+INSERT INTO `sys_job` VALUES (138, '回归未完成的调阅任务', 'DEFAULT', 'CoreMessageSendTask.initializationAccess', '0 0 0 * * ? *', '1', '1', '0', '超级管理员', '2023-09-21 12:30:22', '超级管理员', '2023-09-22 19:04:39');
 delete from `sys_job` where job_name='生成每周安全检查任务';
 INSERT INTO `sys_job`(`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (130, '生成每周安全检查任务', 'DEFAULT', 'CoreSafetyCheckTask.buildWeekTask', '1 1 1 ? * 2', '2', '1', '0', '超级管理员', '2023-09-22 16:34:24', '', '2023-09-22 16:34:55');
 

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

@@ -56,4 +56,7 @@ public interface RemoteRetrievalTaskService {
      */
     @GetMapping("/retrievalTask/updateTaskStart")
     AjaxResult updateTaskStart(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/retrievalTask/initializationAccessTask")
+    AjaxResult initializationAccessTask(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

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

@@ -45,6 +45,11 @@ public class RemoteRetrievalTaskFallbackFactory implements FallbackFactory<Remot
             public AjaxResult updateTaskStart(String source) {
                 return AjaxResult.error("修改未完成任务的状态为已超期服务调用失败,失败原因：" + throwable.getMessage());
             }
+
+            @Override
+            public AjaxResult initializationAccessTask(String source) {
+                return AjaxResult.error("初始化未完成任务的状态为未调阅服务调用失败,失败原因：" + throwable.getMessage());
+            }
         };
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/SocCoreApplication.java

@@ -9,6 +9,8 @@ import org.mybatis.spring.annotation.MapperScans;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.time.LocalDate;
+
 @MapperScan("com.xunmei.core.**.mapper")
 @EnableCustomConfig
 @EnableCustomSwagger2

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

@@ -23,7 +23,7 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
+import org.springframework.context.annotation.Lazy;
 
 /**
  * 【请填写功能名称】Controller

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

@@ -4,6 +4,7 @@ package com.xunmei.core.access.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +63,6 @@ public interface CoreMonitoringTaskRegistrationMapper extends BaseMapper<CoreMon
      * @return 结果
      */
     int deleteCoreMonitoringTaskRegistrationByIds(Long[] ids);
+
+    int deleteByTaskId(Long taskId);
 }

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

@@ -88,4 +88,5 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
  CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(@Param("taskId") Long taskId,@Param("host") Long host, @Param("videoChannel")Long videoChannel);
+
 }

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

@@ -75,4 +75,5 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,Long hostId,Long videoId);
+
 }

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

@@ -61,5 +61,5 @@ public interface ICoreMonitoringTaskRegistrationService extends IService<CoreMon
      * @return 结果
      */
     int deleteCoreMonitoringTaskRegistrationById(Long id);
-
+    void  deleteByTaskId(Long taskId);
 }

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

@@ -167,4 +167,6 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
         }
         return coreMonitoringTaskRegistrationMonitorVO;
     }
+
+
 }

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

@@ -19,6 +19,7 @@ import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -152,4 +153,9 @@ public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreM
     public int deleteCoreMonitoringTaskRegistrationById(Long id) {
         return coreMonitoringTaskRegistrationMapper.deleteById(id);
     }
+
+    @Override
+    public void deleteByTaskId(Long taskId) {
+        coreMonitoringTaskRegistrationMapper.deleteByTaskId(taskId);
+    }
 }

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;

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

@@ -162,4 +162,20 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
             return AjaxResult.error("修改任务状态失败" + e.getMessage());
         }
     }
+
+    /**
+     * 初始化当天未完成任务
+     *
+     * @return
+     */
+    @InnerAuth
+    @GetMapping("/initializationAccessTask")
+    public AjaxResult initializationAccessTask() {
+        try {
+            coreMonitoringRetrievalTaskService.initializationTask();
+            return AjaxResult.success("修改任务状态成功");
+        } catch (Exception e) {
+            return AjaxResult.error("修改任务状态失败" + e.getMessage());
+        }
+    }
 }

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

@@ -75,7 +75,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     public int deleteCoreMonitoringRetrievalTaskByIds(Long[] ids);
 
-    Page<CoreMonitoringRetrievalTaskVo> selectPageList( @Param("page")Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
+    Page<CoreMonitoringRetrievalTaskVo> selectPageList(@Param("page") Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
 
     Page<CoreMonitoringRetrievalTask> selectListApp(Page<CoreMonitoringRetrievalTask> page, @Param("request") CoreMonitoringTaskRegistrationDTO request);
 
@@ -85,12 +85,24 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
     void updateTaskStart(@Param("dateTimeNew") Date dateTimeNew);
 
+    /**
+     * 初始化任务
+     * @param dateTime
+     */
+    void initializationTask(String dateTime);
+
+    /**
+     * 查询当天未完成任务
+     * @param dateTime
+     * @return
+     */
+    List<Long>selectTaskByTime(String dateTime);
     void deleteTaskByPlanId(@Param("planId") Long planId);
 
 
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);
 
-    void updateDeleteTaskByPlanId(@Param("planId") Long planId,@Param("isDeleted") Integer isDeleted);
+    void updateDeleteTaskByPlanId(@Param("planId") Long planId, @Param("isDeleted") Integer isDeleted);
 
     List<CoreMonitoringRetrievalTaskExcelVo> selectAllList(@Param("request") RetrievalTaskPageDto request);
 

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

@@ -85,17 +85,22 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO);
 
     void noCycleTask(List<TMonitoringRetrievalPlan> planList);
+
     void dayTask(LocalDate taskTime);
+
     void monthTask(LocalDate taskTime);
 
     CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id);
 
     void updateTaskStart();
 
+    void initializationTask();
 
     void deleteTaskByPlanId(Long planId);
-    void  deleteWaitTaskByPlanId(Long planId);
-    void updateDeleteTaskByPlanId(Long planId,Integer isDeleted);
+
+    void deleteWaitTaskByPlanId(Long planId);
+
+    void updateDeleteTaskByPlanId(Long planId, Integer isDeleted);
 
     List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto);
 }

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

@@ -31,6 +31,9 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
@@ -40,6 +43,7 @@ import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
@@ -55,10 +59,7 @@ import java.net.URLEncoder;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -80,7 +81,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     private RemoteDictDataService dictDataService;
     @Resource
     private ITMonitoringRetrievalPlanService itMonitoringRetrievalPlanService;
-
+    @Autowired
+    private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
 
@@ -354,6 +356,19 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     }
 
     @Override
+    public void initializationTask() {
+        LocalDate today = LocalDate.now();
+        LocalDate yesterday = today.minusDays(1);
+        //初始化任务
+        coreMonitoringRetrievalTaskMapper.initializationTask(yesterday.toString());
+        List<Long> longs = coreMonitoringRetrievalTaskMapper.selectTaskByTime(yesterday.toString());
+        //删除关联
+        longs.forEach(l->{
+            coreMonitoringTaskRegistrationMapper.deleteByTaskId(l);
+        });
+    }
+
+    @Override
     public void deleteTaskByPlanId(Long planId) {
         coreMonitoringRetrievalTaskMapper.deleteTaskByPlanId(planId);
     }

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

@@ -140,4 +140,7 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteByTaskId">
+        delete from core_monitoring_task_registration where  task_id =#{taskId}
+    </delete>
 </mapper>

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

@@ -193,4 +193,5 @@
             #{id}
         </foreach>
     </delete>
+
 </mapper>

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

@@ -423,6 +423,9 @@
         set is_deleted = #{isDeleted}
         where plan_id = #{planId}
     </update>
+    <update id="initializationTask">
+        update core_monitoring_retrieval_task SET `status`=0, start_time=null WHERE `status`=1 AND start_time LIKE  concat(#{dateTime}, '%')
+    </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
      select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status
@@ -444,4 +447,7 @@
                 and #{request.endTime}  <![CDATA[<=]]>  t.plan_end_time
              ))
     </select>
+    <select id="selectTaskByTime" resultType="java.lang.Long">
+        SELECT * FROM core_monitoring_retrieval_task WHERE `status`=1 AND start_time LIKE  concat(#{dateTime}, '%')
+    </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.RemoteMessageSendService;
+import com.xunmei.system.api.RemoteRetrievalTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -20,7 +21,14 @@ import java.util.Date;
 public class CoreMessageSendTask {
     @Resource
     private RemoteMessageSendService remoteMessageSendService;
-
+    @Resource
+    private RemoteRetrievalTaskService remoteRetrievalTaskService;
+    public void initializationAccess() {
+        String id = UUID.fastUUID().toString();
+        log.info("开始执行初始化调阅任务定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());
+        AjaxResult ajaxResult = remoteRetrievalTaskService.initializationAccessTask(SecurityConstants.INNER);
+        log.info("初始化调阅任务定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(ajaxResult));
+    }
     /**
      * 消息发送管理
      */