From dfb5d8ac658e3aa498f06bc54263e1faafa81338 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Sat, 30 Aug 2025 13:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E7=8A=B6=E6=80=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/domain/dto/AppRealTimeStatusDto.java | 2 +- .../device/DeviceControlCenterController.java | 3 +-- .../web/service/device/DeviceBizService.java | 10 +++++++--- .../device/status/FunctionAccessBatchStatusRule.java | 2 +- .../device/status/FunctionAccessStatusRule.java | 2 +- .../equipment/domain/dto/InstructionRecordDto.java | 6 ++++++ .../equipment/domain/query/DeviceQueryCriteria.java | 2 ++ .../equipment/domain/vo/LocationHistoryDetailVo.java | 2 +- .../resources/mapper/equipment/DeviceLogMapper.xml | 3 +++ .../main/resources/mapper/equipment/DeviceMapper.xml | 10 ++++++++-- 10 files changed, 31 insertions(+), 11 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppRealTimeStatusDto.java b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppRealTimeStatusDto.java index 01a13d3a..c9275040 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppRealTimeStatusDto.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppRealTimeStatusDto.java @@ -14,7 +14,7 @@ public class AppRealTimeStatusDto { private String deviceImei; /** - * 设备类型 + * 获取实时状态类型：FunctionAccessBatchStatusRule 批量 ，FunctionAccessStatusRule 单个 */ private String typeName; diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java index 954fb510..64f395ec 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java @@ -1,6 +1,5 @@ package com.fuyuanshen.web.controller.device; -import com.alibaba.fastjson2.JSONObject; import com.fuyuanshen.app.domain.dto.APPReNameDTO; import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto; import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo; @@ -142,7 +141,7 @@ public class DeviceControlCenterController extends BaseController { } /** - * 历史轨迹导出 + * 历史轨迹播放 */ @GetMapping("/getLocationHistoryDetail") public R> getLocationHistoryDetail(Long id) { diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java index 0b02d7c7..21cf14eb 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java @@ -1,6 +1,7 @@ package com.fuyuanshen.web.service.device; import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -310,8 +311,8 @@ public class DeviceBizService { public Map getRealTimeStatus(AppRealTimeStatusDto statusDto) { try { - String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode(); - DeviceStatusRule rule = realTimeStatusEngine.getDeviceStatusRule(commandType); +// String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode();"FunctionAccessBatchStatusRule" + DeviceStatusRule rule = realTimeStatusEngine.getDeviceStatusRule(statusDto.getTypeName()); if(rule == null){ throw new ServiceException("未匹配到处理命令"); } @@ -382,11 +383,14 @@ public class DeviceBizService { detailVo.setDeviceName(device.getDeviceName()); detailVo.setStartLocation(entry.getValue().get(0).getString("address")); detailVo.setEndLocation(entry.getValue().get(entry.getValue().size()-1).getString("address")); - detailVo.setDetailList(entry.getValue()); + String jsonString = JSONArray.toJSONString(entry.getValue()); + List strings = JSONArray.parseArray(jsonString); + detailVo.setDetailList(strings); result.add(detailVo); } return result; } + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessBatchStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessBatchStatusRule.java index 116b5c91..3bc4ada9 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessBatchStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessBatchStatusRule.java @@ -22,7 +22,7 @@ import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCES public class FunctionAccessBatchStatusRule implements DeviceStatusRule { @Override public String getCommandType() { - return DeviceTypeConstants.TYPE_BJQ6170+"_2"; + return "FunctionAccessBatchStatusRule"; } @Override diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessStatusRule.java index 6b6f094d..c1be3771 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessStatusRule.java @@ -21,7 +21,7 @@ import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCES public class FunctionAccessStatusRule implements DeviceStatusRule { @Override public String getCommandType() { - return DeviceTypeConstants.TYPE_BJQ6170+"_1"; + return "FunctionAccessStatusRule"; } @Override diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/InstructionRecordDto.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/InstructionRecordDto.java index ad711656..42f5c7ee 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/InstructionRecordDto.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/InstructionRecordDto.java @@ -20,6 +20,12 @@ public class InstructionRecordDto { * 设备IMEI */ private String deviceImei; + + /** + * content + */ + private String content; + /** * 操作时间-开始时间 */ diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java index b9643d6c..0e32c344 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java @@ -113,4 +113,6 @@ public class DeviceQueryCriteria extends BaseEntity { */ private String area; + private String content; + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java index cf499741..3ae7cfbc 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java @@ -36,6 +36,6 @@ public class LocationHistoryDetailVo { * 轨迹详情 */ @ExcelProperty(value = "轨迹详情") - private List detailList; + private List detailList; } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml index e825f13f..e0946b8a 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml @@ -28,6 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND b.device_imei = #{bo.deviceImei} + + AND b.device_imei = #{bo.content} or b.device_mac = #{bo.content} + AND a.create_time =]]> #{bo.startTime} diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index d12a65c4..2d7b4780 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -257,8 +257,11 @@ and d.device_name like concat('%', #{criteria.deviceName}, '%') - - and (d.device_imei = #{criteria.deviceImei} or d.device_mac = #{criteria.deviceImei}) + + and (d.device_imei = #{criteria.deviceImei} + + + AND d.device_imei = #{criteria.content} or d.device_mac = #{criteria.content} and d.device_status = #{criteria.deviceStatus} @@ -289,6 +292,9 @@ AND a.device_imei = #{bo.deviceImei} + + AND a.device_imei = #{bo.content} or a.device_mac = #{bo.content} + AND a.create_time =]]> #{bo.startTime}