修改推送数据接口by pengdi@2020/11/18

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceDataPushServiceImpl.java

@@ -112,6 +112,7 @@ public class DeviceDataPushServiceImpl implements DeviceDataPushService , Initia
 
 	protected Map<String,Object> buildDeviceDataMap(DeviceDto device , Map<String, String> dataItem){
 		Map<String,Object> dataMap = new HashMap<String,Object>();
+		dataMap.put("deviceId", device.getId());
 		dataMap.put("deviceNo", device.getDeviceNo());
 		dataMap.put("deviceType", device.getEquipmentType());
 		dataMap.put("sendTime", dataItem.get("sendTime"));

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -990,7 +990,9 @@
     </select>
     <select id="getPushDeviceDataList" resultType="java.util.HashMap">
         SELECT
+        d.id AS deviceId,
         d.device_no AS deviceNo,
+        d.status AS status,
         dt.equipment_type AS deviceType,
         DATE_FORMAT(d.date_update,'%Y-%m-%d') AS dateCreate,
         ifnull(m.factory,f.`name`) as factory,