Skip to content

M
map-parent
Commit ef2220e7 by yangyang
Options

任务相关处理(标准)

parent 211ec8fd
Showing with 91 additions and 46 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkTrailParam.java
......@@ -22,6 +22,10 @@ public class SkTrailParam {
*/
private String likeValue;
/**
* yssj走演示数据
*/
private String likeType;
/**
* 开始时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
......@@ -151,7 +151,35 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
case "qypz_people":
// 获取任务结果 阿里云读取json线上读取接口
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;//区域碰撞手机
break;
case "qypz_ljxc":
// 路径寻车
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "qypz_skhz":
// 时空绘制
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "qypz_clafqt":
// 车辆案发潜逃
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "qypz_clsccx":
// 车辆首次出现
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "qypz_ryaqcd":
// 人员案前踩点
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "qypz_rysccx":
// 人员首次出现
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "qypz_ryafqt":
// 人员案发潜逃
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
break;
case "skph_people":
// 获取任务结果 阿里云读取json线上读取接口
listResult = skRegionalsResultService.OneAreaInfoTrampResultThread(params,taskType);
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java
......@@ -181,55 +181,40 @@ public class SkTrailController extends ApiController implements ExcelControllerI
@ApiOperation(value = "查询轨迹列表信息")
@OperLog(message = "查询轨迹列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkTrailParam sktrailParam) {
//分页
Page page = new Page(sktrailParam.getPage(), sktrailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
queryWrapper.select("objectValue","objectType","objectName");
if (sktrailParam.getLikeField() != null && !sktrailParam.getLikeField().equals("")) {
queryWrapper.eq("objectType", sktrailParam.getLikeField());
}
if (sktrailParam.getLikeValue() != null && !sktrailParam.getLikeValue().equals("")) {
queryWrapper.like("objectValue", sktrailParam.getLikeValue());
}
//时间
if (sktrailParam.getKssj() != null && !sktrailParam.getKssj().equals("")) {
queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getKssj());
}
if (sktrailParam.getJssj() != null && !sktrailParam.getJssj().equals("")) {
queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getJssj());
}
List<SkTrailVO> list = new ArrayList<>();
if("yssj".equals(sktrailParam.getLikeType())){
//分页
Page page = new Page(sktrailParam.getPage(), sktrailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
queryWrapper.select("objectValue","objectType","objectName","date");
if (sktrailParam.getLikeField() != null && !sktrailParam.getLikeField().equals("")) {
queryWrapper.eq("objectType", sktrailParam.getLikeField());
}
if (sktrailParam.getLikeValue() != null && !sktrailParam.getLikeValue().equals("")) {
queryWrapper.like("objectValue", sktrailParam.getLikeValue());
}
//时间
if (sktrailParam.getKssj() != null && !sktrailParam.getKssj().equals("")) {
queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getKssj());
}
if (sktrailParam.getJssj() != null && !sktrailParam.getJssj().equals("")) {
queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getJssj());
}
queryWrapper.groupBy("objectValue");
queryWrapper.groupBy("objectType");
queryWrapper.groupBy("objectName");
queryWrapper.groupBy("objectValue");
queryWrapper.groupBy("objectType");
queryWrapper.groupBy("objectName");
IPage page1 = skTrailService.page(page, queryWrapper);
List<SkTrail> records = page1.getRecords();
SimpleDateFormat sf = new SimpleDateFormat();
records.sort(new Comparator<SkTrail>() {
@Override
public int compare(SkTrail o1, SkTrail o2) {
try {
long date1 = sf.parse(o1.getDate()).getTime();
long date2 = sf.parse(o2.getDate()).getTime();
if(date1 > date2){
return -1;
}else{
return 1;
}
} catch (ParseException e) {
e.printStackTrace();
}
return 0;
IPage page1 = skTrailService.page(page, queryWrapper);
List<SkTrail> records = page1.getRecords();
list = new ArrayList<>();
for (SkTrail skTrail : records) {
list.add(new SkTrailVO(skTrail, findByBh(skTrail.getObjectvalue(),skTrail.getObjecttype())));
}
});
List<SkTrailVO> list = new ArrayList<>();
for (SkTrail skTrail : records) {
list.add(new SkTrailVO(skTrail, findByBh(skTrail.getObjectvalue(),skTrail.getObjecttype())));
return new MapRestResult(200, "OK", page1.getTotal(), list);
}
return new MapRestResult(200, "OK", page1.getTotal(), list);
return new MapRestResult(200, "OK", 0, "");
}
@PostMapping("queryTj")
......
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
......@@ -230,6 +230,34 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = phoneall(receiving);
break;//区域碰撞手机
case "qypz_ljxc":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = carall(receiving);
break;//区域碰撞车辆
case "qypz_skhz":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = phoneall(receiving);
break;//区域碰撞手机
case "qypz_clafqt":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = carall(receiving);
break;//区域碰撞车辆
case "qypz_clsccx":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = carall(receiving);
break;//区域碰撞车辆
case "qypz_ryaqcd":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = phoneall(receiving);
break;//区域碰撞手机
case "qypz_rysccx":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = phoneall(receiving);
break;//区域碰撞手机
case "qypz_ryafqt":
// 获取回溯结果 阿里云读取json线上读取接口
carOrPhoneInfolist = phoneall(receiving);
break;//区域碰撞手机
case "skph_car":
// 获取徘徊结果 阿里云读取json线上读取接口
carOrPhoneInfolist = carall(receiving);
......
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