From dd1dee67b235334e8ab0de78b08e8ff93e24da3b Mon Sep 17 00:00:00 2001 From: YIN Date: Wed, 18 Dec 2024 20:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=86=B7=E9=93=BE=E8=BD=A6?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cpxt/web/task/GetLocationTask.java | 8 ++++---- .../java/com/e6yun/project/sdk/api/Main.java | 2 +- .../api/pojo/basevo/basic/VehicleInfoResp.java | 16 ++++++++-------- .../java/com/cpxt/common/constant/Constants.java | 2 +- .../resources/mapper/biz/TrackTempMapper.xml | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java b/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java index b809f59..0604a42 100644 --- a/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java +++ b/cpxt-admin/src/main/java/com/cpxt/web/task/GetLocationTask.java @@ -61,7 +61,7 @@ public class GetLocationTask { GetVehicleInfoVO vehicleInfoVO = e6SdkApi.GetVehcileInfo("-1"); System.out.println(vehicleInfoVO); - if (vehicleInfoVO.getCode().equals("1")){ + if (Helper.FInt(vehicleInfoVO.getCode())==1){ List list = vehicleInfoVO.getData(); for (VehicleInfoResp info : list) { String carNo = info.getVehicleNO(); @@ -73,7 +73,7 @@ public class GetLocationTask { newstate.setCarId(dbcar.getId()); newstate.setCarNo(dbcar.getCarNo()); newstate.setVin(dbcar.getVin()); - newstate.setVehicleNo(info.getVehicleNo()); + newstate.setVehicleNo(info.getVehicleNO()); newstate.setRegName(info.getRegName()); if (!Helper.NStr(info.getGpsTime()).equals("")) newstate.setGpsTime(DateUtils.parseDate(Helper.NStr(info.getGpsTime()).replace(".0",""))); @@ -145,8 +145,8 @@ public class GetLocationTask { // 插入轨迹信息 try { TrackTemp track = new TrackTemp(); - PropertyUtils.copyProperties(newstate, track); - getLocationTask.trackMapper.insert(track); + PropertyUtils.copyProperties(track, newstate); + getLocationTask.trackMapper.insertTrack(track); } catch (Exception e) { e.printStackTrace(); } diff --git a/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/Main.java b/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/Main.java index 6cffe7c..03dbb79 100644 --- a/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/Main.java +++ b/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/Main.java @@ -54,7 +54,7 @@ public class Main { newstate.setCarId(dbcar.getId()); newstate.setCarNo(dbcar.getCarNo()); newstate.setVin(dbcar.getVin()); - newstate.setVehicleNo(info.getVehicleNo()); + newstate.setVehicleNo(info.getVehicleNO()); newstate.setRegName(info.getRegName()); if (!Helper.NStr(info.getGpsTime()).equals("")) newstate.setGpsTime(DateUtils.parseDate(Helper.NStr(info.getGpsTime()).replace(".0", ""))); diff --git a/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/pojo/basevo/basic/VehicleInfoResp.java b/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/pojo/basevo/basic/VehicleInfoResp.java index 3c4f899..74f8c86 100644 --- a/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/pojo/basevo/basic/VehicleInfoResp.java +++ b/cpxt-admin/src/main/java/com/e6yun/project/sdk/api/pojo/basevo/basic/VehicleInfoResp.java @@ -59,7 +59,7 @@ public class VehicleInfoResp { private String height ; //海拔高度 单位米 1423 private String stopSec; //停车时长 单位秒 300 private Integer acc; //ACC状态;0 无,1关,2开 1 - private String vehicleNo; //真实车牌 苏AF5595 +// private String vehicleNo; //真实车牌 苏AF5595 private String ohm; //油量欧姆值 1180 private Integer curAccSta; //当前ACC状态;1:在线 0:不在线 2:未知 1 private String commIds; //中心识别码 12123222 @@ -512,13 +512,13 @@ public class VehicleInfoResp { this.acc = acc; } - public String getVehicleNo() { - return vehicleNo; - } - - public void setVehicleNo(String vehicleNo) { - this.vehicleNo = vehicleNo; - } +// public String getVehicleNo() { +// return vehicleNo; +// } +// +// public void setVehicleNo(String vehicleNo) { +// this.vehicleNo = vehicleNo; +// } public String getOhm() { return ohm; diff --git a/cpxt-common/src/main/java/com/cpxt/common/constant/Constants.java b/cpxt-common/src/main/java/com/cpxt/common/constant/Constants.java index 012bb2a..dde4a68 100644 --- a/cpxt-common/src/main/java/com/cpxt/common/constant/Constants.java +++ b/cpxt-common/src/main/java/com/cpxt/common/constant/Constants.java @@ -163,7 +163,7 @@ public class Constants /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.cpxt.quartz.task" }; + public static final String[] JOB_WHITELIST_STR = { "com.cpxt.quartz.task", "com.cpxt.web.task" }; /** * 定时任务违规的字符 diff --git a/cpxt-system/src/main/resources/mapper/biz/TrackTempMapper.xml b/cpxt-system/src/main/resources/mapper/biz/TrackTempMapper.xml index 439ad0a..f3b72e9 100644 --- a/cpxt-system/src/main/resources/mapper/biz/TrackTempMapper.xml +++ b/cpxt-system/src/main/resources/mapper/biz/TrackTempMapper.xml @@ -66,12 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - insert into track_#{carId} + insert into track_${carId} car_id, car_no, @@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" acc, ohm, cur_acc_sta, - commIds, + comm_ids, create_time,