diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java index da83835..cadd940 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_admin.controller; +import cn.hutool.core.date.DateTime; import com.shxy.xymanager_common.annotation.Log; import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; @@ -60,8 +61,8 @@ public class TerminalGPSController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getTermGPSPosition") @Log(title = "获取GPS位置触发", type = "查询") - public ResponseReult getReturnedTermGPS(@RequestBody @Validated TerminalGpsVo vo) { - ServiceBody serviceBody = terminalGpsService.getReturnedGPS(vo); + public ResponseReult getReturnedTermGPS(@RequestBody @Validated TerminalGpsVo vo) { + ServiceBody serviceBody = terminalGpsService.getReturnedGPS(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalGpsModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalGpsModel.java index ba4c416..8519ea5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalGpsModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalGpsModel.java @@ -34,4 +34,7 @@ public class TerminalGpsModel implements Serializable { @ApiModelProperty(value = "请求时间", example = "123456") private DateTime queryTime; + @ApiModelProperty(value = "是否最新", example = "123456") + private Boolean hasNew; + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java index dacb1bd..eb6b2fe 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_common.vo; +import cn.hutool.core.date.DateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,4 +18,7 @@ public class TerminalIdVo { @ApiModelProperty(value = "图像监测装置 ID", example = "123455") private String cmdId; + + @ApiModelProperty(value = "请求实际", example = "123455") + private DateTime queryTime; } diff --git a/xymanager_framework/pom.xml b/xymanager_framework/pom.xml index 42c808c..10efe45 100644 --- a/xymanager_framework/pom.xml +++ b/xymanager_framework/pom.xml @@ -47,11 +47,6 @@ - - - - - diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java index aa6f7dd..061646a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java @@ -107,8 +107,10 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { DateTime now = DateTime.now(); TerminalPositions bean = terminalPositionsDao.selectByPrimaryKey(vo.getTermid()); - + Boolean hasNew = false; if (!BeanUtil.isEmpty(bean)) { + + model.setRadius(bean.getRadius()); model.setLongitude(bean.getLongitude()); model.setLatitude(bean.getLatitude()); @@ -116,6 +118,9 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { model.setQueryTime(now); BigInteger updatetime = MyDateUtils.TimeSecond2MillSecond(bean.getUpdateTime().longValue()); model.setUpdatetime(MyDateUtils.date(updatetime.longValue())); + BigInteger queryTime = MyDateUtils.TimeMillSecond2Second(vo.getQueryTime()); + hasNew = updatetime.compareTo(queryTime) < 0 ? false : true; + model.setHasNew(hasNew); } if (null!=model) { return Asserts.success(model); @@ -126,14 +131,11 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { } @Override - public ServiceBody getReturnedGPS(TerminalGpsVo vo) { - GetModel model = new GetModel(); - int requestId = Constants.REQUEST_ID.addAndGet(1); - String cmd = Constants.CMD+"gpsinfo --flag=0 --cmdid="+vo.getCmdId()+ " --clientid=10 --reqid="+ requestId; + public ServiceBody getReturnedGPS(TerminalGpsVo vo) { + String cmd = Constants.CMD+"gpsinfo --flag=0 --cmdid="+vo.getCmdId()+ " --clientid=10"; ProcessExecUtils.exec(cmd); - model.setRequestId(requestId); - - return Asserts.success(model); + DateTime now = DateTime.now(); + return Asserts.success(now); } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalGpsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalGpsService.java index 1d87be9..3210164 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalGpsService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalGpsService.java @@ -1,9 +1,11 @@ package com.shxy.xymanager_service.service; +import cn.hutool.core.date.DateTime; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.GetModel; import com.shxy.xymanager_common.model.TerminalGpsModel; -import com.shxy.xymanager_common.vo.*; +import com.shxy.xymanager_common.vo.TerminalGpsVo; +import com.shxy.xymanager_common.vo.TerminalIdAndGpsVo; +import com.shxy.xymanager_common.vo.TerminalIdVo; /** * 设备Gps接口 @@ -27,6 +29,6 @@ public interface TerminalGpsService { */ ServiceBody getTermGPS(TerminalIdVo vo); - ServiceBody getReturnedGPS(TerminalGpsVo vo); + ServiceBody getReturnedGPS(TerminalGpsVo vo); }