修改上电审核

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

@@ -149,5 +149,9 @@ public class DeviceReportInfo extends BaseEntity
     /** 是否自动审核 */
     private Boolean autoReview ;
 
+    /** 设备类型：1.水电双计 2.流量计 */
+    @Excel(name = "设备类型：1.水电双计 2.流量计")
+    @ApiModelProperty("设备类型：1.水电双计 2.流量计")
+    private Integer type;
 
 }

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

@@ -29,10 +29,11 @@
         <result property="deviceId"    column="device_id"    />
         <result property="status"    column="status"    />
         <result property="powersTime"    column="powers_time"    />
+        <result property="type"    column="type"    />
     </resultMap>
 
     <sql id="selectDeviceReportInfoVo">
-        select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status, powers_time from iot_device_report_info
+        select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status, powers_time, type from iot_device_report_info
     </sql>
 
     <select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@@ -61,6 +62,7 @@
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="powersTime != null "> and powers_time = #{powersTime}</if>
+            <if test="type != null "> and type = #{type}</if>
         </where>
     </select>
 
@@ -95,6 +97,7 @@
             <if test="deviceId != null">device_id,</if>
             <if test="status != null">status,</if>
             <if test="powersTime != null">powers_time,</if>
+            <if test="type != null">type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="imei != null and imei != ''">#{imei},</if>
@@ -120,6 +123,7 @@
             <if test="deviceId != null">#{deviceId},</if>
             <if test="status != null">#{status},</if>
             <if test="powersTime != null">#{powersTime},</if>
+            <if test="type != null">#{type},</if>
         </trim>
     </insert>
 
@@ -149,6 +153,7 @@
             <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="powersTime != null">powers_time = #{powersTime},</if>
+            <if test="type != null">type = #{type},</if>
         </trim>
         where id = #{id}
     </update>