diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java b/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java index 65028728..3d1785e0 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java @@ -158,9 +158,11 @@ public class DcEventAccident extends BaseEntity { * 3-行3 * 4-行4 */ +/* @ApiModelProperty("车道占用") private Long laneOccupancy; +*/ /** * 小型车(辆) diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java index 0dd0d91f..f0b5db58 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java +++ b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java @@ -1,6 +1,7 @@ package com.zc.business.message.device.handler; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.redis.RedisCache; import com.zc.business.constant.RedisKeyConstants; @@ -14,6 +15,7 @@ import com.zc.business.service.IDcDeviceService; import com.zc.business.service.IDcWarningService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,6 +41,9 @@ public class DeviceMessageHandler { @Resource private RedisCache redisCache; + @Value("${iot.address}") + private String iotAddress; + /** * 更新设备状态 * @@ -128,6 +133,15 @@ public class DeviceMessageHandler { dcWarning.setDeptId(dcDevice.getGroupId()); } + JSONArray pictures = data.getJSONArray("pictures"); + + List pictureList = pictures.stream().map(picture -> (iotAddress + "/profile" + picture)).collect(Collectors.toList()); + + JSONObject otherConfig = new JSONObject(); + otherConfig.put("pictures", pictureList); + + dcWarning.setOtherConfig(otherConfig.toString()); + dcWarningService.insertDcWarning(dcWarning); } diff --git a/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java b/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java index 561c79e6..110da462 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java +++ b/zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java @@ -24,6 +24,7 @@ import java.util.Map; /** * 设备属性上报消息监听 */ + @Component public class DevicePropertyReportListener implements StreamListener> { @@ -62,5 +63,7 @@ public class DevicePropertyReportListener implements StreamListener0){ //获取事件类型 int eventType = Math.toIntExact(dcEvent.getEventType()); diff --git a/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml index c016d1eb..ce16e770 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml @@ -21,7 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -34,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, reporter_name, reporter_phone_number, accident_type, location_type, traffic_jam, weather_condition, impact_level, is_reverse_cargo, is_maintenance, police_contact, towing_service_contact, congestion_ahead, at_intersection, on_curve, spillage_item, vehicle_owner_phone, lane_occupancy, small_car, trucks, buses, tankers, minor_injuries, serious_injuries, fatalities, is_private, facility_id from dc_event_accident + select id, reporter_name, reporter_phone_number, accident_type, location_type, traffic_jam, weather_condition, impact_level, is_reverse_cargo, is_maintenance, police_contact, towing_service_contact, congestion_ahead, at_intersection, on_curve, spillage_item, vehicle_owner_phone, small_car, trucks, buses, tankers, minor_injuries, serious_injuries, fatalities, is_private, facility_id from dc_event_accident