From a88ba6b7606a73086cadb02c6115c3c01ce03f3e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 24 三月 2025 20:00:51 +0800
Subject: [PATCH] 开发管理后台车辆管理模块部分接口和订单模块部分接口
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java
index ac33e71..5ee471f 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java
@@ -1,6 +1,8 @@
package com.ruoyi.dataInterchange.controller;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.dataInterchange.api.vo.UPPlaybackMsgStartupAckVo;
import com.ruoyi.dataInterchange.dao.UPPlaybackMsgControlAckDao;
import com.ruoyi.dataInterchange.dao.UPPlaybackMsgStartupAckDao;
import com.ruoyi.dataInterchange.model.UPPlaybackMsgControlAck;
@@ -44,8 +46,8 @@
* @return
*/
@PostMapping("/playbackMsgStartup")
- public R<UPPlaybackMsgStartupAck> playbackMsgStartup(@RequestParam("inferiorPlatformId") Integer inferiorPlatformId, @RequestParam("vehicleNo") String vehicleNo,
- @RequestParam("startTime") LocalDateTime startTime, @RequestParam("endTime") LocalDateTime endTime) {
+ public R<UPPlaybackMsgStartupAckVo> playbackMsgStartup(@RequestParam("inferiorPlatformId") Integer inferiorPlatformId, @RequestParam("vehicleNo") String vehicleNo,
+ @RequestParam("startTime") Long startTime, @RequestParam("endTime") Long endTime) {
R r = downPlaybackMsgStartupService.playbackMsgStartup(inferiorPlatformId, vehicleNo, startTime, endTime);
if (200 != r.getCode()) {
return r;
@@ -64,8 +66,29 @@
num++;
continue;
}
- if (null != upPlaybackMsgStartupAck || num >= 30) {
- return R.ok(upPlaybackMsgStartupAck);
+ if(null != upPlaybackMsgStartupAck){
+ int result = upPlaybackMsgStartupAck.getResult();
+ switch (result){
+ case 0:
+ UPPlaybackMsgStartupAckVo vo = new UPPlaybackMsgStartupAckVo();
+ BeanUtils.copyProperties(upPlaybackMsgStartupAck, vo);
+ return R.ok(vo);
+ case 1:
+ return R.fail("失败");
+ case 2:
+ return R.fail("不支持");
+ case 3:
+ return R.fail("会话结束");
+ case 4:
+ return R.fail("失效口令错误");
+ case 5:
+ return R.fail("不满足跨域条件");
+ default:
+ return R.fail("失败");
+ }
+ }
+ if (num >= 30) {
+ return R.fail("失败");
}
}
}
@@ -81,7 +104,7 @@
* @return
*/
@PostMapping("/playbackMsgControl")
- public R<Integer> playbackMsgControl(@RequestParam("inferiorPlatformId") Integer inferiorPlatformId, @RequestParam("vehicleNo") String vehicleNo,
+ public R playbackMsgControl(@RequestParam("inferiorPlatformId") Integer inferiorPlatformId, @RequestParam("vehicleNo") String vehicleNo,
@RequestParam("controlType") Integer controlType, @RequestParam("fastTime") Integer fastTime) {
R r = downPlaybackMsgControlService.playbackMsgControl(inferiorPlatformId, vehicleNo, controlType, fastTime);
if (200 != r.getCode()) {
--
Gitblit v1.7.1