qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-09-02 17:16:26 +08:00
parent df9c586af9
commit 59c308668a
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
View File

@ -345,7 +345,7 @@ public class ReceiveController {
device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
int updateAsDevice = asDeviceService.updateAsDevice(device); int updateAsDevice = asDeviceService.updateAsDevice(device);
if (updateAsDevice > 0) { if (updateAsDevice > 0) {
log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn()); log.info("超出营运区断电命令--更新设备锁状态成功SN：" + device.getSn());
} }
} }
} }

14
electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
View File

@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.constant.CacheConstants;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.Constants;
import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.constant.ServiceConstants;
import com.ruoyi.common.core.domain.entity.AsUser; 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.GeoUtils;
import com.ruoyi.common.utils.map.GpsCoordinateUtils; import com.ruoyi.common.utils.map.GpsCoordinateUtils;
import com.ruoyi.common.utils.onenet.LogEntry; import com.ruoyi.common.utils.onenet.LogEntry;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.*; import com.ruoyi.system.mapper.*;
@ -85,26 +84,17 @@ public class EtTask {
@Resource @Resource
private AsUserMapper asUserMapper; private AsUserMapper asUserMapper;
@Autowired
private CallbackService callbackService;
@Resource @Resource
private EtLocationLogMapper etLocationLogMapper; private EtLocationLogMapper etLocationLogMapper;
@Autowired @Autowired
private IAsDeviceService deviceService; private IAsDeviceService deviceService;
private IEtOnlineLogService etOnlineLogService;
@Resource
private IAsDeviceService asDeviceService;
@Autowired @Autowired
private IEtModelService etModelService; private IEtModelService etModelService;
/** /**
* 1.启动时判断是否有未取消预约的订单 * 1.启动时判断是否有未取消预约的订单
* 2.判断已完成的订单未退还押金的 * 2.判断已完成的订单未退还押金的
@ -626,7 +616,7 @@ public class EtTask {
device.setGps("0"); device.setGps("0");
device.setSatellites(0); device.setSatellites(0);
} }
int i = asDeviceService.updateLocation(device); int i = deviceService.updateLocation(device);
if(i>0){ if(i>0){
log.info("===============更新设备信息成功===========>" + logEntry.getDevName()); log.info("===============更新设备信息成功===========>" + logEntry.getDevName());
} }