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

das接口修改

Browse Source
This commit is contained in:
chenhaojie 2024-08-08 09:53:09 +08:00
parent 19a8861d3c
commit e9e4693fed
20 changed files with 466 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
das/pom.xml
View File

@ -28,6 +28,7 @@
<annotations.version>4.8.6</annotations.version>
<undertow.version>2.3.14.Final</undertow.version>
<apache.poi>5.3.0</apache.poi>
<taosdata.verson>3.2.10</taosdata.verson>
</properties>
<dependencies>
@ -92,6 +93,11 @@
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId>
<version>${taosdata.verson}</version>
</dependency>
<!-- 提供Redis连接池 -->
<dependency>

14
das/src/main/java/com/das/DasApplication.java
View File

@ -1,5 +1,8 @@
package com.das;
import com.das.modules.node.service.TDEngineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
@ -10,10 +13,17 @@ import org.springframework.scheduling.annotation.EnableScheduling;
*/
@EnableScheduling
@SpringBootApplication
public class DasApplication {
public class DasApplication implements CommandLineRunner {
@Autowired
TDEngineService tDEngineService;
public static void main(String[] args) {
SpringApplication.run(DasApplication.class, args);
}
@Override
public void run(String... args) {
tDEngineService.init();
//数据服务初始化
tDEngineService.initIotModel();
}
}

4
das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java
View File

@ -25,4 +25,8 @@ public interface SysIotModelMapper extends BaseMapper<SysIotModel> {
String getIotModelServiceCode(Integer objectType);
List<SysIotModelVo> getAllIotModel();
String getIotModel(Long id);
}

43
das/src/main/java/com/das/modules/node/command/AnalogDataCommand.java
View File

@ -2,27 +2,56 @@ package com.das.modules.node.command;
import cn.hutool.core.collection.ListUtil;
import com.das.common.utils.AdminRedisTemplate;
import com.das.modules.equipment.entity.SysIotModel;
import com.das.modules.equipment.mapper.SysIotModelMapper;
import com.das.modules.node.constant.NodeConstant;
import com.das.modules.node.domain.bo.RTData;
import com.das.modules.node.domain.bo.TerminalMessage;
import com.das.modules.node.service.TDEngineService;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service(value = NodeConstant.ANALOG_DATA)
@Slf4j
public class AnalogDataCommand implements BaseCommand{
public static final String YC_KEY_NAME = "RDB:YC:VALUES";
@Autowired
AdminRedisTemplate adminRedisTemplate;
@Autowired
SysIotModelMapper sysIotModelMapper;
@Autowired
TDEngineService tdEngineService;
@Override
public void doCommand(TerminalMessage data) {
JsonNode jsonNode = data.getData();
Map<String, Object> values = Map.of(
"deviceId", jsonNode.get("deviceId").asLong(),
"dataTime", data.getTime(),
"values", ListUtil.toList(jsonNode.get("value").asText())
);
adminRedisTemplate.set(YC_KEY_NAME, values);
String deviceId = jsonNode.get("deviceId").asText();
Long dataTime = jsonNode.get("deviceId").asLong();
adminRedisTemplate.set(deviceId, ListUtil.toList(jsonNode.get("values").asText()));
// 存入td库
// 根据设备ID获取对应的物模型属性
String iotModelCode= sysIotModelMapper.getIotModel(jsonNode.get("deviceId").asLong());
ArrayList values = ListUtil.toList(jsonNode.get("values").asText());
List<RTData> list = new ArrayList<>();
RTData rtData = RTData.builder()
.dataTime(dataTime)
.deviceId(Long.valueOf(deviceId))
.values(values)
.build();
list.add(rtData);
tdEngineService.updateYCValues(list, iotModelCode);
}
}

10
das/src/main/java/com/das/modules/node/command/HistoryStateDataCommand.java
View File

@ -1,10 +0,0 @@
package com.das.modules.node.command;
import com.das.modules.node.domain.bo.TerminalMessage;
public class HistoryStateDataCommand implements BaseCommand{
@Override
public void doCommand(TerminalMessage data) {
// 更新td数据库
}
}

20
das/src/main/java/com/das/modules/node/command/InitDeviceDataCommand.java
View File

@ -1,10 +1,30 @@
package com.das.modules.node.command;
import cn.hutool.core.collection.ListUtil;
import com.das.common.utils.AdminRedisTemplate;
import com.das.modules.node.constant.NodeConstant;
import com.das.modules.node.domain.bo.TerminalMessage;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service(value = NodeConstant.INIT_DEVICE_DATA)
@Slf4j
public class InitDeviceDataCommand implements BaseCommand{
@Autowired
AdminRedisTemplate adminRedisTemplate;
@Override
public void doCommand(TerminalMessage data) {
log.info("收到设备初始化数据");
// 存入redis
JsonNode dataInfo = data.getData();
if (!dataInfo.isEmpty()) {
String deviceId = dataInfo.get("deviceId").asText();
// 存入redis
adminRedisTemplate.set(deviceId, ListUtil.toList(dataInfo.get("values").asText()));
}
}
}

39
das/src/main/java/com/das/modules/node/command/StateDataCommand.java
View File

@ -2,26 +2,51 @@ package com.das.modules.node.command;
import cn.hutool.core.collection.ListUtil;
import com.das.common.utils.AdminRedisTemplate;
import com.das.modules.equipment.mapper.SysIotModelMapper;
import com.das.modules.node.constant.NodeConstant;
import com.das.modules.node.domain.bo.RTData;
import com.das.modules.node.domain.bo.TerminalMessage;
import com.das.modules.node.service.TDEngineService;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service(value = NodeConstant.STATE_DATA)
@Slf4j
public class StateDataCommand implements BaseCommand{
public static final String YM_KEY_NAME = "RDB:YM:VALUES";
@Autowired
TDEngineService tdEngineService;
@Autowired
AdminRedisTemplate adminRedisTemplate;
@Autowired
SysIotModelMapper sysIotModelMapper;
@Override
public void doCommand(TerminalMessage data) {
JsonNode jsonNode = data.getData();
Map<String, Object> values = Map.of(
"deviceId", jsonNode.get("deviceId").asLong(),
"dataTime", data.getTime(),
"values", ListUtil.toList(jsonNode.get("value").asText())
);
adminRedisTemplate.set(YM_KEY_NAME, values);
String deviceId = jsonNode.get("deviceId").asText();
adminRedisTemplate.set(deviceId, ListUtil.toList(jsonNode.get("values").asText()));
String iotModelCode= sysIotModelMapper.getIotModel(jsonNode.get("deviceId").asLong());
Long dataTime = jsonNode.get("deviceId").asLong();
// 存入td库
ArrayList values = ListUtil.toList(jsonNode.get("values").asText());
List<RTData> list = new ArrayList<>();
RTData rtData = RTData.builder()
.dataTime(dataTime)
.deviceId(Long.valueOf(deviceId))
.values(values)
.build();
list.add(rtData);
tdEngineService.updateStataValues(list, iotModelCode);
}
}

8
das/src/main/java/com/das/modules/node/constant/NodeConstant.java
View File

@ -9,4 +9,12 @@ public interface NodeConstant {
String LAST_PONG_TIME = "LastPongTime";
String HEARTBEAT = "heartbeat";
String DEVICE_CONTROL = "deviceControl";
String INIT_DEVICE_DATA = "initDeviceData";
String ANALOG_DATA = "analogData";
String STATE_DATA = "stateData";
}

17
das/src/main/java/com/das/modules/node/controller/SysNodeController.java
View File

@ -8,7 +8,9 @@ import com.das.common.result.R;
import com.das.common.utils.PageDataInfo;
import com.das.modules.node.domain.dto.*;
import com.das.modules.node.domain.vo.*;
import com.das.modules.node.service.DataService;
import com.das.modules.node.service.SysNodeService;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@ -34,6 +36,10 @@ public class SysNodeController {
@Autowired
private SysNodeService sysNodeService;
@Autowired
private DataService dataService;
/** 获取节点列表 */
@PostMapping("/list")
@ -84,8 +90,9 @@ public class SysNodeController {
/** 配置下发 */
@PostMapping("/configUpdate")
public R<Void> configUpdate() {
return R.success();
public R<?> configUpdate() {
JsonNode configUpdateData = dataService.getConfigUpdateInfo(Long.valueOf(1));
return R.success(configUpdateData);
}
@ -229,5 +236,11 @@ public class SysNodeController {
}
return R.success("导入失败");
}
/** 遥控遥调 */
@PostMapping("/link/deviceControl")
public void deviceControl(@RequestBody DeviceControlDto device) {
sysNodeService.deviceControl(device);
}
}

19
das/src/main/java/com/das/modules/node/domain/bo/RTData.java Normal file
View File

@ -0,0 +1,19 @@
package com.das.modules.node.domain.bo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class RTData {
@JsonSerialize(using = ToStringSerializer.class)
private Long deviceId;
private Long dataTime;
private Object values;
}

20
das/src/main/java/com/das/modules/node/domain/dto/DeviceControlDto.java Normal file
View File

@ -0,0 +1,20 @@
package com.das.modules.node.domain.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
@Data
public class DeviceControlDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long nodeId;
@JsonSerialize(using = ToStringSerializer.class)
private Long deviceId;
private String serviceName;
private Integer opValue;
}

2
das/src/main/java/com/das/modules/node/domain/vo/SysCommunicationLinkVo.java
View File

@ -30,7 +30,7 @@ public class SysCommunicationLinkVo {
/**
* 协议参数
*/
private Object params;
private String params;
/**
* 所属系统节点

2
das/src/main/java/com/das/modules/node/service/SysNodeService.java
View File

@ -42,4 +42,6 @@ public interface SysNodeService {
void exportMappingList(SysImptabmappingDto sysImptabmappingDto,HttpServletRequest request, HttpServletResponse response);
boolean importMappingList(String linkId, MultipartFile file);
void deviceControl(DeviceControlDto device);
}

171
das/src/main/java/com/das/modules/node/service/TDEngineService.java Normal file
View File

@ -0,0 +1,171 @@
package com.das.modules.node.service;
import cn.hutool.core.collection.ListUtil;
import com.das.modules.equipment.domain.vo.SysIotModelVo;
import com.das.modules.equipment.mapper.SysIotModelMapper;
import com.das.modules.equipment.service.SysIotModelService;
import com.das.modules.node.domain.bo.RTData;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@Slf4j
@Service
@EnableAsync
public class TDEngineService {
private HikariDataSource hikariDataSource;
@Autowired
private SysIotModelMapper sysIotModelMapper;
@Value("${tdengine.url}")
private String url;
@Value("${tdengine.username}")
private String username;
@Value("${tdengine.password}")
private String password;
@Value("${tdengine.batch-size:10000}")
private int batchSize;
private ConcurrentHashMap<String, String> iotModelMap = new ConcurrentHashMap<>(10000);
public void init() {
if (hikariDataSource == null) {
HikariConfig config = new HikariConfig();
config.setJdbcUrl(url);
config.setUsername(username);
config.setPassword(password);
config.setConnectionTestQuery("select server_status()");
config.setMinimumIdle(10); //minimum number of idle connection
config.setMaximumPoolSize(20); //maximum number of connection in the pool
config.setMaxLifetime(0); // maximum life time for each connection
// config.setIdleTimeout(0); // max idle time for recycle idle connection
log.info("=======>TDEngineUrl:" + config.getJdbcUrl());
hikariDataSource = new HikariDataSource(config);
}
}
// 遍历所有的物模型存入内存中
public void initIotModel() {
//查询所有的物模型
List<SysIotModelVo> allIotModel = sysIotModelMapper.getAllIotModel();
for (SysIotModelVo item : allIotModel) {
String key = String.valueOf(item.getId());
iotModelMap.put(key, item.getIotModelCode());
}
// 创建物模型超级表
StringBuilder sb = new StringBuilder(1024*1024);
try (Connection conn = hikariDataSource.getConnection();
Statement pstmt = conn.createStatement()) {
ListUtil.page(allIotModel, batchSize, (list)->{
sb.setLength(0);
for (SysIotModelVo info : list) {
sb.append("CREATE STABLE IF NOT EXISTS ");
sb.append(info.getIotModelCode());
sb.append(" (`updatetime` TIMESTAMP, `datavalue` DOUBLE,`attributecode` VARCHAR(100)) TAGS (`sourcetype` BIGINT); ");
}
try {
pstmt.executeUpdate(sb.toString());
} catch (SQLException ex) {
log.error("save yx error", ex);
}
});
} catch (SQLException ex) {
log.error(ex.getMessage());
}
}
@Async
public void updateYCValues(List<RTData> values, String iotModelCode) {
StringBuilder sb = new StringBuilder(1024*1024);
try (Connection conn = hikariDataSource.getConnection();
Statement pstmt = conn.createStatement()) {
ListUtil.page(values, batchSize, (list)->{
sb.setLength(0);
sb.append("insert into ");
for (RTData dv : list) {
sb.append(iotModelCode);
sb.append(dv.getDeviceId());
sb.append(" using analog tags (");
sb.append(dv.getDeviceId());
sb.append(",");
sb.append(1L);
sb.append(") values (");
sb.append(dv.getDataTime());
sb.append(",");
sb.append(dv.getValues());
sb.append(")");
}
try {
pstmt.executeUpdate(sb.toString());
} catch (SQLException ex) {
log.error("save yc error", ex);
}
});
} catch (SQLException ex) {
log.error(ex.getMessage());
}
}
@Async
public void updateStataValues(List<RTData> values, String iotModelCode) {
StringBuilder sb = new StringBuilder(1024*1024);
try (Connection conn = hikariDataSource.getConnection();
Statement pstmt = conn.createStatement()) {
ListUtil.page(values, batchSize, (list)->{
sb.setLength(0);
sb.append("insert into ");
for (RTData dv : list) {
sb.append(iotModelCode);
sb.append(dv.getDeviceId());
sb.append(" using analog tags (");
sb.append(dv.getDeviceId());
sb.append(",");
sb.append(1L);
sb.append(") values (");
sb.append(dv.getDataTime());
sb.append(",");
sb.append(dv.getValues());
sb.append(")");
}
try {
pstmt.executeUpdate(sb.toString());
} catch (SQLException ex) {
log.error("save yc error", ex);
}
});
} catch (SQLException ex) {
log.error(ex.getMessage());
}
}
@PreDestroy
public void free() {
if (hikariDataSource != null) {
log.info("释放TDEngine资源");
hikariDataSource.close();
}
}
}

30
das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.das.modules.node.mapper.SysImptabmappingMapper;
import com.das.modules.node.service.DataService;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.dsl.Disruptor;
import jakarta.annotation.PostConstruct;
@ -20,6 +21,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@ -52,7 +54,6 @@ public class DataServiceImpl implements DataService {
}
@PreDestroy
public void destroy() {
if (ringBuffer != null) {
@ -72,11 +73,9 @@ public class DataServiceImpl implements DataService {
try {
TerminalMessage terminalMessage = ringBuffer.get(seq);
terminalMessage.from(msg);
}
catch (Exception e){
} catch (Exception e) {
log.error("发送消息失败", e);
}
finally {
} finally {
ringBuffer.publish(seq);
}
@ -88,13 +87,16 @@ public class DataServiceImpl implements DataService {
List<LinkVo> links = new ArrayList<>();
List<EquipmentVo> equipments = new ArrayList<>();
List<Long> equipmentList = new ArrayList<>();
try {
// 获取所有的链路信息
List<SysCommunicationLinkVo> sysCommunicationLinkVoList = sysCommunicationLinkMapper.querySysCommunicationLink(nodeId);
for (SysCommunicationLinkVo sysCommunicationLinkVo : sysCommunicationLinkVoList) {
ObjectMapper objectMapper = new ObjectMapper();
JsonNode jsonNode = objectMapper.readTree(sysCommunicationLinkVo.getParams());
LinkVo linkVo = new LinkVo();
linkVo.setLinkId(sysCommunicationLinkVo.getId());
linkVo.setLinkName(sysCommunicationLinkVo.getLinkName());
linkVo.setParams(sysCommunicationLinkVo.getParams());
linkVo.setParams(jsonNode);
linkVo.setProtocol(sysCommunicationLinkVo.getProtocol());
List<String> stringList = new ArrayList<>();
// 获取关联的设备Id
@ -105,8 +107,10 @@ public class DataServiceImpl implements DataService {
String[] stringArray = stringList.toArray(new String[0]);
linkVo.setDevices(stringArray);
links.add(linkVo);
}
for (Long equipmentId : equipmentList) {
HashMap map = new HashMap<>();
ObjectMapper equipObjectMapper = new ObjectMapper();
ObjectNode equipJsonNode = equipObjectMapper.convertValue(map, ObjectNode.class);
List<IotModelVo> newIotModelFieldList = new ArrayList<>();
List<IotModelVo> newIotModelServiceList = new ArrayList<>();
// 获取设备IOT地址
@ -116,7 +120,9 @@ public class DataServiceImpl implements DataService {
if (!CollectionUtils.isEmpty(iotModelFieldList)) {
for (IotModelVo info : iotModelFieldList) {
if (info.getParams() == null) {
// info.setParams();
info.setParams(equipJsonNode);
} else {
info.setParams(equipObjectMapper.readTree(info.getParams().toString()));
}
newIotModelFieldList.add(info);
}
@ -125,7 +131,9 @@ public class DataServiceImpl implements DataService {
if (!CollectionUtils.isEmpty(iotModelServiceList)) {
for (IotModelVo info : iotModelServiceList) {
if (info.getParams() == null) {
// info.setParams();
info.setParams(equipJsonNode);
}else {
info.setParams(equipObjectMapper.readTree(info.getParams().toString()));
}
newIotModelServiceList.add(info);
}
@ -137,6 +145,10 @@ public class DataServiceImpl implements DataService {
equipment.setServices(newIotModelServiceList);
equipments.add(equipment);
}
}
} catch (Exception e) {
log.error("获取设备配置信息失败", e);
}
configUpdateVo.setCreateTime(System.currentTimeMillis());
configUpdateVo.setNodeId(String.valueOf(nodeId));
configUpdateVo.setVersion(1);

34
das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
View File

@ -13,6 +13,9 @@ import com.das.modules.auth.entity.SysOrg;
import com.das.modules.auth.mapper.SysOrgMapper;
import com.das.modules.equipment.mapper.SysEquipmentMapper;
import com.das.modules.equipment.mapper.SysIotModelMapper;
import com.das.modules.node.constant.NodeConstant;
import com.das.modules.node.disruptor.TerminalMessageEventHandler;
import com.das.modules.node.domain.bo.TerminalMessage;
import com.das.modules.node.domain.dto.*;
import com.das.modules.node.domain.vo.ImptabmappingVo;
import com.das.modules.node.domain.vo.SysCommunicationLinkVo;
@ -26,6 +29,7 @@ import com.das.modules.node.mapper.SysImptabmappingMapper;
import com.das.modules.node.mapper.SysNodeMapper;
import com.das.modules.node.service.SysNodeService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@ -44,6 +48,7 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@Transactional(rollbackFor = Exception.class)
@ -70,6 +75,8 @@ public class SysNodeServiceImpl implements SysNodeService {
@Autowired
private SysIotModelMapper sysIotModelMapper;
TerminalMessageEventHandler terminalMessageEventHandler;
@Override
public List<SysNodeVo> querySysNodeList() {
List<SysNodeVo> sysNodeVoList = sysNodeMapper.querySysNodeList();
@ -320,6 +327,33 @@ public class SysNodeServiceImpl implements SysNodeService {
return flag;
}
@Override
public void deviceControl(DeviceControlDto device) {
try {
HashMap map = new HashMap<>();
ObjectMapper objectMapper = new ObjectMapper();
String cmd = NodeConstant.DEVICE_CONTROL;
Long time = System.currentTimeMillis();
map.put("deviceId", device.getDeviceId());
map.put("serviceName", device.getServiceName());
map.put("opValue", device.getOpValue());
// 将 HashMap 转换为 JsonNode
ObjectNode jsonNode = objectMapper.convertValue(map, ObjectNode.class);
TerminalMessage configUpdate = TerminalMessage.builder()
.cmd(cmd)
.cmdId(String.valueOf(device.getDeviceId()))
.time(time)
.data(jsonNode)
.build();
terminalMessageEventHandler.sendTerminalMessageWithResult(device.getNodeId(), configUpdate);
} catch (Exception e) {
log.error("设备控制失败 ", e);
}
}
private void addSysImptabmapping(List<BindEquipmentInfoDto> equipmentId, Long linkId, SysUserVo sysUserVo, List<SysImptabmapping> addList) {
int index = 0;
for (BindEquipmentInfoDto info : equipmentId) {

5
das/src/main/resources/application.yml
View File

@ -93,3 +93,8 @@ logging:
level:
com:
das: DEBUG
tdengine:
password: taosdata
url: jdbc:TAOS-RS://192.168.109.160:6041/das
username: root

2
das/src/main/resources/mapper/SysCommunicationLinkMapper.xml
View File

@ -30,7 +30,7 @@
</select>
<select id="querySysCommunicationLink" resultType="com.das.modules.node.domain.vo.SysCommunicationLinkVo">
select sc.id,sc.link_name,sc.protocol,to_json(sc.params::json) AS params from sys_communicationlink sc where sc.node_id = #{nodeId}
select sc.id,sc.link_name,sc.protocol,sc.params from sys_communicationlink sc where sc.node_id = #{nodeId}
</select>
</mapper>

4
das/src/main/resources/mapper/SysImptabmappingMapper.xml
View File

@ -57,7 +57,7 @@
</select>
<select id="getIotModelFieldByEquipmentId" resultType="com.das.modules.node.domain.vo.IotModelVo">
select simf.attribute_name as name,simf.attribute_type as type,to_json(si.params::json) as params from sys_imptabmapping si
select simf.attribute_name as name,simf.attribute_type as type,si.params from sys_imptabmapping si
left join sys_equipment se on si.equipment_id = se.id
left join sys_iot_model_field simf on se.iot_model_id = simf.iot_model_id
where si.equipment_id = #{equipmentId}
@ -65,7 +65,7 @@
<select id="getIotModelServiceByEquipmentId" resultType="com.das.modules.node.domain.vo.IotModelVo">
select sims.service_name as name ,sims.service_type as type ,to_json(si.params::json) AS params from sys_imptabmapping si
select sims.service_name as name ,sims.service_type as type ,si.params from sys_imptabmapping si
left join sys_equipment se on si.equipment_id = se.id
left join sys_iot_model_service sims on se.iot_model_id = sims.iot_model_id
where si.equipment_id = #{equipmentId}

10
das/src/main/resources/mapper/SysIotModelMapper.xml
View File

@ -54,5 +54,15 @@
</select>
<select id="getAllIotModel" resultMap="SysIotModelMap">
select * from sys_iot_model
</select>
<select id="getIotModel" resultType="java.lang.String">
select sim.iot_model_code from sys_iot_model sim left join sys_equipment se on sim.id = se.iot_model_id
where se.id = #{id}
</select>
</mapper>