设备上电审核基本信息上报接口，逻辑完善
This commit is contained in:
mi9688
@ -13,86 +13,96 @@ import com.fastbee.common.core.domain.BaseEntity;
|
||||
* 设备上电审核前上报的基础信息对象 iot_device_report_info
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-12-05
|
||||
* @date 2024-12-09
|
||||
*/
|
||||
@ApiModel(value = "DeviceReportInfo",description = "设备上电审核前上报的基础信息 iot_device_report_info")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class DeviceReportInfo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
/** */
|
||||
private Long id;
|
||||
|
||||
/** 模组IMEI号 */
|
||||
@Excel(name = "模组IMEI号")
|
||||
@ApiModelProperty("模组IMEI号")
|
||||
@Excel(name = "模组IMEI号")
|
||||
@ApiModelProperty("模组IMEI号")
|
||||
private String imei;
|
||||
|
||||
/** 流量卡iccid */
|
||||
@Excel(name = "流量卡iccid")
|
||||
@ApiModelProperty("流量卡iccid")
|
||||
@Excel(name = "流量卡iccid")
|
||||
@ApiModelProperty("流量卡iccid")
|
||||
private String iccid;
|
||||
|
||||
/** MCU唯一id */
|
||||
@Excel(name = "MCU唯一id")
|
||||
@ApiModelProperty("MCU唯一id")
|
||||
@Excel(name = "MCU唯一id")
|
||||
@ApiModelProperty("MCU唯一id")
|
||||
private String mcuId;
|
||||
|
||||
/** 硬件板型 */
|
||||
@Excel(name = "硬件板型")
|
||||
@ApiModelProperty("硬件板型")
|
||||
@Excel(name = "硬件板型")
|
||||
@ApiModelProperty("硬件板型")
|
||||
private String bspType;
|
||||
|
||||
/** 模组型号 */
|
||||
@Excel(name = "模组型号")
|
||||
@ApiModelProperty("模组型号")
|
||||
@Excel(name = "模组型号")
|
||||
@ApiModelProperty("模组型号")
|
||||
private String lteType;
|
||||
|
||||
/** MCU型号 */
|
||||
@Excel(name = "MCU型号")
|
||||
@ApiModelProperty("MCU型号")
|
||||
@Excel(name = "MCU型号")
|
||||
@ApiModelProperty("MCU型号")
|
||||
private String mcuType;
|
||||
|
||||
/** MCU固件，包含了固件的名称和版本 */
|
||||
@Excel(name = "MCU固件，包含了固件的名称和版本")
|
||||
@ApiModelProperty("MCU固件，包含了固件的名称和版本")
|
||||
@Excel(name = "MCU固件，包含了固件的名称和版本")
|
||||
@ApiModelProperty("MCU固件，包含了固件的名称和版本")
|
||||
private String mcuFw;
|
||||
|
||||
/** 模组固件，包含了固件的名称和版本 */
|
||||
@Excel(name = "模组固件，包含了固件的名称和版本")
|
||||
@ApiModelProperty("模组固件，包含了固件的名称和版本")
|
||||
@Excel(name = "模组固件，包含了固件的名称和版本")
|
||||
@ApiModelProperty("模组固件，包含了固件的名称和版本")
|
||||
private String lteFw;
|
||||
|
||||
/** 显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116 */
|
||||
@Excel(name = "显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116")
|
||||
@ApiModelProperty("显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116")
|
||||
@Excel(name = "显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116")
|
||||
@ApiModelProperty("显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116")
|
||||
private Long lcdManufacturer;
|
||||
|
||||
/** 语音厂家，上报1，2，3等类似的数值，通过后台进行录入数值和语音厂家对应关系例：1对应 */
|
||||
@Excel(name = "语音厂家，上报1，2，3等类似的数值，通过后台进行录入数值和语音厂家对应关系例：1对应")
|
||||
@ApiModelProperty("语音厂家，上报1，2，3等类似的数值，通过后台进行录入数值和语音厂家对应关系例：1对应")
|
||||
@Excel(name = "语音厂家，上报1，2，3等类似的数值，通过后台进行录入数值和语音厂家对应关系例：1对应")
|
||||
@ApiModelProperty("语音厂家，上报1，2，3等类似的数值，通过后台进行录入数值和语音厂家对应关系例：1对应")
|
||||
private Long voiceManufacturer;
|
||||
|
||||
/** FRAM型号 */
|
||||
@Excel(name = "FRAM型号")
|
||||
@ApiModelProperty("FRAM型号")
|
||||
@Excel(name = "FRAM型号")
|
||||
@ApiModelProperty("FRAM型号")
|
||||
private String framModel;
|
||||
|
||||
/** 代工厂家，上报1，2，3等类似的数值，通过后台进行录入数值和代工厂家对应关系例：1对应 */
|
||||
@Excel(name = "代工厂家，上报1，2，3等类似的数值，通过后台进行录入数值和代工厂家对应关系例：1对应")
|
||||
@ApiModelProperty("代工厂家，上报1，2，3等类似的数值，通过后台进行录入数值和代工厂家对应关系例：1对应")
|
||||
@Excel(name = "代工厂家，上报1，2，3等类似的数值，通过后台进行录入数值和代工厂家对应关系例：1对应")
|
||||
@ApiModelProperty("代工厂家，上报1，2，3等类似的数值，通过后台进行录入数值和代工厂家对应关系例：1对应")
|
||||
private Long replaceManufacturer;
|
||||
|
||||
/** 记录测试的过程，包括了测试脉冲次数、第一次上电时间等待补充信息 */
|
||||
@Excel(name = "记录测试的过程，包括了测试脉冲次数、第一次上电时间等待补充信息")
|
||||
@ApiModelProperty("记录测试的过程，包括了测试脉冲次数、第一次上电时间等待补充信息")
|
||||
@Excel(name = "记录测试的过程，包括了测试脉冲次数、第一次上电时间等待补充信息")
|
||||
@ApiModelProperty("记录测试的过程，包括了测试脉冲次数、第一次上电时间等待补充信息")
|
||||
private String testRecord;
|
||||
|
||||
/** 批号 */
|
||||
@Excel(name = "批号")
|
||||
@ApiModelProperty("批号")
|
||||
private Long batchNumber;
|
||||
/** 批号 */
|
||||
@Excel(name = "批号")
|
||||
@ApiModelProperty("批号")
|
||||
private Long batchNumber;
|
||||
|
||||
/** 设备编号 */
|
||||
@Excel(name = "设备编号")
|
||||
@ApiModelProperty("设备编号")
|
||||
private String serialNumber;
|
||||
|
||||
/** 二维码 */
|
||||
@Excel(name = "二维码")
|
||||
@ApiModelProperty("二维码")
|
||||
private String qrCode;
|
||||
|
||||
}
|
||||
|
||||
@ -19,6 +19,10 @@ public class DeviceReportInfoServiceImpl implements IDeviceReportInfoService
|
||||
@Autowired
|
||||
private DeviceReportInfoMapper deviceReportInfoMapper;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询设备上电审核前上报的基础信息
|
||||
*
|
||||
|
||||
@ -20,10 +20,12 @@
|
||||
<result property="replaceManufacturer" column="replace_manufacturer" />
|
||||
<result property="testRecord" column="test_record" />
|
||||
<result property="batchNumber" column="batch_number" />
|
||||
<result property="serialNumber" column="serial_number" />
|
||||
<result property="qrCode" column="qr_code" />
|
||||
</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 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 from iot_device_report_info
|
||||
</sql>
|
||||
|
||||
<select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
|
||||
@ -43,6 +45,8 @@
|
||||
<if test="replaceManufacturer != null "> and replace_manufacturer = #{replaceManufacturer}</if>
|
||||
<if test="testRecord != null and testRecord != ''"> and test_record = #{testRecord}</if>
|
||||
<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>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@ -68,6 +72,8 @@
|
||||
<if test="replaceManufacturer != null">replace_manufacturer,</if>
|
||||
<if test="testRecord != null">test_record,</if>
|
||||
<if test="batchNumber != null">batch_number,</if>
|
||||
<if test="serialNumber != null">serial_number,</if>
|
||||
<if test="qrCode != null">qr_code,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="imei != null and imei != ''">#{imei},</if>
|
||||
@ -84,6 +90,8 @@
|
||||
<if test="replaceManufacturer != null">#{replaceManufacturer},</if>
|
||||
<if test="testRecord != null">#{testRecord},</if>
|
||||
<if test="batchNumber != null">#{batchNumber},</if>
|
||||
<if test="serialNumber != null">#{serialNumber},</if>
|
||||
<if test="qrCode != null">#{qrCode},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -104,6 +112,8 @@
|
||||
<if test="replaceManufacturer != null">replace_manufacturer = #{replaceManufacturer},</if>
|
||||
<if test="testRecord != null">test_record = #{testRecord},</if>
|
||||
<if test="batchNumber != null">batch_number = #{batchNumber},</if>
|
||||
<if test="serialNumber != null">serial_number = #{serialNumber},</if>
|
||||
<if test="qrCode != null">qr_code = #{qrCode},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
@ -69,7 +69,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
this.toolService = toolService;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据主键查询项目
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user