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-06 17:34:01 +08:00
parent 6aaed01915
commit 71f4f3b139
15 changed files with 260 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceManufacturers.java
View File

@ -13,64 +13,69 @@ import com.fastbee.common.core.domain.BaseEntity;
* 设备厂家信息对象 iot_device_manufacturers
*
* @author kerwincui
* @date 2024-11-13
* @date 2024-12-06
*/
@ApiModel(value = "DeviceManufacturers",description = "设备厂家信息 iot_device_manufacturers")
@Data
@EqualsAndHashCode(callSuper = true)
public class DeviceManufacturers extends BaseEntity
{
private static final long serialVersionUID = 1L;
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 厂家链接，接口基地址 */
@Excel(name = "厂家链接，接口基地址")
@ApiModelProperty("厂家链接，接口基地址")
@Excel(name = "厂家链接，接口基地址")
@ApiModelProperty("厂家链接，接口基地址")
private String endpoint;
/** 厂名称 */
@Excel(name = "厂名称")
@ApiModelProperty("厂名称")
@Excel(name = "厂名称")
@ApiModelProperty("厂名称")
private String manufacturerName;
/** 帐户 */
@Excel(name = "帐户")
@ApiModelProperty("帐户")
@Excel(name = "帐户")
@ApiModelProperty("帐户")
private String account;
/** 密码 */
@Excel(name = "密码")
@ApiModelProperty("密码")
@Excel(name = "密码")
@ApiModelProperty("密码")
private String password;
/** 接口文档 */
@Excel(name = "接口文档")
@ApiModelProperty("接口文档")
@Excel(name = "接口文档")
@ApiModelProperty("接口文档")
private String interfaceDocumentation;
/** api-key */
@Excel(name = "api-key")
@ApiModelProperty("api-key")
@Excel(name = "api-key")
@ApiModelProperty("api-key")
private String apiKey;
/** authId */
@Excel(name = "authId")
@ApiModelProperty("authId")
@Excel(name = "authId")
@ApiModelProperty("authId")
private String authid;
/** secret-key */
@Excel(name = "secret-key")
@ApiModelProperty("secret-key")
@Excel(name = "secret-key")
@ApiModelProperty("secret-key")
private String secretKey;
/** 厂家鉴权接口地址 */
@Excel(name = "厂家鉴权接口地址")
@ApiModelProperty("厂家鉴权接口地址")
@Excel(name = "厂家鉴权接口地址")
@ApiModelProperty("厂家鉴权接口地址")
private String tokenendpoint;
/** 删除标志（0代表存在，2代表删除） */
private Integer delFlag;
/** 厂家类型 */
@Excel(name = "厂家类型")
@ApiModelProperty("厂家类型")
private String manufacturerType;
}

8
fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceManufacturersMapper.xml
View File

@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fastbee.deviceData.mapper.DeviceManufacturersMapper">
<resultMap type="DeviceManufacturers" id="DeviceManufacturersResult">
<result property="id" column="id" />
<result property="endpoint" column="endpoint" />
@ -20,10 +19,11 @@
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="manufacturerType" column="manufacturer_type" />
</resultMap>
<sql id="selectDeviceManufacturersVo">
select id, endpoint, manufacturer_name, account, password, interface_documentation, api_key, authId, secret_key, tokenEndpoint, del_flag, create_time, create_by, update_time, update_by from iot_device_manufacturers
select id, endpoint, manufacturer_name, account, password, interface_documentation, api_key, authId, secret_key, tokenEndpoint, del_flag, create_time, create_by, update_time, update_by, manufacturer_type from iot_device_manufacturers
</sql>
<select id="selectDeviceManufacturersList" parameterType="DeviceManufacturers" resultMap="DeviceManufacturersResult">
@ -38,6 +38,7 @@
<if test="authid != null and authid != ''"> and authId = #{authid}</if>
<if test="secretKey != null and secretKey != ''"> and secret_key = #{secretKey}</if>
<if test="tokenendpoint != null and tokenendpoint != ''"> and tokenEndpoint = #{tokenendpoint}</if>
<if test="manufacturerType != null and manufacturerType != ''"> and manufacturer_type = #{manufacturerType}</if>
</where>
</select>
@ -63,6 +64,7 @@
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="manufacturerType != null">manufacturer_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="endpoint != null">#{endpoint},</if>
@ -79,6 +81,7 @@
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="manufacturerType != null">#{manufacturerType},</if>
</trim>
</insert>
@ -99,6 +102,7 @@
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="manufacturerType != null">manufacturer_type = #{manufacturerType},</if>
</trim>
where id = #{id}
</update>