From eab5d02a04a6f4c36e132825e050e3bc2eb75c2d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 17 May 2022 16:52:59 +0800
Subject: [PATCH] 注册修改
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 1a6d95e..92ebc9e 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -93,6 +93,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入task")
public R save(@Valid @RequestBody Taskqd taskqd) {
+ pushMsgService.pushMsg(taskqd.getJurisdiction());
return R.status(taskqdService.save(taskqd));
}
@@ -157,19 +158,21 @@
//获取要接任务的时间戳 + 两个小时
Date timea = sdf.parse(list.get(0).getTime());
- Long start = timea.getTime() + 2 * 60 * 60;
- System.out.println(sdf.format(start));
+ System.out.println("开始时间——————"+timea.getTime());
+ Long start = timea.getTime() + 2 * 60 * 60 * 1000;
+ System.out.println("开始时间——————"+start);
+ System.out.println("开始时间——————"+sdf.format(start));
//判断是否有同时间段的任务
//已接的任务
- List<TaskqdVO> yjlist = taskqdService.getlist(taskqd.getSerid().toString(), null);
+ List<TaskqdVO> yjlist = taskqdService.getlist(taskqd.getSerid().toString(), "2");
for (int i = 0; i < yjlist.size(); i++) {
//获取已接任务的时间戳
Date timeb = sdf.parse(yjlist.get(i).getEndtime());
Long end = timeb.getTime();
-
+ System.out.println("开始时间——————"+sdf.format(end));
if (end > start) {
return R.fail("已有正在进行的同时段任务");
}
--
Gitblit v1.9.3