From fe00bd73112adcc10ce8bbbe00d915c7f9d91969 Mon Sep 17 00:00:00 2001 From: luyya Date: Thu, 17 Jul 2025 17:07:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E5=9F=8E=E5=AF=BC=E5=85=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E5=92=8Credis=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=8E=E7=9B=91=E5=90=AC=E5=A4=B1=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data2es/service/impl/GpsServiceImpl.java | 13 ++++++++++--- .../dromara/system/domain/vo/TDeviceExportVo.java | 12 ++++++------ .../system/listener/TDeviceImportListener.java | 12 +++++++++--- .../org/dromara/system/service/ITDeviceService.java | 2 +- .../system/service/impl/TDeviceServiceImpl.java | 7 ++++--- .../resources/mapper/system/DeviceRedisMapper.xml | 1 - .../main/resources/mapper/system/TDeviceMapper.xml | 2 +- .../webscoket/schedule/DeviceStatusSchedule.java | 3 +++ 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java index 30c4dacb..a86e5ac5 100644 --- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java @@ -169,7 +169,7 @@ public class GpsServiceImpl implements IGpsService { @Override public R updateOnlineStatusBatch(List list) { - logger.error("下线设备数量={}",list.size()); + logger.error("记录仪状态修改设备数量={}",list.size()); int num = 0; for (EsGpsInfo originEsGpsInfo : list) { String deviceCode = originEsGpsInfo.getDeviceCode(); @@ -177,8 +177,14 @@ public class GpsServiceImpl implements IGpsService { // DeviceEntityV2 de = deviceService.checkDeviceExists(info); JSONObject o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType+":" + deviceCode); if (Objects.isNull(o)) { - logger.error("redis中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode); - continue; + + if ("5".equals(deviceType) || "7".equals(deviceType) || "8".equals(deviceType)){ + logger.error("记录仪设备不在online_users中，deviceCode={},deviceType={}",deviceCode,deviceType); + o = JSONUtil.parseObj(originEsGpsInfo); + }else { + logger.error("redis中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode); + continue; + } } EsGpsInfoVO2 esGpsInfoVO2 = JSONUtil.toBean(o, EsGpsInfoVO2.class); //更新在线状态和时间，经纬度不变 @@ -204,6 +210,7 @@ public class GpsServiceImpl implements IGpsService { num++; // storeDataService.saveDataByPersonType(esGpsInfo); } catch (Exception e) { + e.printStackTrace(); num--; logger.error(e.getMessage()); // return response.error(500,e.getMessage()); diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java index 22793e2c..b30979dd 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java @@ -22,7 +22,7 @@ public class TDeviceExportVo implements Serializable { /** * 设备类型 */ - @ExcelProperty(value = "设备类型") + @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "zd_device_type") private String deviceType; @@ -41,28 +41,28 @@ public class TDeviceExportVo implements Serializable { /** * 警号（若有） */ - @ExcelProperty(value = "警号", converter = ExcelDictConvert.class) + @ExcelProperty(value = "警号") private String policeNo; /** * 姓名（若有） */ - @ExcelProperty(value = "警员姓名", converter = ExcelDictConvert.class) + @ExcelProperty(value = "警员姓名") private String policeName; /** * 联系电话（若有） */ - @ExcelProperty(value = "电话号码", converter = ExcelDictConvert.class) + @ExcelProperty(value = "电话号码") private String phoneNum; /** * 车牌号（若有） */ - @ExcelProperty(value = "车牌号", converter = ExcelDictConvert.class) + @ExcelProperty(value = "车牌号") private String carNum; - @ExcelProperty(value = "证件号码", converter = ExcelDictConvert.class) + @ExcelProperty(value = "证件号码") private String cardNum; @ExcelProperty(value = "设备名称") diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java index 87162912..9ed86de5 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java @@ -1,6 +1,7 @@ package org.dromara.system.listener; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HtmlUtil; import com.alibaba.excel.context.AnalysisContext; @@ -15,6 +16,7 @@ import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.excel.core.ExcelListener; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.TDevice; import org.dromara.system.domain.bo.TDeviceBo; import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.TDeviceImportVo; @@ -22,6 +24,7 @@ import org.dromara.system.domain.vo.TDeviceVo; import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.ITDeviceService; +import java.util.Date; import java.util.List; @Slf4j @@ -53,7 +56,7 @@ public class TDeviceImportListener extends AnalysisEventListener").append(successNum).append("、设备 ").append(deviceBo.getDeviceCode()).append(" 导入成功"); @@ -71,11 +76,12 @@ public class TDeviceImportListener extends AnalysisEventListener").append(successNum).append("、设备 ").append(deviceImportVo.getDeviceCode()).append(" 更新成功"); diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java index cc66f87c..38825c71 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java @@ -82,7 +82,7 @@ public interface ITDeviceService { R saveDeviceToSt(String infoSource,List list); - TDeviceVo queryByDeviceCode(String deviceCode); + TDevice queryByDeviceCode(String deviceCode); List selectDeviceExportList(TDeviceBo bo); diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java index cffe24c0..f6e44c31 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java @@ -84,7 +84,7 @@ public class TDeviceServiceImpl implements ITDeviceService { // bo.setValid(1); LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectPageDevicetList(pageQuery.build(), lqw); - List list = result.getRecords(); +// List list = result.getRecords(); /*for (TDeviceVo vo : list) { if ("".equals(vo.getPoliceName()) || null == vo.getPoliceName()){ vo.setDeviceName(vo.getCarNum()); @@ -410,10 +410,11 @@ public class TDeviceServiceImpl implements ITDeviceService { } @Override - public TDeviceVo queryByDeviceCode(String deviceCode) { + public TDevice queryByDeviceCode(String deviceCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("device_code", deviceCode); - TDeviceVo vo = baseMapper.selectVoOne(queryWrapper); + queryWrapper.last("order by update_time desc limit 1"); + TDevice vo = baseMapper.selectOne(queryWrapper); return vo; } } diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml index aa66df48..a004ee11 100644 --- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml +++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml @@ -17,7 +17,6 @@ ) ON DUPLICATE KEY UPDATE - device_type = VALUES(device_type), online = VALUES(online), zzjgdm = VALUES(zzjgdm) diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml index c4df6384..e8e75801 100644 --- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml +++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml @@ -28,7 +28,7 @@