|
|
@ -33,6 +33,10 @@ public class DeviceDataController { |
|
|
@GetMapping(value = "/getShengDiLanHistory") |
|
|
@GetMapping(value = "/getShengDiLanHistory") |
|
|
public Result getHistoryData(@RequestParam(name = "uid", required = false) String uid, @RequestParam(name = "pageNo", required = false) Integer pageNo, @RequestParam(name = "pageSize", required = false) Integer pageSize, @RequestParam(name = "startTime", required = false) String startTime, @RequestParam(name = "endTime", required = false) String endTime, @RequestParam(name = "imei") String imei) throws ParseException, BindException { |
|
|
public Result getHistoryData(@RequestParam(name = "uid", required = false) String uid, @RequestParam(name = "pageNo", required = false) Integer pageNo, @RequestParam(name = "pageSize", required = false) Integer pageSize, @RequestParam(name = "startTime", required = false) String startTime, @RequestParam(name = "endTime", required = false) String endTime, @RequestParam(name = "imei") String imei) throws ParseException, BindException { |
|
|
List<DeviceHistoryVo> list = new ArrayList<>(); |
|
|
List<DeviceHistoryVo> list = new ArrayList<>(); |
|
|
|
|
|
if(imei!=null&&!imei.equals("")){ |
|
|
|
|
|
//将设备号转成全小写 |
|
|
|
|
|
imei = imei.toLowerCase(); |
|
|
|
|
|
} |
|
|
list = deviceDataService.getDeviceHistoryData(uid, pageNo, pageSize, startTime, endTime, imei); |
|
|
list = deviceDataService.getDeviceHistoryData(uid, pageNo, pageSize, startTime, endTime, imei); |
|
|
Map<String, Object> map = Result.returnPageMap(list); |
|
|
Map<String, Object> map = Result.returnPageMap(list); |
|
|
return Result.success(map); |
|
|
return Result.success(map); |
|
|
|