修复保存设备信息接口bug,修改流量计设备上报时间字段返回格式

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java

@@ -43,7 +43,7 @@ private static final long serialVersionUID = 1L;
 
     /** 实时时间 */
             @JsonFormat(pattern = "yyyy-MM-dd")
-            @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
             @ApiModelProperty("实时时间")
     private Date realTime;
 
@@ -54,7 +54,7 @@ private static final long serialVersionUID = 1L;
 
     /** 保存时间 */
             @JsonFormat(pattern = "yyyy-MM-dd")
-            @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
             @ApiModelProperty("保存时间")
     private Date saveTime;
 

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

@@ -112,6 +112,9 @@
             <if test="type != null">type,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
+            <if test="onLine != null">on_line,</if>
+            <if test="areaCode != null">area_code,</if>
+            <if test="deptId != null">dept_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="imei != null and imei != ''">#{imei},</if>
@@ -140,6 +143,9 @@
             <if test="type != null">#{type},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
+            <if test="onLine != null">#{onLine},</if>
+            <if test="areaCode != null">#{areaCode},</if>
+            <if test="deptId != null">#{deptId},</if>
         </trim>
     </insert>
 
@@ -172,6 +178,9 @@
             <if test="type != null">type = #{type},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="onLine != null">on_line = #{onLine},</if>
+            <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where id = #{id}
     </update>