sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
刘玉霞 2024-07-03 15:05:26 +08:00
commit b1fe64b7bb
2 changed files with 63 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -70,6 +70,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
QueryWrapper<SysIotModel> sysIotModelQueryWrapper = new QueryWrapper<>();
sysIotModelQueryWrapper.eq("iot_model_code", sysIotModelDto.getIotModelCode());
sysIotModelQueryWrapper.eq("id", sysIotModelDto.getId());
SysIotModel sysIotModelQuery = sysIotModelMapper.selectOne(sysIotModelQueryWrapper);
if (!(sysIotModelQuery == null)){
throw new ServiceException("更新的物模型编码code重复");
@ -88,8 +89,8 @@ public class SysIotModelServiceImpl implements SysIotModelService {
public void deleteSysIotModel(SysIotModelDto sysIotModelDto) {
sysIotModelMapper.deleteById(sysIotModelDto.getId());
// 删除绑定的物模型属性和动作
sysIotModelFieldMapper.delete(new QueryWrapper<SysIotModelField>().eq("iot_model_id",sysIotModelDto.getId()));
sysIotModelServiceMapper.delete(new QueryWrapper<SysIotModelServices>().eq("iot_model_id",sysIotModelDto.getId()));
// sysIotModelFieldMapper.delete(new QueryWrapper<SysIotModelField>().eq("iot_model_id",sysIotModelDto.getId()));
// sysIotModelServiceMapper.delete(new QueryWrapper<SysIotModelServices>().eq("iot_model_id",sysIotModelDto.getId()));
}
@Override
@ -156,6 +157,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
QueryWrapper<SysIotModelField> sysIotModelFieldQueryWrapper = new QueryWrapper<>();
sysIotModelFieldQueryWrapper.eq("attribute_code", sysIotModelFieldDto.getAttributeCode());
sysIotModelFieldQueryWrapper.eq("id", sysIotModelFieldDto.getId());
SysIotModelField sysIotModelFieldQuery = sysIotModelFieldMapper.selectOne(sysIotModelFieldQueryWrapper);
if (!(sysIotModelFieldQuery == null)){
throw new ServiceException("物模型属性修改的code已经存在");
@ -220,6 +222,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
QueryWrapper<SysIotModelField> sysIotModelFieldQueryWrapper = new QueryWrapper<>();
sysIotModelFieldQueryWrapper.eq("service_code", sysIotModelServiceDto.getServiceCode());
sysIotModelFieldQueryWrapper.eq("id", sysIotModelServiceDto.getId());
SysIotModelField sysIotModelFieldQuery = sysIotModelFieldMapper.selectOne(sysIotModelFieldQueryWrapper);
if (!(sysIotModelFieldQuery == null)){
throw new ServiceException("物模型动作更新code已经存在");

66
docs/datacollect/README.md
View File

@ -94,19 +94,69 @@
`ws://127.0.0.1:7790/gate/{nodeId}`
PS: 同一节点只允许建立一条连接。
## 通讯报文
### 节点上线请求
?> 方向: `采集程序` -> `系统`
### 报文格式
```json
{
//节点ID
"nodeId" : "nx10928234",
//消息ID
"messageId": "123512351235123",
//命令
"action" : "online"
"cmd": "heartbeat",
//命令ID
"cmdId": "123123",
//发送时间(毫秒)
"time": 123123123123,
//数据体
"data": {}
}
```
### 节点心跳报文
?> 方向: `采集程序` -> `系统`
**命令:** `heartbeat`
**数据体:**
```json
{
//心跳生存时间(毫秒)
"ttl": 30000,
//终端状态, 0 - 离线, 1 - 在线
"status": 0,
//通讯链路监控信息
"links": [
{
//通讯链路IRN
"linkId": 3444,
//通讯链路状态
"online": true
},
{
"linkId": 123,
"online": false
}
]
}
```
### 实时数据上报
?> 方向: `采集程序` -> `系统`
**命令：** `realdata`
**数据体:**
```json
{
//key为设备ID
"1123451235": {
//key为属性名
"Ia": 123.1,
"Ib": 122.1,
"Ic": 123.1,
"Switch01": 1
}
}
```