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-08-26 17:36:53 +08:00
parent 073305c702
commit fe1f04a37a
2 changed files with 3 additions and 2 deletions
electripper-system/src/main/java/com/ruoyi/system/service
IAsDeviceService.java
impl
AsDeviceServiceImpl.java

2
electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java
View File

@ -143,7 +143,7 @@ public interface IAsDeviceService extends IService<AsDevice>
/** /**
* 更新设备 * 更新设备
* *
* @param deviceIds 需要更新设备的设备主键集合 * @param sn 需要更新设备的设备主键集合
* @return 结果 * @return 结果
*/ */
int refreshDeviceBySn(String sn); int refreshDeviceBySn(String sn);

3
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -2610,7 +2610,8 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, order.getReturnTime()); endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, order.getReturnTime());
} }
String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, order.getUnlockTime()); String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, order.getUnlockTime());
List<EtLocationLog> etLocationLogs = etLocationLogMapper.selectEtLocationLogListByCreateTime(order.getDeviceMac(), startTime, endTime); AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn());
List<EtLocationLog> etLocationLogs = etLocationLogMapper.selectEtLocationLogListByCreateTime(device.getMac(), startTime, endTime);
// 将etLocationLogs中的longitude和latitude 转换成 [[120.2534,27.1048],[120.2556,27.1051],[120.2569,27.1057]] 这样的格式 // 将etLocationLogs中的longitude和latitude 转换成 [[120.2534,27.1048],[120.2556,27.1051],[120.2569,27.1057]] 这样的格式
List<double[]> coordinatesList = new ArrayList<>(); List<double[]> coordinatesList = new ArrayList<>();