From 9cd3b8e496e7e7c769a5fd76edaa8d4ee6074c58 Mon Sep 17 00:00:00 2001 From: rqian <1206436827@qq.com> Date: Wed, 23 Sep 2026 15:24:49 +0800 Subject: [PATCH] =?UTF-8?q?#update=20=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/maibu/mqtt/HostMessageHandler.java | 26 +++++---------- .../maibu/controller/DeviceOtaController.java | 15 ++++----- .../controller/DeviceRunParamController.java | 24 ++++---------- .../controller/WorkRecordController.java | 32 +++++++------------ .../maibu/service/impl/DeviceOtaService.java | 1 - .../maibu/service/impl/WorkRecordService.java | 1 - 6 files changed, 34 insertions(+), 65 deletions(-) diff --git a/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java b/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java index 006eda9..d84470f 100644 --- a/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java +++ b/maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java @@ -1,30 +1,18 @@ package com.maibu.mqtt; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.paho.client.mqttv3.MqttException; -import com.maibu.core.business.dto.DeviceMapPushDTO; -import org.springframework.util.CollectionUtils; - -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.maibu.constant.Constant; import com.maibu.constant.NettyCacheKey; import com.maibu.core.business.DeviceRunStatistics; import com.maibu.core.business.device.DeviceStatusDetail; import com.maibu.core.business.device.NettyDevice; +import com.maibu.core.business.dto.DeviceMapPushDTO; import com.maibu.core.business.dto.WebDeviceTaskStatusMessageDTO; import com.maibu.core.business.dto.WebStatusMessageDTO; import com.maibu.core.business.inter.WebsocketMesDispather; import com.maibu.core.enums.DeviceTaskStaus; import com.maibu.core.enums.MesType; -import com.maibu.core.host.HeartBeatDTO; -import com.maibu.core.host.HostLocationRelTimeDTO; -import com.maibu.core.host.HostNavigationReplyDTO; -import com.maibu.core.host.HostTaskStatusDTO; -import com.maibu.core.host.HostVehicleRelTimeDTO; -import com.maibu.core.host.LocationMessage; +import com.maibu.core.host.*; import com.maibu.core.redis.RedisCache; import com.maibu.enums.DeviceStatusEnum; import com.maibu.memory.DeviceSessionManager; @@ -33,17 +21,19 @@ import com.maibu.memory.SiteMemory; import com.maibu.utils.StringUtils; import com.maibu.utils.json.JsonUtils; import com.maibu.utils.spring.SpringUtils; - import lombok.extern.slf4j.Slf4j; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; /** * mqtt相关的 上位机处理器 */ @Slf4j public class HostMessageHandler implements CustomMqttMessageHandler { - - private final ObjectMapper objectMapper = new ObjectMapper(); - + private final DeviceSessionManager deviceSessionManager = SpringUtils.getBean(DeviceSessionManager.class); private final WebsocketMesDispather websocketMesDispather = SpringUtils.getBean(WebsocketMesDispather.class); diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceOtaController.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceOtaController.java index 6c5646c..5c608a9 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceOtaController.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceOtaController.java @@ -1,18 +1,13 @@ package com.maibu.controller; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.util.List; - -import com.maibu.core.business.WorkRecord; import com.maibu.core.controller.BaseController; import com.maibu.core.domain.AjaxResult; import com.maibu.core.domain.R; import com.maibu.core.enums.OtaOperate; -import com.maibu.core.page.TableDataInfo; -import com.maibu.dto.BaseQueryDTO; import com.maibu.core.ota.DeviceOtaFirmware; import com.maibu.core.ota.DeviceOtaOperateRecord; +import com.maibu.core.page.TableDataInfo; +import com.maibu.dto.BaseQueryDTO; import com.maibu.dto.DeviceOtaOperateDTO; import com.maibu.service.impl.DeviceOtaService; import com.maibu.utils.MinioUtil; @@ -22,6 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.util.List; + @Api(tags = "OTA固件管理") @RestController @RequestMapping("/iot/deviceOta") @@ -115,7 +114,7 @@ public class DeviceOtaController extends BaseController { public AjaxResult selectOperateRecordById(@RequestParam Long id) { return AjaxResult.success(service.selectOperateRecordById(id)); } - + @GetMapping("/record/selectListByDeviceId") public AjaxResult selectListByDeviceId(@RequestParam String deviceId) { return AjaxResult.success(service.selectListByDeviceId(deviceId)); diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceRunParamController.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceRunParamController.java index f5e9e6a..5794f4c 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceRunParamController.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceRunParamController.java @@ -1,30 +1,20 @@ package com.maibu.controller; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; - -import com.maibu.annotation.Log; -import com.maibu.core.domain.entity.SysUser; -import com.maibu.enums.BusinessType; -import com.maibu.utils.poi.ExcelUtil; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.maibu.core.business.DeviceRunParam; import com.maibu.core.controller.BaseController; import com.maibu.core.domain.AjaxResult; import com.maibu.core.page.TableDataInfo; import com.maibu.dto.BaseQueryDTO; import com.maibu.service.impl.DeviceRunParamService; +import com.maibu.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + @RestController @RequestMapping("/iot/deviceRunParam") public class DeviceRunParamController extends BaseController { diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/WorkRecordController.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/WorkRecordController.java index 3d105f2..a526c55 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/WorkRecordController.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/WorkRecordController.java @@ -1,28 +1,20 @@ package com.maibu.controller; +import com.maibu.core.business.WorkRecord; +import com.maibu.core.controller.BaseController; +import com.maibu.core.domain.AjaxResult; +import com.maibu.core.domain.R; +import com.maibu.memory.GlobalMemory; +import com.maibu.service.impl.WorkRecordService; +import com.maibu.utils.MinioUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + import java.io.InputStream; import java.util.List; -import com.maibu.core.domain.AjaxResult; -import com.maibu.memory.GlobalMemory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.maibu.core.business.WorkRecord; -import com.maibu.core.business.path.LatAndLngEntity; -import com.maibu.core.controller.BaseController; -import com.maibu.core.domain.R; -import com.maibu.service.impl.WorkRecordService; -import com.maibu.utils.MinioUtil; - @RestController @RequestMapping("/iot/workRecord") public class WorkRecordController extends BaseController { diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceOtaService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceOtaService.java index 82f97da..c55f992 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceOtaService.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceOtaService.java @@ -1,7 +1,6 @@ package com.maibu.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.maibu.core.business.device.NettyDevice; import com.maibu.core.domain.AjaxResult; import com.maibu.core.enums.OtaOperate; diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordService.java index 2293e73..2bc2fe0 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordService.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordService.java @@ -3,7 +3,6 @@ package com.maibu.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.maibu.core.business.DevicePlanTask; import com.maibu.core.business.WorkRecord; -import com.maibu.core.business.path.LatAndLngEntity; import com.maibu.mapper.DevicePlanTaskMapper; import com.maibu.mapper.WorkRecordMapper; import org.springframework.beans.factory.annotation.Autowired;