Commit 7a4b8cbd authored by zhuangzhuang's avatar zhuangzhuang

解决线路会保留之前坐标的问题

parent 5e50dcec
......@@ -162,7 +162,7 @@ public class MqttListener implements MqttCallback {
String ConfigData;
Future<String> result = null;
GWConfigWorker gcconfig = null;
logger.info(topic+"-----"+ flag);
logger.info(topic+"-----"+ flag);
if(flag == 0){
ConfigCMDVo configCMDVo = new ConfigCMDVo();
configCMDVo.setAction("sleep");
......@@ -243,6 +243,9 @@ public class MqttListener implements MqttCallback {
if(checkInVo.getDevList().size()==0 && configCMDVo !=null ){
return 3;//重发
}
if(configCMDVo.getDevList().size() == 0){
return 10;//无返回值
}
if (compare(configCMDVo.getDevList(),checkInVo.getDevList())
&& checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod())
&& checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod())
......
......@@ -139,8 +139,8 @@ public class DataController {
}
} else {
if ("baidu".equals(searchLocationVo.getType())) {
// sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= 1552579200000000000 ORDER BY time ";
sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
// sql = "SELECT \"bdlng\",\"bdlat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= 1552579200000000000 ORDER BY time ";
} else {
sql = "SELECT \"lng\",\"lat\",\"motion\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
}
......
......@@ -47,6 +47,7 @@
<if test="circuitTermVo.endTime!=null">
AND c.createTime &lt;= #{circuitTermVo.endTime,jdbcType=BIGINT}
</if>
order by c.createTime desc
LIMIT #{page,jdbcType=INTEGER},#{rows,jdbcType=INTEGER}
</select>
......
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