修改bug

project_data/sql/0.1.0_zhulu/soc.sql

@@ -0,0 +1,37 @@
+DELIMITER
+??
+DROP PROCEDURE IF EXISTS schema_change ??
+CREATE PROCEDURE schema_change()
+BEGIN
+
+
+-- 培训任务表增加主持人名称字段
+    IF
+    NOT EXISTS(SELECT *
+                      FROM information_schema.columns
+                      WHERE table_schema = DATABASE()
+                        AND table_name = 'core_monitoring_task_registration'
+                        AND column_name = 'task_end_time') THEN
+    alter table core_monitoring_task_registration
+        add task_end_time datetime DEFAULT NULL COMMENT '调阅任务填报结束时间' after end_picture;
+    END IF;
+
+    IF
+    NOT EXISTS(SELECT *
+                      FROM information_schema.columns
+                      WHERE table_schema = DATABASE()
+                        AND table_name = 'core_monitoring_retrieval_task'
+                        AND column_name = 'duration_total') THEN
+    alter table core_monitoring_retrieval_task
+        add duration_total double(10,4) DEFAULT NULL COMMENT '调阅总时长' after sign_img;
+    END IF;
+
+
+
+
+END ??
+DELIMITER ;
+CALL schema_change();
+
+
+DELETE FROM quartz.sys_job where job_name = '回归未完成的调阅任务';

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

@@ -58,6 +58,14 @@ public interface RemoteRetrievalTaskService {
     @GetMapping("/retrievalTask/initializationAccessTask")
     AjaxResult initializationAccessTask(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 删除未完成的调阅记录
+     * @param source
+     * @return
+     */
+    @GetMapping("/retrievalTask/dealTaskRegistration")
+    AjaxResult dealTaskRegistration(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     @PostMapping("/retrievalTask/rebuildTask")
     AjaxResult rebuild(@RequestBody String event, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

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

@@ -1689,7 +1689,16 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         // 计算剩余的分钟数和秒数
         long remainingMinutes = totalMinutes % 60;
         long remainingSeconds = totalSeconds % 60;
-        return String.format("%02d小时%02d分钟%02d秒", totalHours, remainingMinutes, remainingSeconds);
+        if(totalHours == 0){
+            if(totalMinutes == 0){
+                return String.format("%02d秒", remainingSeconds);
+            }
+            return String.format("%02d分钟%02d秒", remainingMinutes, remainingSeconds);
+        }else{
+
+            return String.format("%02d小时%02d分钟%02d秒", totalHours, remainingMinutes, remainingSeconds);
+        }
+
     }
 
     private String dealTime(Date start,Date end){

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

@@ -88,7 +88,6 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     public AjaxResult initialization(@PathVariable("id") Long id) {
         return success(coreMonitoringRetrievalTaskBuilderService.initializationTask(id));
     }
-
     /**
      * 新增监控调阅任务
      */
@@ -202,4 +201,18 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
             return AjaxResult.error("修改任务状态失败" + e.getMessage());
         }
     }
+
+    /**
+     * 处理当天未完成的调阅记录
+     * @return
+     */
+    @GetMapping("/dealTaskRegistration")
+    public AjaxResult dealTaskRegistration() {
+        try {
+            coreMonitoringRetrievalTaskBuilderService.dealTaskRegistration();
+            return AjaxResult.success("修改任务状态成功");
+        } catch (Exception e) {
+            return AjaxResult.error("修改任务状态失败" + e.getMessage());
+        }
+    }
 }

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

@@ -162,4 +162,6 @@ public interface ICoreMonitoringRetrievalTaskBuilderService extends IService<Cor
     void taskChangeForTimeWorkChange(WorkTimeChangeEvent event);
 
     void createAndSaveTask(List<TMonitoringRetrievalPlan> planList,LocalDate taskTime,List<Long> needBuildTaskOrgIdList);
+
+    void dealTaskRegistration();
 }

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

@@ -8,6 +8,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
@@ -28,6 +29,7 @@ import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.TaskCreatingServiceImplBase;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
@@ -137,6 +139,14 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void dealTaskRegistration() {
+        UpdateWrapper<CoreMonitoringTaskRegistration> uw = new UpdateWrapper<>();
+        uw.lambda().isNull(CoreMonitoringTaskRegistration::getTaskEndTime);
+        coreMonitoringTaskRegistrationMapper.delete(uw);
+    }
+
 
     private List<CoreMonitoringRetrievalTask> createTask(List<TMonitoringRetrievalPlan> planList, LocalDate taskTime, List<Long> needBuildTaskOrgIdList) {
         List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();

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

@@ -24,10 +24,20 @@ public class CoreMessageSendTask {
     @Resource
     private RemoteRetrievalTaskService remoteRetrievalTaskService;
     public void initializationAccess() {
-        String id = UUID.fastUUID().toString();
+  /*      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));
+        log.info("初始化调阅任务定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(ajaxResult));*/
+    }
+
+    /**
+     * 当日未完成的调阅记录，需要删除
+     */
+    public void dealTaskRegistration(){
+        String id = UUID.fastUUID().toString();
+        log.info("开始执行调阅记录删除定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());
+        AjaxResult ajaxResult = remoteRetrievalTaskService.dealTaskRegistration(SecurityConstants.INNER);
+        log.info("调阅记录删除定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(ajaxResult));
     }
     /**
      * 消息发送管理