Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MQTT通讯功能联调

Browse Source
This commit is contained in:
xuyang
2023-08-07 20:07:58 +08:00
parent 2d55d0460a
commit e35b975609
15 changed files with 229 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java
View File

@@ -28,11 +28,13 @@ public enum AccessResponseEnum {
DEV_IS_NOT_WG("A0303","注册装置不是网关!"),
REGISTER_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),
ACCESS_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),
RESPONSE_ERROR("A0304","装置请求响应错误!"),
DEV_TYPE_NOT_FIND("A0305","装置类型未找到,需要录入!"),
REGISTER_ERROR("A0306","装置注册失败!"),
ACCESS_ERROR("A0306","装置接入失败!"),
DICT_MISSING("A0307","字典数据缺失!"),
EPD_DICT_MISSING("A0307","Epd字典数据缺失!"),

88
iot-access/access-api/src/main/java/com/njcn/access/enums/TypeEnum.java
View File

@@ -14,54 +14,54 @@ public enum TypeEnum {
/**
* 报文消息类型
*/
TYPE_1("0x2101","平台询问装置支持主题"),
TYPE_2("0x2102","平台向装置发送设备注册请求"),
TYPE_3("0x2103","平台询问设备模板信息"),
TYPE_4("0x2104","设备配置信息下发"),
TYPE_5("0x2105","设备接入命令"),
TYPE_6("0x2106","平台向设备发送数据命令"),
TYPE_7("0x2107","平台向设备发送控制命令"),
TYPE_8("0x2131","设备文件/目录信息询问"),
TYPE_9("0x2132","设备文件下载"),
TYPE_10("0x2133","设备文件上传"),
TYPE_11("0x2134","设备文件删除"),
TYPE_12("0x2135","设备目录创建"),
TYPE_13("0x2136","设备根目录查询"),
TYPE_14("0x2201","设备心跳应答 "),
TYPE_15("0x2401","设备数据主动上送应答"),
TYPE_16("0x1201","设备支持主题应答"),
TYPE_17("0x1202","联网装置应答注册请求"),
TYPE_18("0x1203","设备模板信息应答 "),
TYPE_19("0x1204","下发设备配置信息应答 "),
TYPE_20("0x1205","设备接入平台应答"),
TYPE_21("0x1206","平台向设备发送数据命令"),
TYPE_22("0x1207","设备控制命令应答"),
TYPE_23("0x1231","设备文件信息应答 "),
TYPE_24("0x1232","设备文件下载应答 "),
TYPE_25("0x1233","设备文件上传"),
TYPE_26("0x1234","设备文件删除"),
TYPE_27("0x1235","设备文件删除"),
TYPE_28("0x1236","设备根目录查询应答"),
TYPE_29("0x1101","设备心跳请求"),
TYPE_30("0x1301","设备数据主动上送"),
TYPE_1("8449","平台询问装置支持主题"),
TYPE_2("8450","平台向装置发送设备注册请求"),
TYPE_3("8451","平台询问设备模板信息"),
TYPE_4("8452","设备配置信息下发"),
TYPE_5("8453","设备接入命令"),
TYPE_6("8454","平台向设备发送数据命令"),
TYPE_7("8455","平台向设备发送控制命令"),
TYPE_8("8497","设备文件/目录信息询问"),
TYPE_9("8498","设备文件下载"),
TYPE_10("8499","设备文件上传"),
TYPE_11("8500","设备文件删除"),
TYPE_12("8501","设备目录创建"),
TYPE_13("8502","设备根目录查询"),
TYPE_14("8705","设备心跳应答 "),
TYPE_15("9217","设备数据主动上送应答"),
TYPE_16("4609","设备支持主题应答"),
TYPE_17("4610","联网装置应答注册请求"),
TYPE_18("4611","设备模板信息应答 "),
TYPE_19("4612","下发设备配置信息应答 "),
TYPE_20("4613","设备接入平台应答"),
TYPE_21("4614","平台向设备发送数据命令"),
TYPE_22("4615","设备控制命令应答"),
TYPE_23("4657","设备文件信息应答 "),
TYPE_24("4658","设备文件下载应答 "),
TYPE_25("4659","设备文件上传"),
TYPE_26("4660","设备文件删除"),
TYPE_27("4661","设备文件删除"),
TYPE_28("4662","设备根目录查询应答"),
TYPE_29("4353","设备心跳请求"),
TYPE_30("4865","设备数据主动上送"),
/**
* 数据类型
*/
DATA_1("0x01","软件信息SoftInfo"),
DATA_2("0x02","设备信息LdevInfo"),
DATA_3("0x03","电能数据Epd"),
DATA_4("0x04","电能质量数据Pqd"),
DATA_5("0x05","基础测量数据Bmd"),
DATA_6("0x06","事件Evt"),
DATA_7("0x07","告警Alm"),
DATA_8("0x08","状态Sts"),
DATA_9("0x08","开入Di"),
DATA_10("0x0A","开出Do"),
DATA_11("0x0B","参数Param"),
DATA_12("0x0C","定值Set"),
DATA_13("0x0D","内部定值InSet"),
DATA_14("0x0E","控制Ctrl"),
DATA_1("1","软件信息SoftInfo"),
DATA_2("2","设备信息LdevInfo"),
DATA_3("3","电能数据Epd"),
DATA_4("4","电能质量数据Pqd"),
DATA_5("5","基础测量数据Bmd"),
DATA_6("6","事件Evt"),
DATA_7("7","告警Alm"),
DATA_8("8","状态Sts"),
DATA_9("9","开入Di"),
DATA_10("10","开出Do"),
DATA_11("11","参数Param"),
DATA_12("12","定值Set"),
DATA_13("13","内部定值InSet"),
DATA_14("14","控制Ctrl"),
/**
* 数据模型列表

3
iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java
View File

@@ -48,15 +48,12 @@ public class DevAccessParam implements Serializable {
private String position;
@ApiModelProperty("电压等级")
@NotNull(message = "电压等级不能为空")
private String volGrade;
@ApiModelProperty("PT变比")
@NotNull(message = "PT变比不能为空")
private String ptRatio;
@ApiModelProperty("CT变比")
@NotNull(message = "CT变比不能为空")
private String ctRatio;
@ApiModelProperty("中心点经度")

21
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/CsModelDto.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.access.pojo.dto;
import lombok.Data;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/8/7 18:44
*/
@Data
public class CsModelDto {
private String devType;
private String modelId;
private Integer did;
}

2
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/DevCfgDto.java
View File

@@ -20,7 +20,7 @@ public class DevCfgDto implements Serializable {
@SerializedName("Did")
@ParamName("Did")
@NotNull(message = "设备Id,不为空")
private String did;
private Integer did;
@SerializedName("DevName")
@ParamName("DevName")

4
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/ReqAndResDto.java
View File

@@ -28,7 +28,7 @@ public class ReqAndResDto implements Serializable {
@SerializedName("Did")
@ApiModelProperty("设备唯一标识lDid,填入0代表nDid")
@NotBlank(message = "设备唯一标识lDid不能为空")
private String did;
private Integer did;
@SerializedName("Pri")
@ApiModelProperty("报文处理的优先级")
@@ -38,7 +38,7 @@ public class ReqAndResDto implements Serializable {
@SerializedName("Type")
@ApiModelProperty("消息类型")
@NotNull(message = "消息类型不能为空")
private String type;
private Integer type;
@SerializedName("Msg")
@ApiModelProperty("报文内容")

2
iot-access/access-api/src/main/java/com/njcn/access/pojo/param/ReqAndResParam.java
View File

@@ -37,7 +37,7 @@ public class ReqAndResParam implements Serializable {
@SerializedName("Type")
@ApiModelProperty("消息类型")
@NotNull(message = "消息类型不能为空")
private String type;
private Integer type;
@SerializedName("Msg")
@ApiModelProperty("报文内容")

17
iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsLineModel.java
View File

@@ -42,21 +42,4 @@ public class CsLineModel {
* 安装位置
*/
private String position;
/**
* 电压等级
*/
private String volGrade;
/**
* PT变比
*/
private String ptRatio;
/**
* CT变比
*/
private String ctRatio;
}

22
iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsTopic.java
View File

@@ -1,10 +1,9 @@
package com.njcn.access.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
/**
* <p>
@@ -14,32 +13,35 @@ import lombok.Setter;
* @author xuyang
* @since 2023-07-13
*/
@Getter
@Setter
@Data
@TableName("cs_topic")
public class CsTopic extends BaseEntity {
public class CsTopic {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id")
private String id;
/**
* 设备识别码
*/
private String ndid;
@TableField(value = "ndid")
private String nDid;
/**
* 主题名称
*/
@TableField(value = "topic")
private String topic;
/**
* 主题类型
* 协议版本
*/
private Integer type;
@TableField(value = "version")
private String version;
}