1/device/detail/gongdianChart。供电图表数据需修复

2/地图实时数据接口优化

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java

@@ -1664,6 +1664,9 @@ public class DeviceServiceImpl implements IDeviceService {
             HashMap<String, Object> dataListMap = new HashMap<>();
 
             List<DeviceLog> deviceLogs1 = collect.get(modelDevice.getIdentifier());
+            if(null == deviceLogs1){
+                continue;
+            }
             deviceLogs1.sort(Comparator.comparing(DeviceLog::getCreateTime));
             dataListMap.put("name", modelDevice.getModelName());
             if (StringUtils.isNotEmpty(modelDevice.getSpecs())) {

fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceLogMapper.xml

@@ -59,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serialNumber != null and serialNumber !=''"> and serial_number = #{serialNumber}</if>
             <if test="logType != null "> and log_type = #{logType}</if>
             <if test="identity != null  and identity != ''"> and identity like concat('%', #{identity}, '%')</if>
+            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                and create_time between #{beginTime} and #{endTime}
+            </if>
         </where>
         order by create_time desc
     </select>