From 65735149371ae16753adbfb3fb939b01a670b516 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 23 Nov 2023 10:43:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VehiclePositionDevController.java         |  5 ++--
 .../service/IVehiclePositionDevService.java   |  4 ++++
 .../impl/VehiclePositionDataServiceImpl.java  |  3 +++
 .../impl/VehiclePositionDevServiceImpl.java   | 24 ++++++++++++++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java
index f17988c3e..c6c2ffec6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java
@@ -87,8 +87,7 @@ public class VehiclePositionDevController {
     @ApiOperation(value = "添加车辆（人员）定位-设备信息", notes = "添加车辆（人员）定位-设备信息", httpMethod = "POST")
     @PostMapping(value = "/add")
     public Result<VehiclePositionDev> add(@RequestBody VehiclePositionDev vehiclePositionDev) {
-        vehiclePositionDev.setId(null);
-        vehiclePositionDevService.save(vehiclePositionDev);
+        vehiclePositionDevService.add(vehiclePositionDev);
         return Result.ok();
     }
 
@@ -101,7 +100,7 @@ public class VehiclePositionDevController {
     @ApiOperation(value = "编辑车辆（人员）定位-设备信息", notes = "编辑车辆（人员）定位-设备信息", httpMethod = "POST")
     @PostMapping(value = "/edit")
     public Result<VehiclePositionDev> edit(@RequestBody VehiclePositionDev vehiclePositionDev) {
-        vehiclePositionDevService.updateById(vehiclePositionDev);
+        vehiclePositionDevService.edit(vehiclePositionDev);
         return Result.ok();
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java
index ab726cfe7..6b3916de4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java
@@ -21,4 +21,8 @@ public interface IVehiclePositionDevService extends IService<VehiclePositionDev>
     List<VehiclePositionDev> queryList(HashMap<String, Object> paramMap);
 
     CountVehiclePositionDevVo countVehiclePositionDev(HashMap<String, Object> paramMap);
+
+    void add(VehiclePositionDev vehiclePositionDev);
+
+    void edit(VehiclePositionDev vehiclePositionDev);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java
index de89e316c..4ffd4f59b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDataServiceImpl.java
@@ -18,6 +18,7 @@ import com.zhgd.xmgl.util.RefUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -57,6 +58,8 @@ public class VehiclePositionDataServiceImpl extends ServiceImpl<VehiclePositionD
         if (dev == null) {
             throw new OpenAlertException("设备不存在");
         }
+        dev.setHeartbeatTime(new Date());
+        vehiclePositionDevMapper.updateById(dev);
         vehiclePositionData.setProjectSn(dev.getProjectSn());
         save(vehiclePositionData);
         //是否超过围栏而报警
diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java
index 96864911f..baeccc410 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java
@@ -2,10 +2,12 @@ package com.zhgd.xmgl.modules.vehicleposition.service.impl;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev;
 import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo;
@@ -17,7 +19,6 @@ import com.zhgd.xmgl.util.RefUtil;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import reactor.core.publisher.Mono;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -54,6 +55,27 @@ public class VehiclePositionDevServiceImpl extends ServiceImpl<VehiclePositionDe
         return baseMapper.countVehiclePositionDev(paramMap);
     }
 
+    @Override
+    public void add(VehiclePositionDev vehiclePositionDev) {
+        vehiclePositionDev.setId(null);
+        VehiclePositionDev dev = baseMapper.selectOne(new LambdaQueryWrapper<VehiclePositionDev>().eq(VehiclePositionDev::getDevSn, vehiclePositionDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编号已存在");
+        }
+        save(vehiclePositionDev);
+    }
+
+    @Override
+    public void edit(VehiclePositionDev vehiclePositionDev) {
+        VehiclePositionDev dev = baseMapper.selectOne(new LambdaQueryWrapper<VehiclePositionDev>()
+                .eq(VehiclePositionDev::getDevSn, vehiclePositionDev.getDevSn())
+                .ne(VehiclePositionDev::getId, vehiclePositionDev.getId()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编号已存在");
+        }
+        updateById(vehiclePositionDev);
+    }
+
     private QueryWrapper<VehiclePositionDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         String alias = "vpd.";
         QueryWrapper<VehiclePositionDev> queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionDev.class, paramMap, alias);