Compare commits
No commits in common. "73ca957a7ce7a96a6c856ffa01b8584cfed5f6d5" and "212095bea9e3dd8bb8ec72ce6beadadd3c60aa15" have entirely different histories.
73ca957a7c
...
212095bea9
|
|
@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -31,7 +30,6 @@ import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iot设备管理实现层
|
* iot设备管理实现层
|
||||||
*
|
|
||||||
* @author ma_sh
|
* @author ma_sh
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
|
@ -285,7 +283,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取定位
|
* 获取定位
|
||||||
*
|
|
||||||
* @param iotDto
|
* @param iotDto
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -317,7 +314,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询行程
|
* 查询行程
|
||||||
*
|
|
||||||
* @param iotLocationVo
|
* @param iotLocationVo
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -346,7 +342,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询停留点
|
* 查询停留点
|
||||||
*
|
|
||||||
* @param iotLocationVo
|
* @param iotLocationVo
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -379,7 +374,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 解析停留点返回报文
|
* 解析停留点返回报文
|
||||||
*
|
|
||||||
* @param res
|
* @param res
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -402,8 +396,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
iotLocationVo.setBeginTime(jsonObject.getString("starttime"));
|
iotLocationVo.setBeginTime(jsonObject.getString("starttime"));
|
||||||
iotLocationVo.setEndTime(jsonObject.getString("endtime"));
|
iotLocationVo.setEndTime(jsonObject.getString("endtime"));
|
||||||
iotLocationVo.setAddress(jsonObject.getString("address"));
|
iotLocationVo.setAddress(jsonObject.getString("address"));
|
||||||
iotLocationVo.setCallat(new BigDecimal(jsonObject.getString("callat")));
|
|
||||||
iotLocationVo.setCallon(new BigDecimal(jsonObject.getString("callon")));
|
|
||||||
iotLocationVoList.add(iotLocationVo);
|
iotLocationVoList.add(iotLocationVo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -413,7 +405,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 绑定设备APP
|
* 绑定设备APP
|
||||||
*
|
|
||||||
* @param iotDto
|
* @param iotDto
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -454,7 +445,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 报警记录
|
* 报警记录
|
||||||
*
|
|
||||||
* @param iotLocationVo
|
* @param iotLocationVo
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -491,7 +481,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 解析报警返回报文
|
* 解析报警返回报文
|
||||||
*
|
|
||||||
* @param res
|
* @param res
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
@ -523,7 +512,6 @@ public class IotMachineServiceImpl implements IotMachineService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 解析定位返回报文
|
* 解析定位返回报文
|
||||||
*
|
|
||||||
* @param res
|
* @param res
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue