luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备激活二维码生成逻辑修改，设备上报基本信息新增接口添加设备编码查重逻辑。

Browse Source
This commit is contained in:
mi9688
2024-12-13 17:55:51 +08:00
parent a96497c954
commit ffbb8bcfe4
7 changed files with 101 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,10 +26,11 @@
<result property="lcdManufacturerName" column="lcd_manufacturer_name" />
<result property="voiceManufacturerName" column="voice_manufacturer_name" />
<result property="replaceManufacturerName" column="replace_manufacturer_name" />
<result property="deviceId" column="device_id" />
</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 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 from iot_device_report_info
</sql>
<select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@ -55,6 +56,7 @@
<if test="lcdManufacturerName != null and lcdManufacturerName != ''"> and lcd_manufacturer_name like concat('%', #{lcdManufacturerName}, '%')</if>
<if test="voiceManufacturerName != null and voiceManufacturerName != ''"> and voice_manufacturer_name like concat('%', #{voiceManufacturerName}, '%')</if>
<if test="replaceManufacturerName != null and replaceManufacturerName != ''"> and replace_manufacturer_name like concat('%', #{replaceManufacturerName}, '%')</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
</where>
</select>
@ -86,6 +88,7 @@
<if test="lcdManufacturerName != null">lcd_manufacturer_name,</if>
<if test="voiceManufacturerName != null">voice_manufacturer_name,</if>
<if test="replaceManufacturerName != null">replace_manufacturer_name,</if>
<if test="deviceId != null">device_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="imei != null and imei != ''">#{imei},</if>
@ -108,6 +111,7 @@
<if test="lcdManufacturerName != null">#{lcdManufacturerName},</if>
<if test="voiceManufacturerName != null">#{voiceManufacturerName},</if>
<if test="replaceManufacturerName != null">#{replaceManufacturerName},</if>
<if test="deviceId != null">#{deviceId},</if>
</trim>
</insert>
@ -134,6 +138,7 @@
<if test="lcdManufacturerName != null">lcd_manufacturer_name = #{lcdManufacturerName},</if>
<if test="voiceManufacturerName != null">voice_manufacturer_name = #{voiceManufacturerName},</if>
<if test="replaceManufacturerName != null">replace_manufacturer_name = #{replaceManufacturerName},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
</trim>
where id = #{id}
</update>