From 59c308668ac19b2b0cf0049e28395f1104ebd7f3 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 2 Sep 2024 17:16:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/iot/receive/ReceiveController.java  |  2 +-
 .../main/java/com/ruoyi/system/task/EtTask.java    | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
index 05edb1a..7b3072a 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
@@ -345,7 +345,7 @@ public class ReceiveController {
                     device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
                     int updateAsDevice = asDeviceService.updateAsDevice(device);
                     if (updateAsDevice > 0) {
-                        log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn());
+                        log.info("超出营运区断电命令--更新设备锁状态成功SN：" + device.getSn());
                     }
                 }
             }
diff --git a/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java b/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
index 8058890..e1920f7 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
@@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.constant.CacheConstants;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.ServiceConstants;
 import com.ruoyi.common.core.domain.entity.AsUser;
@@ -17,7 +17,6 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.map.GeoUtils;
 import com.ruoyi.common.utils.map.GpsCoordinateUtils;
 import com.ruoyi.common.utils.onenet.LogEntry;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.*;
@@ -85,26 +84,17 @@ public class EtTask {
     @Resource
     private AsUserMapper asUserMapper;
 
-    @Autowired
-    private CallbackService callbackService;
-
     @Resource
     private EtLocationLogMapper etLocationLogMapper;
 
     @Autowired
     private IAsDeviceService deviceService;
 
-    private IEtOnlineLogService etOnlineLogService;
-
-    @Resource
-    private IAsDeviceService asDeviceService;
 
     @Autowired
     private IEtModelService etModelService;
 
 
-
-
     /**
      * 1.启动时判断是否有未取消预约的订单
      * 2.判断已完成的订单未退还押金的
@@ -626,7 +616,7 @@ public class EtTask {
             device.setGps("0");
             device.setSatellites(0);
         }
-        int i = asDeviceService.updateLocation(device);
+        int i = deviceService.updateLocation(device);
         if(i>0){
             log.info("===============更新设备信息成功===========>" + logEntry.getDevName());
         }