@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping; | |||
import org.springframework.web.bind.annotation.RequestMapping; | |||
import org.springframework.web.bind.annotation.RestController; | |||
import java.math.BigInteger; | |||
/** | |||
* <p>地图统计数据</p> | |||
* | |||
@@ -38,7 +40,7 @@ public class StatisticsMapController { | |||
*/ | |||
@GetMapping("driverArea") | |||
@RequiresPermissions("statisticsMap:driverArea") | |||
public Response area(Integer driverArea,Integer type) { | |||
public Response area(BigInteger driverArea, Integer type) { | |||
return iStatisticsMapService.getDriversByDriverArea(driverArea, type); | |||
} | |||
@@ -2,28 +2,36 @@ package com.taauav.admin.service; | |||
import com.taauav.common.bean.Response; | |||
import java.math.BigInteger; | |||
/** | |||
* 地图统计接口 | |||
* | |||
* @author dyg | |||
* @date 2019.12.07 | |||
*/ | |||
public interface IStatisticsMapService { | |||
/** | |||
* 获取所有区域数据 | |||
* | |||
* @return | |||
*/ | |||
Response getIndexData(); | |||
/** | |||
* 根据区域编号获取河道数据 | |||
* | |||
* @param driverArea | |||
* @param type 1百度 2高德 | |||
* @param type 1百度 2高德 | |||
* @return | |||
*/ | |||
Response getDriversByDriverArea(Integer driverArea, Integer type); | |||
Response getDriversByDriverArea(BigInteger driverArea, Integer type); | |||
/** | |||
* 根据河道任务编号获取图片数据 | |||
* | |||
* @param inspectDriverId | |||
* @param type 1百度 2高德 | |||
* @param type 1百度 2高德 | |||
* @return | |||
*/ | |||
Response getFileListByInspectDriverId(Integer inspectDriverId, Integer type); |
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Value; | |||
import org.springframework.stereotype.Service; | |||
import org.springframework.util.StringUtils; | |||
import java.math.BigInteger; | |||
import java.util.ArrayList; | |||
import java.util.HashMap; | |||
import java.util.List; | |||
@@ -59,7 +60,7 @@ public class StatisticsMapServiceImpl implements IStatisticsMapService { | |||
* @return | |||
*/ | |||
@Override | |||
public Response getDriversByDriverArea(Integer driverArea,Integer type) { | |||
public Response getDriversByDriverArea(BigInteger driverArea, Integer type) { | |||
if (StringUtils.isEmpty(driverArea)) { | |||
return response.failure("区域编号不存在"); | |||
} |
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Value; | |||
import org.springframework.stereotype.Service; | |||
import org.springframework.util.StringUtils; | |||
import java.math.BigInteger; | |||
import java.time.LocalDateTime; | |||
import java.util.*; | |||
@@ -108,7 +109,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau | |||
map.put("status", status); | |||
} | |||
if (map.containsKey("driverArea") && !"".equals(map.get("driverArea"))) { | |||
map.put("driverArea", Integer.valueOf(map.get("driverArea").toString())); | |||
map.put("driverArea", BigInteger.valueOf(Long.valueOf(map.get("driverArea").toString()))); | |||
} else { | |||
map.remove("driverArea"); | |||
} |