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-11 16:59:20 +08:00
parent 679b651706
commit 73042e17af
6 changed files with 77 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ import com.fastbee.common.core.domain.BaseEntity;
* 设备上电审核前上报的基础信息对象 iot_device_report_info
*
* @author kerwincui
* @date 2024-12-10
* @date 2024-12-11
*/
@ApiModel(value = "DeviceReportInfo",description = "设备上电审核前上报的基础信息 iot_device_report_info")
@Data
@ -110,4 +110,19 @@ public class DeviceReportInfo extends BaseEntity
@ApiModelProperty("设备名称")
private String name;
/** lcd厂家名称 */
@Excel(name = "lcd厂家名称")
@ApiModelProperty("lcd厂家名称")
private String lcdManufacturerName;
/** 语音厂家名称 */
@Excel(name = "语音厂家名称")
@ApiModelProperty("语音厂家名称")
private String voiceManufacturerName;
/** 代工厂家名称 */
@Excel(name = "代工厂家名称")
@ApiModelProperty("代工厂家名称")
private String replaceManufacturerName;
}

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

@ -23,10 +23,13 @@
<result property="serialNumber" column="serial_number" />
<result property="qrCode" column="qr_code" />
<result property="name" column="name" />
<result property="lcdManufacturerName" column="lcd_manufacturer_name" />
<result property="voiceManufacturerName" column="voice_manufacturer_name" />
<result property="replaceManufacturerName" column="replace_manufacturer_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, 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 from iot_device_report_info
</sql>
<select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@ -49,6 +52,9 @@
<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>
<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>
</where>
</select>
@ -77,6 +83,9 @@
<if test="serialNumber != null">serial_number,</if>
<if test="qrCode != null">qr_code,</if>
<if test="name != null">name,</if>
<if test="lcdManufacturerName != null">lcd_manufacturer_name,</if>
<if test="voiceManufacturerName != null">voice_manufacturer_name,</if>
<if test="replaceManufacturerName != null">replace_manufacturer_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="imei != null and imei != ''">#{imei},</if>
@ -96,6 +105,9 @@
<if test="serialNumber != null">#{serialNumber},</if>
<if test="qrCode != null">#{qrCode},</if>
<if test="name != null">#{name},</if>
<if test="lcdManufacturerName != null">#{lcdManufacturerName},</if>
<if test="voiceManufacturerName != null">#{voiceManufacturerName},</if>
<if test="replaceManufacturerName != null">#{replaceManufacturerName},</if>
</trim>
</insert>
@ -119,6 +131,9 @@
<if test="serialNumber != null">serial_number = #{serialNumber},</if>
<if test="qrCode != null">qr_code = #{qrCode},</if>
<if test="name != null">name = #{name},</if>
<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>
</trim>
where id = #{id}
</update>