增加车辆，gps接口
This commit is contained in:
zhangyue
parent
0b0f3c1dcc
commit
f3be01abcb
|
|
@ -41,7 +41,7 @@ public class SurvGpsRecordServiceImpl extends ServiceImpl<SurvGpsRecordMapper, S
|
|||
gpsRecordDTO.setPageSize(10);
|
||||
}
|
||||
List<String> gpsIds = new ArrayList<>();
|
||||
if(StringUtils.isBlank(gpsRecordDTO.getVehicleId())){
|
||||
if(StringUtils.isNotBlank(gpsRecordDTO.getVehicleId())){
|
||||
SurvVehicleInfo vehicleInfos = vehicleInfoService.getById(gpsRecordDTO.getVehicleId());
|
||||
if(vehicleInfos!=null){
|
||||
gpsIds.add(vehicleInfos.getGpsId());
|
||||
|
|
|
|||
|
|
@ -4,10 +4,8 @@ import java.io.Serializable;
|
|||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
|
@ -61,142 +59,277 @@ public class SurvGpsRecord implements Serializable {
|
|||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "数据采集时间")
|
||||
private Date dataDateTime;
|
||||
/**设备定位时间*/
|
||||
@Excel(name = "设备定位时间", width = 15)
|
||||
/**
|
||||
* 设备定位时间
|
||||
*/
|
||||
@Excel(name = "设备定位时间", width = 15)
|
||||
@ApiModelProperty(value = "设备定位时间")
|
||||
private String sysTime;
|
||||
/**设备名称*/
|
||||
@Excel(name = "设备名称", width = 15)
|
||||
@TableField("`SYS_TIME`")
|
||||
private String sys_time;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
@Excel(name = "设备名称", width = 15)
|
||||
@ApiModelProperty(value = "设备名称")
|
||||
private String userName;
|
||||
/**经度;gps定位*/
|
||||
@Excel(name = "经度;gps定位", width = 15)
|
||||
@TableField("`USER_NAME`")
|
||||
private String user_name;
|
||||
|
||||
/**
|
||||
* 经度;gps定位
|
||||
*/
|
||||
@Excel(name = "经度;gps定位", width = 15)
|
||||
@ApiModelProperty(value = "经度;gps定位")
|
||||
@TableField("`JINGDU`")
|
||||
private String jingdu;
|
||||
/**纬度;gps定位*/
|
||||
@Excel(name = "纬度;gps定位", width = 15)
|
||||
|
||||
/**
|
||||
* 纬度;gps定位
|
||||
*/
|
||||
@Excel(name = "纬度;gps定位", width = 15)
|
||||
@ApiModelProperty(value = "纬度;gps定位")
|
||||
@TableField("`WEIDU`")
|
||||
private String weidu;
|
||||
/**基站经度;基站或wifi定位 使用此处经纬度*/
|
||||
@Excel(name = "基站经度;基站或wifi定位 使用此处经纬度", width = 15)
|
||||
|
||||
/**
|
||||
* 基站经度;基站或wifi定位 使用此处经纬度
|
||||
*/
|
||||
@Excel(name = "基站经度;基站或wifi定位 使用此处经纬度", width = 15)
|
||||
@ApiModelProperty(value = "基站经度;基站或wifi定位 使用此处经纬度")
|
||||
@TableField("`LJINGDU`")
|
||||
private String ljingdu;
|
||||
/**基站纬度;基站或wifi定位 使用此处经纬度*/
|
||||
@Excel(name = "基站纬度;基站或wifi定位 使用此处经纬度", width = 15)
|
||||
|
||||
/**
|
||||
* 基站纬度;基站或wifi定位 使用此处经纬度
|
||||
*/
|
||||
@Excel(name = "基站纬度;基站或wifi定位 使用此处经纬度", width = 15)
|
||||
@ApiModelProperty(value = "基站纬度;基站或wifi定位 使用此处经纬度")
|
||||
@TableField("`LWEIDU`")
|
||||
private String lweidu;
|
||||
/**数据更新时间;服务器接收时间*/
|
||||
@Excel(name = "数据更新时间;服务器接收时间", width = 15)
|
||||
|
||||
/**
|
||||
* 数据更新时间;服务器接收时间
|
||||
*/
|
||||
@Excel(name = "数据更新时间;服务器接收时间", width = 15)
|
||||
@ApiModelProperty(value = "数据更新时间;服务器接收时间")
|
||||
@TableField("`DATETIME`")
|
||||
private String datetime;
|
||||
/**设备心跳时间;信号时间*/
|
||||
@Excel(name = "设备心跳时间;信号时间", width = 15)
|
||||
|
||||
/**
|
||||
* 设备心跳时间;信号时间
|
||||
*/
|
||||
@Excel(name = "设备心跳时间;信号时间", width = 15)
|
||||
@ApiModelProperty(value = "设备心跳时间;信号时间")
|
||||
private String heartTime;
|
||||
/**速度*/
|
||||
@Excel(name = "速度", width = 15)
|
||||
@TableField("`HEART_TIME`")
|
||||
private String heart_time;
|
||||
|
||||
/**
|
||||
* 速度
|
||||
*/
|
||||
@Excel(name = "速度", width = 15)
|
||||
@ApiModelProperty(value = "速度")
|
||||
@TableField("`SU`")
|
||||
private String su;
|
||||
/**状态组;如下表status*/
|
||||
@Excel(name = "状态组;如下表status", width = 15)
|
||||
|
||||
/**
|
||||
* 状态组;如下表status
|
||||
*/
|
||||
@Excel(name = "状态组;如下表status", width = 15)
|
||||
@ApiModelProperty(value = "状态组;如下表status")
|
||||
@TableField("`STATUS`")
|
||||
private String status;
|
||||
/**方向*/
|
||||
@Excel(name = "方向", width = 15)
|
||||
|
||||
/**
|
||||
* 方向
|
||||
*/
|
||||
@Excel(name = "方向", width = 15)
|
||||
@ApiModelProperty(value = "方向")
|
||||
@TableField("`HANGXIANG`")
|
||||
private String hangxiang;
|
||||
/**设备编号;对应 GPS_CODE 设备号*/
|
||||
@Excel(name = "设备编号;对应 GPS_CODE 设备号", width = 15)
|
||||
|
||||
/**
|
||||
* 设备编号;对应 GPS_CODE 设备号
|
||||
*/
|
||||
@Excel(name = "设备编号;对应 GPS_CODE 设备号", width = 15)
|
||||
@ApiModelProperty(value = "设备编号;对应 GPS_CODE 设备号")
|
||||
private String simId;
|
||||
/**设备id;对应GPS_IDENT 识别码*/
|
||||
@Excel(name = "设备id;对应GPS_IDENT 识别码", width = 15)
|
||||
@TableField("`SIM_ID`")
|
||||
private String sim_id;
|
||||
|
||||
/**
|
||||
* 设备id;对应GPS_IDENT 识别码
|
||||
*/
|
||||
@Excel(name = "设备id;对应GPS_IDENT 识别码", width = 15)
|
||||
@ApiModelProperty(value = "设备id;对应GPS_IDENT 识别码")
|
||||
private String userId;
|
||||
/**销售类型-无用途*/
|
||||
@Excel(name = "销售类型-无用途", width = 15)
|
||||
@TableField("`USER_ID`")
|
||||
private String user_id;
|
||||
|
||||
/**
|
||||
* 销售类型-无用途
|
||||
*/
|
||||
@Excel(name = "销售类型-无用途", width = 15)
|
||||
@ApiModelProperty(value = "销售类型-无用途")
|
||||
private String saleType;
|
||||
/**图标*/
|
||||
@Excel(name = "图标", width = 15)
|
||||
@TableField("`SALE_TYPE`")
|
||||
private String sale_type;
|
||||
|
||||
/**
|
||||
* 图标
|
||||
*/
|
||||
@Excel(name = "图标", width = 15)
|
||||
@ApiModelProperty(value = "图标")
|
||||
private String icontype;
|
||||
/**系统时间;当前时间*/
|
||||
@Excel(name = "系统时间;当前时间", width = 15)
|
||||
@TableField("`ICONTYPE`")
|
||||
private String iconType;
|
||||
|
||||
/**
|
||||
* 系统时间;当前时间
|
||||
*/
|
||||
@Excel(name = "系统时间;当前时间", width = 15)
|
||||
@ApiModelProperty(value = "系统时间;当前时间")
|
||||
private String serverTime;
|
||||
/**设备类型;例如A15*/
|
||||
@Excel(name = "设备类型;例如A15", width = 15)
|
||||
@TableField("`SERVER_TIME`")
|
||||
private String server_time;
|
||||
|
||||
/**
|
||||
* 设备类型;例如A15
|
||||
*/
|
||||
@Excel(name = "设备类型;例如A15", width = 15)
|
||||
@ApiModelProperty(value = "设备类型;例如A15")
|
||||
private String productType;
|
||||
/**到期时间;一般为204x年，2393798400000*/
|
||||
@Excel(name = "到期时间;一般为204x年，2393798400000", width = 15)
|
||||
@TableField("`PRODUCT_TYPE`")
|
||||
private String product_type;
|
||||
|
||||
/**
|
||||
* 到期时间;一般为204x年，2393798400000
|
||||
*/
|
||||
@Excel(name = "到期时间;一般为204x年，2393798400000", width = 15)
|
||||
@ApiModelProperty(value = "到期时间;一般为204x年，2393798400000")
|
||||
private String expireDate;
|
||||
/**监控组ID*/
|
||||
@Excel(name = "监控组ID", width = 15)
|
||||
@TableField("`EXPIRE_DATE`")
|
||||
private String expire_date;
|
||||
|
||||
/**
|
||||
* 监控组ID
|
||||
*/
|
||||
@Excel(name = "监控组ID", width = 15)
|
||||
@ApiModelProperty(value = "监控组ID")
|
||||
private String groupId;
|
||||
/**信息组;如下表status*/
|
||||
@Excel(name = "信息组;如下表status", width = 15)
|
||||
@TableField("`GROUP_ID`")
|
||||
private String group_id;
|
||||
|
||||
/**
|
||||
* 信息组;如下表status
|
||||
*/
|
||||
@Excel(name = "信息组;如下表status", width = 15)
|
||||
@ApiModelProperty(value = "信息组;如下表status")
|
||||
@TableField("`STATENUMBER`")
|
||||
private String statenumber;
|
||||
/**例如100*/
|
||||
@Excel(name = "例如100", width = 15)
|
||||
|
||||
/**
|
||||
* 例如100
|
||||
*/
|
||||
@Excel(name = "例如100", width = 15)
|
||||
@ApiModelProperty(value = "例如100")
|
||||
@TableField("`ELECTRIC`")
|
||||
private String electric;
|
||||
/**设备描述信息;例如 ICCID:通常存放一些设备上传的运行参数*/
|
||||
@Excel(name = "设备描述信息;例如 ICCID:通常存放一些设备上传的运行参数", width = 15)
|
||||
|
||||
/**
|
||||
* 设备描述信息;例如 ICCID:通常存放一些设备上传的运行参数
|
||||
*/
|
||||
@Excel(name = "设备描述信息;例如 ICCID:通常存放一些设备上传的运行参数", width = 15)
|
||||
@ApiModelProperty(value = "设备描述信息;例如 ICCID:通常存放一些设备上传的运行参数")
|
||||
@TableField("`DESCRIBE`")
|
||||
private String describe;
|
||||
/**sim卡*/
|
||||
@Excel(name = "sim卡", width = 15)
|
||||
|
||||
/**
|
||||
* sim卡
|
||||
*/
|
||||
@Excel(name = "sim卡", width = 15)
|
||||
@ApiModelProperty(value = "sim卡")
|
||||
@TableField("`SIM`")
|
||||
private String sim;
|
||||
/**精度误差;当值为10表示gps定位，无精度*/
|
||||
@Excel(name = "精度误差;当值为10表示gps定位，无精度", width = 15)
|
||||
|
||||
/**
|
||||
* 精度误差;当值为10表示gps定位，无精度
|
||||
*/
|
||||
@Excel(name = "精度误差;当值为10表示gps定位，无精度", width = 15)
|
||||
@ApiModelProperty(value = "精度误差;当值为10表示gps定位，无精度")
|
||||
@TableField("`PRECISION`")
|
||||
private String precision;
|
||||
/**是否关注*/
|
||||
@Excel(name = "是否关注", width = 15)
|
||||
|
||||
/**
|
||||
* 是否关注
|
||||
*/
|
||||
@Excel(name = "是否关注", width = 15)
|
||||
@ApiModelProperty(value = "是否关注")
|
||||
private String isfollow;
|
||||
/**车牌号*/
|
||||
@Excel(name = "车牌号", width = 15)
|
||||
@TableField("`ISFOLLOW`")
|
||||
private String isFollow;
|
||||
|
||||
/**
|
||||
* 车牌号
|
||||
*/
|
||||
@Excel(name = "车牌号", width = 15)
|
||||
@ApiModelProperty(value = "车牌号")
|
||||
private String platenumber;
|
||||
/**授权信息*/
|
||||
@Excel(name = "授权信息", width = 15)
|
||||
@TableField("`PLATENUMBER`")
|
||||
private String plateNumber;
|
||||
|
||||
/**
|
||||
* 授权信息
|
||||
*/
|
||||
@Excel(name = "授权信息", width = 15)
|
||||
@ApiModelProperty(value = "授权信息")
|
||||
@TableField("`AUTH`")
|
||||
private String auth;
|
||||
/**授权列表*/
|
||||
@Excel(name = "授权列表", width = 15)
|
||||
|
||||
/**
|
||||
* 授权列表
|
||||
*/
|
||||
@Excel(name = "授权列表", width = 15)
|
||||
@ApiModelProperty(value = "授权列表")
|
||||
private String authlist;
|
||||
/**部门名称*/
|
||||
@Excel(name = "部门名称", width = 15)
|
||||
@TableField("`AUTHLIST`")
|
||||
private String authList;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
@Excel(name = "部门名称", width = 15)
|
||||
@ApiModelProperty(value = "部门名称")
|
||||
@TableField("`DEPTNAME`")
|
||||
private String deptname;
|
||||
/**是否显示位置*/
|
||||
@Excel(name = "是否显示位置", width = 15)
|
||||
|
||||
/**
|
||||
* 是否显示位置
|
||||
*/
|
||||
@Excel(name = "是否显示位置", width = 15)
|
||||
@ApiModelProperty(value = "是否显示位置")
|
||||
private String isshowlocation;
|
||||
/**模板扩展*/
|
||||
@Excel(name = "模板扩展", width = 15)
|
||||
@TableField("`ISSHOWLOCATION`")
|
||||
private String IsShowLocation;
|
||||
|
||||
/**
|
||||
* 模板扩展
|
||||
*/
|
||||
@Excel(name = "模板扩展", width = 15)
|
||||
@ApiModelProperty(value = "模板扩展")
|
||||
private String tempext;
|
||||
/**卡到期*/
|
||||
@Excel(name = "卡到期", width = 15)
|
||||
@TableField("`TEMPEXT`")
|
||||
private String tempExt;
|
||||
|
||||
/**
|
||||
* 卡到期
|
||||
*/
|
||||
@Excel(name = "卡到期", width = 15)
|
||||
@ApiModelProperty(value = "卡到期")
|
||||
private String cardexpire;
|
||||
/**地理围栏ID*/
|
||||
@Excel(name = "地理围栏ID", width = 15)
|
||||
@TableField("`CARDEXPIRE`")
|
||||
private String cardExpire;
|
||||
|
||||
/**
|
||||
* 地理围栏ID
|
||||
*/
|
||||
@Excel(name = "地理围栏ID", width = 15)
|
||||
@ApiModelProperty(value = "地理围栏ID")
|
||||
private String polygonfenceId;
|
||||
/**扩展信息*/
|
||||
@Excel(name = "扩展信息", width = 15)
|
||||
@TableField("`POLYGONFENCE_ID`")
|
||||
private String polygonFence_id;
|
||||
|
||||
/**
|
||||
* 扩展信息
|
||||
*/
|
||||
@Excel(name = "扩展信息", width = 15)
|
||||
@ApiModelProperty(value = "扩展信息")
|
||||
private String extendedstate;
|
||||
@TableField("`EXTENDEDSTATE`")
|
||||
private String extendedState;
|
||||
/**租户号*/
|
||||
@Excel(name = "租户号", width = 15)
|
||||
@ApiModelProperty(value = "租户号")
|
||||
|
|
|
|||
Loading…
Reference in New Issue