1. 在运营区外X秒后断电
This commit is contained in:
parent
f9086a50ea
commit
d9e8887a60
|
|
@ -32,6 +32,10 @@ import javax.annotation.Resource;
|
|||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 接收硬件参数
|
||||
|
|
@ -66,6 +70,9 @@ public class ReceiveController {
|
|||
@Autowired
|
||||
private IEtOrderService etOrderService;
|
||||
|
||||
@Autowired
|
||||
private ScheduledExecutorService scheduledExecutorService;
|
||||
|
||||
|
||||
/**
|
||||
* 功能描述：第三方平台数据接收。<p>
|
||||
|
|
@ -125,6 +132,7 @@ public class ReceiveController {
|
|||
lat = new BigDecimal(doubles[0]).setScale(4, RoundingMode.HALF_UP);
|
||||
lon = new BigDecimal(doubles[1]).setScale(4, RoundingMode.HALF_UP);
|
||||
log.info("转换后的GCJ02经纬度：" + lon + "---" + lat);
|
||||
if(BigDecimal.ZERO.compareTo(lon) != 0 && BigDecimal.ZERO.compareTo(lat) != 0){
|
||||
device.setLatitude(lat.toString());
|
||||
device.setLongitude(lon.toString());
|
||||
Integer bat = value.getBat();
|
||||
|
|
@ -148,10 +156,24 @@ public class ReceiveController {
|
|||
String noRidingOutage = area.getNoRidingOutage();
|
||||
//发送播报指令
|
||||
asDeviceService.sendCommand(device.getMac(), Token.getToken(),IotConstants.COMMAND_PLAY3,"禁行区内播报");
|
||||
if(noRidingOutage.equals("1")){//禁行区内断电
|
||||
//发送断电命令
|
||||
asDeviceService.sendCommand(device.getMac(), Token.getToken(),IotConstants.COMMAND_QLOSE,"禁行区内断电");
|
||||
if(noRidingOutage.equals("1") && !device.getIsAreaOutOutage().equals("1")){//禁行区内断电
|
||||
//x秒后发送断电命令
|
||||
scheduledExecutorService.schedule(() -> {
|
||||
try {
|
||||
asDeviceService.sendCommand(device.getMac(), Token.getToken(),IotConstants.COMMAND_QLOSE,"超出营运区断电");
|
||||
device.setIsAreaOutOutage("0");
|
||||
asDeviceService.updateAsDevice(device);
|
||||
log.info("禁行区内发送断电命令：" +logEntry.getDevName());
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
e.printStackTrace();
|
||||
} catch (InvalidKeyException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}, area.getOutage(), TimeUnit.SECONDS);
|
||||
device.setIsAreaOutOutage("1");
|
||||
asDeviceService.updateAsDevice(device);
|
||||
}
|
||||
}
|
||||
/** 3.超出运营区外断电*/
|
||||
|
|
@ -160,10 +182,24 @@ public class ReceiveController {
|
|||
String areaOutOutage = area.getAreaOutOutage();
|
||||
//发送超出营运区播报指令
|
||||
asDeviceService.sendCommand(device.getMac(), Token.getToken(),IotConstants.COMMAND_PLAY3,"超出营运区播报");
|
||||
if(areaOutOutage.equals("1")){//超出营运区断电
|
||||
//发送断电命令
|
||||
if(areaOutOutage.equals("1") && !device.getIsAreaOutOutage().equals("1")){//超出营运区断电
|
||||
//x秒后发送断电命令
|
||||
scheduledExecutorService.schedule(() -> {
|
||||
try {
|
||||
asDeviceService.sendCommand(device.getMac(), Token.getToken(),IotConstants.COMMAND_QLOSE,"超出营运区断电");
|
||||
device.setIsAreaOutOutage("0");
|
||||
asDeviceService.updateAsDevice(device);
|
||||
log.info("超出营运区发送断电命令：" +logEntry.getDevName());
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
e.printStackTrace();
|
||||
} catch (InvalidKeyException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}, area.getOutage(), TimeUnit.SECONDS);
|
||||
device.setIsAreaOutOutage("1");
|
||||
asDeviceService.updateAsDevice(device);
|
||||
}
|
||||
}
|
||||
/** 4.行程线路添加，更新订单中的trip_route字段 */
|
||||
|
|
@ -262,6 +298,7 @@ public class ReceiveController {
|
|||
}else{
|
||||
log.info("更新定位失败：" +logEntry.getDevName());
|
||||
}
|
||||
}
|
||||
}else{
|
||||
log.info("未找到车辆对象：" +logEntry.getDevName());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,6 +136,9 @@ public class AsDevice implements Serializable{
|
|||
/** 车牌号 */
|
||||
private String vehicleNum;
|
||||
|
||||
/** 是否发送过断电指令 */
|
||||
private String isAreaOutOutage;
|
||||
|
||||
/** 正在进行中的订单 */
|
||||
@TableField(exist = false)
|
||||
private List<EtOrder> etOrders;
|
||||
|
|
|
|||
|
|
@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="qrcode" column="qrcode" />
|
||||
<result property="longitude" column="longitude" />
|
||||
<result property="latitude" column="latitude" />
|
||||
<result property="isAreaOutOutage" column="is_area_out_outage" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectAsDeviceVo">
|
||||
select device_id, picture, device_name, mac, sn, model_id, vehicle_num, area_id, activation_time, online_status, create_by, create_time, update_by, update_time, last_time, remark, status, lock_status, location, remaining_power, voltage, qrcode, longitude, latitude from et_device
|
||||
select device_id, picture, device_name, mac, sn, model_id, vehicle_num, area_id, activation_time, online_status, create_by, create_time, update_by, update_time, last_time, remark, status, lock_status, location, remaining_power, voltage, qrcode, longitude, latitude, is_area_out_outage from et_device
|
||||
</sql>
|
||||
|
||||
<select id="selectAsDeviceList" parameterType="AsDevice" resultMap="AsDeviceResult">
|
||||
|
|
@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="qrcode != null">qrcode,</if>
|
||||
<if test="longitude != null">longitude,</if>
|
||||
<if test="latitude != null">latitude,</if>
|
||||
<if test="isAreaOutOutage != null">is_area_out_outage,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="picture != null">#{picture},</if>
|
||||
|
|
@ -149,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="qrcode != null">#{qrcode},</if>
|
||||
<if test="longitude != null">#{longitude},</if>
|
||||
<if test="latitude != null">#{latitude},</if>
|
||||
<if test="isAreaOutOutage != null">#{isAreaOutOutage},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -178,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="qrcode != null">qrcode = #{qrcode},</if>
|
||||
<if test="longitude != null">longitude = #{longitude},</if>
|
||||
<if test="latitude != null">latitude = #{latitude},</if>
|
||||
<if test="isAreaOutOutage != null">is_area_out_outage = #{isAreaOutOutage},</if>
|
||||
</trim>
|
||||
where device_id = #{deviceId}
|
||||
</update>
|
||||
|
|
@ -208,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="qrcode != null">qrcode = #{qrcode},</if>
|
||||
<if test="longitude != null">longitude = #{longitude},</if>
|
||||
<if test="latitude != null">latitude = #{latitude},</if>
|
||||
<if test="is_area_out_outage != null">is_area_out_outage = #{is_area_out_outage},</if>
|
||||
</trim>
|
||||
where sn = #{sn}
|
||||
</update>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user