Commit b8b1f6c7 by 刘亚鑫

设置跨域,车辆轨迹加分页

parent 3ad31488
...@@ -6,6 +6,24 @@ public class CarTranslateParams { ...@@ -6,6 +6,24 @@ public class CarTranslateParams {
private String objectValue; private String objectValue;
private String kssj; private String kssj;
private String jssj; private String jssj;
private int page;
private int pageNo;
public int getPage() {
return page;
}
public void setPage(int page) {
this.page = page;
}
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getObjectValue() { public String getObjectValue() {
return objectValue; return objectValue;
......
package com.founder.servicebase.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* Created by admin on 2021/5/13.
*/
@Configuration
public class CorsConfig implements WebMvcConfigurer{
@Override
public void addCorsMappings(CorsRegistry registry){
registry.addMapping("/**")
.allowedOrigins("*")
.allowCredentials(true)
.allowedMethods("GET","POST","DELETE","PUT","OPTIONS")
.maxAge(3600);
}
}
...@@ -34,7 +34,7 @@ public class CarController { ...@@ -34,7 +34,7 @@ public class CarController {
@PostMapping(value = "/CarTranslate") @PostMapping(value = "/CarTranslate")
public MapRestResult getCarTranslate(@RequestBody CarTranslateParams carTranslateParams) { public MapRestResult getCarTranslate(@RequestBody CarTranslateParams carTranslateParams) {
long startTime=new Date().getTime(); long startTime=new Date().getTime();
MapRestResult result=carService.getCarTranslate(carTranslateParams.getObjectValue(),carTranslateParams.getKssj(),carTranslateParams.getJssj()); MapRestResult result=carService.getCarTranslate(carTranslateParams);
long endTime=new Date().getTime(); long endTime=new Date().getTime();
long timeDiffer=endTime-startTime; long timeDiffer=endTime-startTime;
System.out.println("车辆轨迹**请求时长**********"+timeDiffer+"毫秒"); System.out.println("车辆轨迹**请求时长**********"+timeDiffer+"毫秒");
......
...@@ -17,7 +17,7 @@ public interface CarService { ...@@ -17,7 +17,7 @@ public interface CarService {
MapRestResult selectKkXx(String qsjd, String qswd, String jsjd, String jswd); MapRestResult selectKkXx(String qsjd, String qswd, String jsjd, String jswd);
MapRestResult getCarTranslate(String objectValue, String kssj, String jssj); MapRestResult getCarTranslate(CarTranslateParams carTranslateParams);
MapRestResult carOneAreaIAnalysis(CarOneAreaIAnalysisSearchParam carOneAreaIAnalysisSearchParam); MapRestResult carOneAreaIAnalysis(CarOneAreaIAnalysisSearchParam carOneAreaIAnalysisSearchParam);
...@@ -35,5 +35,5 @@ public interface CarService { ...@@ -35,5 +35,5 @@ public interface CarService {
MapRestResult getTrackYshdqy(TrackYsModelCondition track); MapRestResult getTrackYshdqy(TrackYsModelCondition track);
MapRestResult OneAreaInfoTrampResultThread (AreaInfo areaInfo) throws Exception; MapRestResult OneAreaInfoTrampResultThread(AreaInfo areaInfo) throws Exception;
} }
...@@ -7,20 +7,11 @@ import com.founder.carapi.mapper.CarInfoMapper; ...@@ -7,20 +7,11 @@ import com.founder.carapi.mapper.CarInfoMapper;
import com.founder.carapi.mapper.RegInfoMapper; import com.founder.carapi.mapper.RegInfoMapper;
import com.founder.carapi.service.CarService; import com.founder.carapi.service.CarService;
import com.founder.commonutils.carEntity.*; import com.founder.commonutils.carEntity.*;
import com.founder.commonutils.carEntity.AreaInfo;
import com.founder.commonutils.carEntity.RegionalsDetail;
import com.founder.commonutils.carEntity.RegionalsPerson;
import com.founder.commonutils.carEntity.RegionalsResult;
import com.founder.commonutils.carEntity.RegionalsTask;
import com.founder.commonutils.carEntity.TbStRegionalstaskresult;
import com.founder.commonutils.carEntity.reslutFl;
import com.founder.commonutils.peopleEntity.*;
import com.founder.commonutils.publicEntity.MapRestResult; import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.DataUtil; import com.founder.commonutils.util.DataUtil;
import com.founder.commonutils.util.KeyUtil; import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.StringUtil; import com.founder.commonutils.util.StringUtil;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.DateUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
...@@ -68,7 +59,11 @@ public class CarServiceImpl implements CarService { ...@@ -68,7 +59,11 @@ public class CarServiceImpl implements CarService {
* 车轨 * 车轨
* @return * @return
*/ */
public MapRestResult getCarTranslate(String objectValue, String kssj, String jssj) { public MapRestResult getCarTranslate(CarTranslateParams carTranslateParams) {
String objectValue=carTranslateParams.getObjectValue();
String kssj=carTranslateParams.getKssj();
String jssj=carTranslateParams.getJssj();
//循环请求 //循环请求
Boolean flag=true; Boolean flag=true;
int page = 1; int page = 1;
...@@ -137,7 +132,20 @@ public class CarServiceImpl implements CarService { ...@@ -137,7 +132,20 @@ public class CarServiceImpl implements CarService {
++page; ++page;
} }
} }
return MapRestResult.build(200,"成功获取车辆轨迹",carList.size(),carList); int total=carList.size();
List list=new ArrayList();
list=carList;
if(carTranslateParams.getPage()!=0&&carTranslateParams.getPageNo()!=0){
int a=carTranslateParams.getPageNo()*(carTranslateParams.getPage()-1);
int b=a+carTranslateParams.getPageNo();
if(carList.size()>a&&carList.size()>b) {
list = carList.subList(a, b);
}else if(carList.size()>a&&carList.size()<b){
list = carList.subList(a, carList.size());
}
}
return MapRestResult.build(200,"成功获取车辆轨迹",total,list);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment