From 2f16c1a3f958371cc12408ece6a4f7931bbad904 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 十月 2025 17:37:33 +0800
Subject: [PATCH] websocket连接
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
index ce0690d..4759e36 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
@@ -11,7 +11,6 @@
import com.ruoyi.system.dto.MissionIdDto;
import com.ruoyi.system.dto.TMissionUserDto;
import com.ruoyi.system.model.*;
-import com.ruoyi.system.query.TEquipmentQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.MissionTotalVo;
import com.ruoyi.system.vo.TotalHistoryVo;
@@ -23,9 +22,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.time.LocalDate;
+import java.time.Duration;
import java.time.LocalDateTime;
-import java.time.Month;
import java.util.List;
/**
@@ -161,10 +159,28 @@
public static void main(String[] args) {
- LocalDate now = LocalDate.now();
- System.out.println(LocalDate.now().minusMonths(5) + " 00:00:00");
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime localDateTime = LocalDateTime.now().minusDays(5);
+
+ long hours = Duration.between(localDateTime, now).toHours();
+ System.out.println(hours);
}
+ /**
+ * 接受任务
+ */
+ @ApiOperation(value = "获取任务列表--接受任务", response = MissionIdDto.class)
+ @PostMapping(value = "/api/t-mission/acceptMission")
+ public R<?> acceptMission(@RequestBody String param) {
+ MissionIdDto dto = JSON.parseObject(param, MissionIdDto.class);
+ TMission mission = missionService.getById(dto.getMissionId());
+ mission.setReceiveTime(LocalDateTime.now());
+ // 计算 mission中的assign_time 和现在时间 时间差 小时
+ mission.setAssignTime(mission.getAssignTime().plusHours(mission.getAssignTime().getHour()));
+ long hoursDiff = Duration.between(mission.getAssignTime(), mission.getReceiveTime()).toHours();
+ mission.setResTime((double) hoursDiff);
+ return R.ok();
+ }
/**
* 完成任务
@@ -221,5 +237,15 @@
public R<List<TEquipment>> equipmentList() {
return R.ok(equipmentService.list());
}
+
+
+
+ @ApiOperation(value = "发送任务", response = TEquipment.class)
+ @PostMapping(value = "/open/t-mission/sendMission")
+ public R<?> sendMission() {
+// WebSocketServerSolo.sendInfo("{\"missionId\":1}", "1");
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1