对接打印机

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

@@ -13,7 +13,7 @@ import com.fastbee.common.core.domain.BaseEntity;
  * 设备上电审核前上报的基础信息对象 iot_device_report_info
  *
  * @author kerwincui
- * @date 2024-12-09
+ * @date 2024-12-10
  */
 @ApiModel(value = "DeviceReportInfo",description = "设备上电审核前上报的基础信息 iot_device_report_info")
 @Data
@@ -105,4 +105,9 @@ public class DeviceReportInfo extends BaseEntity
     @ApiModelProperty("二维码")
     private String qrCode;
 
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    @ApiModelProperty("设备名称")
+    private String name;
+
 }

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

@@ -22,10 +22,11 @@
         <result property="batchNumber"    column="batch_number"    />
         <result property="serialNumber"    column="serial_number"    />
         <result property="qrCode"    column="qr_code"    />
+        <result property="name"    column="name"    />
     </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 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 from iot_device_report_info
     </sql>
 
     <select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@@ -47,6 +48,7 @@
             <if test="batchNumber != null "> and batch_number = #{batchNumber}</if>
             <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         </where>
     </select>
 
@@ -74,6 +76,7 @@
             <if test="batchNumber != null">batch_number,</if>
             <if test="serialNumber != null">serial_number,</if>
             <if test="qrCode != null">qr_code,</if>
+            <if test="name != null">name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="imei != null and imei != ''">#{imei},</if>
@@ -92,6 +95,7 @@
             <if test="batchNumber != null">#{batchNumber},</if>
             <if test="serialNumber != null">#{serialNumber},</if>
             <if test="qrCode != null">#{qrCode},</if>
+            <if test="name != null">#{name},</if>
         </trim>
     </insert>
 
@@ -114,6 +118,7 @@
             <if test="batchNumber != null">batch_number = #{batchNumber},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="name != null">name = #{name},</if>
         </trim>
         where id = #{id}
     </update>