|
|
@@ -1,23 +1,23 @@
|
|
|
-package cn.iocoder.yudao.module.iot.service.productthingmodel;
|
|
|
+package cn.iocoder.yudao.module.iot.service.thinkmodel;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.thingmodel.ThingModelEvent;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.thingmodel.ThingModelProperty;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.thingmodel.ThingModelService;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.thingmodel.dataType.ThingModelArgument;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.thingmodel.dataType.ThingModelArrayDataSpecs;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.thingmodel.dataType.ThingModelDateOrTextDataSpecs;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.vo.IotProductThingModelPageReqVO;
|
|
|
-import cn.iocoder.yudao.module.iot.controller.admin.productthingmodel.vo.IotProductThingModelSaveReqVO;
|
|
|
-import cn.iocoder.yudao.module.iot.convert.productthingmodel.IotProductThingModelConvert;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelEvent;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelService;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelArgument;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelArrayDataSpecs;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelDateOrTextDataSpecs;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelPageReqVO;
|
|
|
+import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelSaveReqVO;
|
|
|
+import cn.iocoder.yudao.module.iot.convert.thinkmodel.IotProductThinkModelConvert;
|
|
|
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
|
|
|
-import cn.iocoder.yudao.module.iot.dal.dataobject.productthingmodel.IotProductThingModelDO;
|
|
|
-import cn.iocoder.yudao.module.iot.dal.mysql.thinkmodelfunction.IotProductThingModelMapper;
|
|
|
+import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
|
|
|
+import cn.iocoder.yudao.module.iot.dal.mysql.thinkmodel.IotProductThinkModelMapper;
|
|
|
import cn.iocoder.yudao.module.iot.enums.product.IotProductStatusEnum;
|
|
|
-import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
|
|
|
+import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
|
|
|
import cn.iocoder.yudao.module.iot.service.product.IotProductService;
|
|
|
import cn.iocoder.yudao.module.iot.service.tdengine.IotSuperTableService;
|
|
|
import jakarta.annotation.Resource;
|
|
|
@@ -41,10 +41,10 @@ import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
|
|
|
@Service
|
|
|
@Validated
|
|
|
@Slf4j
|
|
|
-public class IotProductThingModelServiceImpl implements IotProductThingModelService {
|
|
|
+public class IotProductThinkModelServiceImpl implements IotProductThinkModelService {
|
|
|
|
|
|
@Resource
|
|
|
- private IotProductThingModelMapper productThingModelMapper;
|
|
|
+ private IotProductThinkModelMapper productThinkModelMapper;
|
|
|
|
|
|
@Resource
|
|
|
private IotProductService productService;
|
|
|
@@ -53,7 +53,7 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public Long createProductThingModel(IotProductThingModelSaveReqVO createReqVO) {
|
|
|
+ public Long createProductThinkModel(IotProductThinkModelSaveReqVO createReqVO) {
|
|
|
// 1. 校验功能标识符在同一产品下是否唯一
|
|
|
validateIdentifierUnique(createReqVO.getProductId(), createReqVO.getIdentifier());
|
|
|
|
|
|
@@ -67,11 +67,11 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
validateProductStatus(createReqVO.getProductId());
|
|
|
|
|
|
// 5. 插入数据库
|
|
|
- IotProductThingModelDO function = IotProductThingModelConvert.INSTANCE.convert(createReqVO);
|
|
|
- productThingModelMapper.insert(function);
|
|
|
+ IotProductThinkModelDO function = IotProductThinkModelConvert.INSTANCE.convert(createReqVO);
|
|
|
+ productThinkModelMapper.insert(function);
|
|
|
|
|
|
// 6. 如果创建的是属性，需要更新默认的事件和服务
|
|
|
- if (Objects.equals(createReqVO.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
|
|
|
+ if (Objects.equals(createReqVO.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
|
|
|
//createDefaultEventsAndServices(createReqVO.getProductId(), createReqVO.getProductKey());
|
|
|
}
|
|
|
return function.getId();
|
|
|
@@ -95,14 +95,14 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
}
|
|
|
|
|
|
private void validateNameUnique(Long productId, String name) {
|
|
|
- IotProductThingModelDO function = productThingModelMapper.selectByProductIdAndName(productId, name);
|
|
|
+ IotProductThinkModelDO function = productThinkModelMapper.selectByProductIdAndName(productId, name);
|
|
|
if (function != null) {
|
|
|
throw exception(THINK_MODEL_FUNCTION_NAME_EXISTS);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
private void validateIdentifierUnique(Long productId, String identifier) {
|
|
|
- IotProductThingModelDO function = productThingModelMapper.selectByProductIdAndIdentifier(productId, identifier);
|
|
|
+ IotProductThinkModelDO function = productThinkModelMapper.selectByProductIdAndIdentifier(productId, identifier);
|
|
|
if (function != null) {
|
|
|
throw exception(THINK_MODEL_FUNCTION_IDENTIFIER_EXISTS);
|
|
|
}
|
|
|
@@ -110,9 +110,9 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void updateProductThingModel(IotProductThingModelSaveReqVO updateReqVO) {
|
|
|
+ public void updateProductThinkModel(IotProductThinkModelSaveReqVO updateReqVO) {
|
|
|
// 1. 校验功能是否存在
|
|
|
- validateproductThingModelMapperExists(updateReqVO.getId());
|
|
|
+ validateproductThinkModelMapperExists(updateReqVO.getId());
|
|
|
|
|
|
// 2. 校验功能标识符是否唯一
|
|
|
validateIdentifierUniqueForUpdate(updateReqVO.getId(), updateReqVO.getProductId(), updateReqVO.getIdentifier());
|
|
|
@@ -121,17 +121,17 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
validateProductStatus(updateReqVO.getProductId());
|
|
|
|
|
|
// 4. 更新数据库
|
|
|
- IotProductThingModelDO productThingModelDO = IotProductThingModelConvert.INSTANCE.convert(updateReqVO);
|
|
|
- productThingModelMapper.updateById(productThingModelDO);
|
|
|
+ IotProductThinkModelDO productThinkModelDO = IotProductThinkModelConvert.INSTANCE.convert(updateReqVO);
|
|
|
+ productThinkModelMapper.updateById(productThinkModelDO);
|
|
|
|
|
|
// 5. 如果更新的是属性，需要更新默认的事件和服务
|
|
|
- if (Objects.equals(updateReqVO.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
|
|
|
+ if (Objects.equals(updateReqVO.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
|
|
|
createDefaultEventsAndServices(updateReqVO.getProductId(), updateReqVO.getProductKey());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
private void validateIdentifierUniqueForUpdate(Long id, Long productId, String identifier) {
|
|
|
- IotProductThingModelDO function = productThingModelMapper.selectByProductIdAndIdentifier(productId, identifier);
|
|
|
+ IotProductThinkModelDO function = productThinkModelMapper.selectByProductIdAndIdentifier(productId, identifier);
|
|
|
if (function != null && ObjectUtil.notEqual(function.getId(), id)) {
|
|
|
throw exception(THINK_MODEL_FUNCTION_IDENTIFIER_EXISTS);
|
|
|
}
|
|
|
@@ -139,9 +139,9 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void deleteProductThingModel(Long id) {
|
|
|
+ public void deleteProductThinkModel(Long id) {
|
|
|
// 1. 校验功能是否存在
|
|
|
- IotProductThingModelDO functionDO = productThingModelMapper.selectById(id);
|
|
|
+ IotProductThinkModelDO functionDO = productThinkModelMapper.selectById(id);
|
|
|
if (functionDO == null) {
|
|
|
throw exception(THINK_MODEL_FUNCTION_NOT_EXISTS);
|
|
|
}
|
|
|
@@ -150,10 +150,10 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
validateProductStatus(functionDO.getProductId());
|
|
|
|
|
|
// 2. 删除功能
|
|
|
- productThingModelMapper.deleteById(id);
|
|
|
+ productThinkModelMapper.deleteById(id);
|
|
|
|
|
|
// 3. 如果删除的是属性，需要更新默认的事件和服务
|
|
|
- if (Objects.equals(functionDO.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
|
|
|
+ if (Objects.equals(functionDO.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
|
|
|
createDefaultEventsAndServices(functionDO.getProductId(), functionDO.getProductKey());
|
|
|
}
|
|
|
}
|
|
|
@@ -163,25 +163,25 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
*
|
|
|
* @param id 功能编号
|
|
|
*/
|
|
|
- private void validateproductThingModelMapperExists(Long id) {
|
|
|
- if (productThingModelMapper.selectById(id) == null) {
|
|
|
+ private void validateproductThinkModelMapperExists(Long id) {
|
|
|
+ if (productThinkModelMapper.selectById(id) == null) {
|
|
|
throw exception(THINK_MODEL_FUNCTION_NOT_EXISTS);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public IotProductThingModelDO getProductThingModel(Long id) {
|
|
|
- return productThingModelMapper.selectById(id);
|
|
|
+ public IotProductThinkModelDO getProductThinkModel(Long id) {
|
|
|
+ return productThinkModelMapper.selectById(id);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<IotProductThingModelDO> getProductThingModelListByProductId(Long productId) {
|
|
|
- return productThingModelMapper.selectListByProductId(productId);
|
|
|
+ public List<IotProductThinkModelDO> getProductThinkModelListByProductId(Long productId) {
|
|
|
+ return productThinkModelMapper.selectListByProductId(productId);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public PageResult<IotProductThingModelDO> getProductThingModelPage(IotProductThingModelPageReqVO pageReqVO) {
|
|
|
- return productThingModelMapper.selectPage(pageReqVO);
|
|
|
+ public PageResult<IotProductThinkModelDO> getProductThinkModelPage(IotProductThinkModelPageReqVO pageReqVO) {
|
|
|
+ return productThinkModelMapper.selectPage(pageReqVO);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -190,15 +190,15 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
IotProductDO product = productService.getProduct(productId);
|
|
|
|
|
|
// 2. 查询产品的物模型功能列表
|
|
|
- List<IotProductThingModelDO> functionList = productThingModelMapper.selectListByProductId(productId);
|
|
|
+ List<IotProductThinkModelDO> functionList = productThinkModelMapper.selectListByProductId(productId);
|
|
|
|
|
|
// 3. 生成 TDengine 的数据模型
|
|
|
dbStructureDataService.createSuperTableDataModel(product, functionList);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<IotProductThingModelDO> getProductThingModelListByProductKey(String productKey) {
|
|
|
- return productThingModelMapper.selectListByProductKey(productKey);
|
|
|
+ public List<IotProductThinkModelDO> getProductThinkModelListByProductKey(String productKey) {
|
|
|
+ return productThinkModelMapper.selectListByProductKey(productKey);
|
|
|
}
|
|
|
|
|
|
// TODO @puhui999: 需要重构
|
|
|
@@ -207,82 +207,82 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
*/
|
|
|
public void createDefaultEventsAndServices(Long productId, String productKey) {
|
|
|
// 1. 获取当前属性列表
|
|
|
- List<IotProductThingModelDO> propertyList = productThingModelMapper
|
|
|
- .selectListByProductIdAndType(productId, IotProductThingModelTypeEnum.PROPERTY.getType());
|
|
|
+ List<IotProductThinkModelDO> propertyList = productThinkModelMapper
|
|
|
+ .selectListByProductIdAndType(productId, IotProductThinkModelTypeEnum.PROPERTY.getType());
|
|
|
|
|
|
// 2. 生成新的事件和服务列表
|
|
|
- List<IotProductThingModelDO> newFunctionList = new ArrayList<>();
|
|
|
+ List<IotProductThinkModelDO> newFunctionList = new ArrayList<>();
|
|
|
// 生成属性上报事件
|
|
|
- ThingModelEvent propertyPostEvent = generatePropertyPostEvent(propertyList);
|
|
|
+ ThinkModelEvent propertyPostEvent = generatePropertyPostEvent(propertyList);
|
|
|
if (propertyPostEvent != null) {
|
|
|
- IotProductThingModelDO eventFunction = buildEventFunctionDO(productId, productKey, propertyPostEvent);
|
|
|
+ IotProductThinkModelDO eventFunction = buildEventFunctionDO(productId, productKey, propertyPostEvent);
|
|
|
newFunctionList.add(eventFunction);
|
|
|
}
|
|
|
// 生成属性设置服务
|
|
|
- ThingModelService propertySetService = generatePropertySetService(propertyList);
|
|
|
+ ThinkModelService propertySetService = generatePropertySetService(propertyList);
|
|
|
if (propertySetService != null) {
|
|
|
- IotProductThingModelDO setServiceFunction = buildServiceFunctionDO(productId, productKey, propertySetService);
|
|
|
+ IotProductThinkModelDO setServiceFunction = buildServiceFunctionDO(productId, productKey, propertySetService);
|
|
|
newFunctionList.add(setServiceFunction);
|
|
|
}
|
|
|
// 生成属性获取服务
|
|
|
- ThingModelService propertyGetService = generatePropertyGetService(propertyList);
|
|
|
+ ThinkModelService propertyGetService = generatePropertyGetService(propertyList);
|
|
|
if (propertyGetService != null) {
|
|
|
- IotProductThingModelDO getServiceFunction = buildServiceFunctionDO(productId, productKey, propertyGetService);
|
|
|
+ IotProductThinkModelDO getServiceFunction = buildServiceFunctionDO(productId, productKey, propertyGetService);
|
|
|
newFunctionList.add(getServiceFunction);
|
|
|
}
|
|
|
|
|
|
// 3. 获取数据库中的默认的旧事件和服务列表
|
|
|
- List<IotProductThingModelDO> oldFunctionList = productThingModelMapper.selectListByProductIdAndIdentifiersAndTypes(
|
|
|
+ List<IotProductThinkModelDO> oldFunctionList = productThinkModelMapper.selectListByProductIdAndIdentifiersAndTypes(
|
|
|
productId,
|
|
|
Arrays.asList("post", "set", "get"),
|
|
|
- Arrays.asList(IotProductThingModelTypeEnum.EVENT.getType(), IotProductThingModelTypeEnum.SERVICE.getType())
|
|
|
+ Arrays.asList(IotProductThinkModelTypeEnum.EVENT.getType(), IotProductThinkModelTypeEnum.SERVICE.getType())
|
|
|
);
|
|
|
|
|
|
// 3.1 使用 diffList 方法比较新旧列表
|
|
|
- List<List<IotProductThingModelDO>> diffResult = diffList(oldFunctionList, newFunctionList,
|
|
|
+ List<List<IotProductThinkModelDO>> diffResult = diffList(oldFunctionList, newFunctionList,
|
|
|
// 继续使用 identifier 和 type 进行比较：这样可以准确地匹配对应的功能对象。
|
|
|
(oldFunc, newFunc) -> Objects.equals(oldFunc.getIdentifier(), newFunc.getIdentifier())
|
|
|
&& Objects.equals(oldFunc.getType(), newFunc.getType()));
|
|
|
- List<IotProductThingModelDO> createList = diffResult.get(0); // 需要新增的
|
|
|
- List<IotProductThingModelDO> updateList = diffResult.get(1); // 需要更新的
|
|
|
- List<IotProductThingModelDO> deleteList = diffResult.get(2); // 需要删除的
|
|
|
+ List<IotProductThinkModelDO> createList = diffResult.get(0); // 需要新增的
|
|
|
+ List<IotProductThinkModelDO> updateList = diffResult.get(1); // 需要更新的
|
|
|
+ List<IotProductThinkModelDO> deleteList = diffResult.get(2); // 需要删除的
|
|
|
|
|
|
// 3.2 批量执行数据库操作
|
|
|
// 新增数据库中的新事件和服务列表
|
|
|
if (CollUtil.isNotEmpty(createList)) {
|
|
|
- productThingModelMapper.insertBatch(createList);
|
|
|
+ productThinkModelMapper.insertBatch(createList);
|
|
|
}
|
|
|
// 更新数据库中的事件和服务列表
|
|
|
if (CollUtil.isNotEmpty(updateList)) {
|
|
|
// 首先，为每个需要更新的对象设置其对应的 ID
|
|
|
updateList.forEach(updateFunc -> {
|
|
|
- IotProductThingModelDO oldFunc = findFunctionByIdentifierAndType(
|
|
|
+ IotProductThinkModelDO oldFunc = findFunctionByIdentifierAndType(
|
|
|
oldFunctionList, updateFunc.getIdentifier(), updateFunc.getType());
|
|
|
if (oldFunc != null) {
|
|
|
updateFunc.setId(oldFunc.getId());
|
|
|
}
|
|
|
});
|
|
|
// 过滤掉没有设置 ID 的对象
|
|
|
- List<IotProductThingModelDO> validUpdateList = updateList.stream()
|
|
|
+ List<IotProductThinkModelDO> validUpdateList = updateList.stream()
|
|
|
.filter(func -> func.getId() != null)
|
|
|
.collect(Collectors.toList());
|
|
|
// 执行批量更新
|
|
|
if (CollUtil.isNotEmpty(validUpdateList)) {
|
|
|
- productThingModelMapper.updateBatch(validUpdateList);
|
|
|
+ productThinkModelMapper.updateBatch(validUpdateList);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 删除数据库中的旧事件和服务列表
|
|
|
if (CollUtil.isNotEmpty(deleteList)) {
|
|
|
- Set<Long> idsToDelete = CollectionUtils.convertSet(deleteList, IotProductThingModelDO::getId);
|
|
|
- productThingModelMapper.deleteByIds(idsToDelete);
|
|
|
+ Set<Long> idsToDelete = CollectionUtils.convertSet(deleteList, IotProductThinkModelDO::getId);
|
|
|
+ productThinkModelMapper.deleteByIds(idsToDelete);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 根据标识符和类型查找功能对象
|
|
|
*/
|
|
|
- private IotProductThingModelDO findFunctionByIdentifierAndType(List<IotProductThingModelDO> functionList,
|
|
|
+ private IotProductThinkModelDO findFunctionByIdentifierAndType(List<IotProductThinkModelDO> functionList,
|
|
|
String identifier, Integer type) {
|
|
|
return CollUtil.findOne(functionList, func ->
|
|
|
Objects.equals(func.getIdentifier(), identifier) && Objects.equals(func.getType(), type));
|
|
|
@@ -291,40 +291,40 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
/**
|
|
|
* 构建事件功能对象
|
|
|
*/
|
|
|
- private IotProductThingModelDO buildEventFunctionDO(Long productId, String productKey, ThingModelEvent event) {
|
|
|
- return new IotProductThingModelDO()
|
|
|
+ private IotProductThinkModelDO buildEventFunctionDO(Long productId, String productKey, ThinkModelEvent event) {
|
|
|
+ return new IotProductThinkModelDO()
|
|
|
.setProductId(productId)
|
|
|
.setProductKey(productKey)
|
|
|
.setIdentifier(event.getIdentifier())
|
|
|
.setName(event.getName())
|
|
|
.setDescription(event.getDescription())
|
|
|
- .setType(IotProductThingModelTypeEnum.EVENT.getType())
|
|
|
+ .setType(IotProductThinkModelTypeEnum.EVENT.getType())
|
|
|
.setEvent(event);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 构建服务功能对象
|
|
|
*/
|
|
|
- private IotProductThingModelDO buildServiceFunctionDO(Long productId, String productKey, ThingModelService service) {
|
|
|
- return new IotProductThingModelDO()
|
|
|
+ private IotProductThinkModelDO buildServiceFunctionDO(Long productId, String productKey, ThinkModelService service) {
|
|
|
+ return new IotProductThinkModelDO()
|
|
|
.setProductId(productId)
|
|
|
.setProductKey(productKey)
|
|
|
.setIdentifier(service.getIdentifier())
|
|
|
.setName(service.getName())
|
|
|
.setDescription(service.getDescription())
|
|
|
- .setType(IotProductThingModelTypeEnum.SERVICE.getType())
|
|
|
+ .setType(IotProductThinkModelTypeEnum.SERVICE.getType())
|
|
|
.setService(service);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 生成属性上报事件
|
|
|
*/
|
|
|
- private ThingModelEvent generatePropertyPostEvent(List<IotProductThingModelDO> propertyList) {
|
|
|
+ private ThinkModelEvent generatePropertyPostEvent(List<IotProductThinkModelDO> propertyList) {
|
|
|
if (CollUtil.isEmpty(propertyList)) {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- ThingModelEvent event = new ThingModelEvent()
|
|
|
+ ThinkModelEvent event = new ThinkModelEvent()
|
|
|
.setIdentifier("post")
|
|
|
.setName("属性上报")
|
|
|
.setType("info")
|
|
|
@@ -332,11 +332,11 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
.setMethod("thing.event.property.post");
|
|
|
|
|
|
// 将属性列表转换为事件的输出参数
|
|
|
- List<ThingModelArgument> outputData = new ArrayList<>();
|
|
|
+ List<ThinkModelArgument> outputData = new ArrayList<>();
|
|
|
// TODO @puhui999: 需要重构
|
|
|
- for (IotProductThingModelDO functionDO : propertyList) {
|
|
|
- ThingModelProperty property = functionDO.getProperty();
|
|
|
- ThingModelArgument arg = new ThingModelArgument()
|
|
|
+ for (IotProductThinkModelDO functionDO : propertyList) {
|
|
|
+ ThinkModelProperty property = functionDO.getProperty();
|
|
|
+ ThinkModelArgument arg = new ThinkModelArgument()
|
|
|
.setIdentifier(property.getIdentifier())
|
|
|
.setName(property.getName())
|
|
|
//.setDataType(property.getDataType())
|
|
|
@@ -351,17 +351,17 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
/**
|
|
|
* 生成属性设置服务
|
|
|
*/
|
|
|
- private ThingModelService generatePropertySetService(List<IotProductThingModelDO> propertyList) {
|
|
|
+ private ThinkModelService generatePropertySetService(List<IotProductThinkModelDO> propertyList) {
|
|
|
if (propertyList == null || propertyList.isEmpty()) {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- List<ThingModelArgument> inputData = new ArrayList<>();
|
|
|
+ List<ThinkModelArgument> inputData = new ArrayList<>();
|
|
|
// TODO @puhui999: 需要重构
|
|
|
- for (IotProductThingModelDO functionDO : propertyList) {
|
|
|
- ThingModelProperty property = functionDO.getProperty();
|
|
|
- //if (IotProductThingModelAccessModeEnum.WRITE.getMode().equals(property.getAccessMode()) || IotProductThingModelAccessModeEnum.READ_WRITE.getMode().equals(property.getAccessMode())) {
|
|
|
- // ThingModelArgument arg = new ThingModelArgument()
|
|
|
+ for (IotProductThinkModelDO functionDO : propertyList) {
|
|
|
+ ThinkModelProperty property = functionDO.getProperty();
|
|
|
+ //if (IotProductThinkModelAccessModeEnum.WRITE.getMode().equals(property.getAccessMode()) || IotProductThinkModelAccessModeEnum.READ_WRITE.getMode().equals(property.getAccessMode())) {
|
|
|
+ // ThinkModelArgument arg = new ThinkModelArgument()
|
|
|
// .setIdentifier(property.getIdentifier())
|
|
|
// .setName(property.getName())
|
|
|
// .setDataType(property.getDataType())
|
|
|
@@ -376,7 +376,7 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
}
|
|
|
|
|
|
// 属性设置服务一般不需要输出参数
|
|
|
- return new ThingModelService()
|
|
|
+ return new ThinkModelService()
|
|
|
.setIdentifier("set")
|
|
|
.setName("属性设置")
|
|
|
.setCallType("async")
|
|
|
@@ -390,17 +390,17 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
/**
|
|
|
* 生成属性获取服务
|
|
|
*/
|
|
|
- private ThingModelService generatePropertyGetService(List<IotProductThingModelDO> propertyList) {
|
|
|
+ private ThinkModelService generatePropertyGetService(List<IotProductThinkModelDO> propertyList) {
|
|
|
if (propertyList == null || propertyList.isEmpty()) {
|
|
|
return null;
|
|
|
}
|
|
|
// TODO @puhui999: 需要重构
|
|
|
- List<ThingModelArgument> outputData = new ArrayList<>();
|
|
|
- for (IotProductThingModelDO functionDO : propertyList) {
|
|
|
- ThingModelProperty property = functionDO.getProperty();
|
|
|
+ List<ThinkModelArgument> outputData = new ArrayList<>();
|
|
|
+ for (IotProductThinkModelDO functionDO : propertyList) {
|
|
|
+ ThinkModelProperty property = functionDO.getProperty();
|
|
|
//if (ObjectUtils.equalsAny(property.getAccessMode(),
|
|
|
- // IotProductThingModelAccessModeEnum.READ.getMode(), IotProductThingModelAccessModeEnum.READ_WRITE.getMode())) {
|
|
|
- // ThingModelArgument arg = new ThingModelArgument()
|
|
|
+ // IotProductThinkModelAccessModeEnum.READ.getMode(), IotProductThinkModelAccessModeEnum.READ_WRITE.getMode())) {
|
|
|
+ // ThinkModelArgument arg = new ThinkModelArgument()
|
|
|
// .setIdentifier(property.getIdentifier())
|
|
|
// .setName(property.getName())
|
|
|
// .setDataType(property.getDataType())
|
|
|
@@ -414,7 +414,7 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- ThingModelService service = new ThingModelService()
|
|
|
+ ThinkModelService service = new ThinkModelService()
|
|
|
.setIdentifier("get")
|
|
|
.setName("属性获取")
|
|
|
.setCallType("async")
|
|
|
@@ -422,17 +422,17 @@ public class IotProductThingModelServiceImpl implements IotProductThingModelServ
|
|
|
.setMethod("thing.service.property.get");
|
|
|
|
|
|
// 定义输入参数：属性标识符列表
|
|
|
- ThingModelArgument inputArg = new ThingModelArgument()
|
|
|
+ ThinkModelArgument inputArg = new ThinkModelArgument()
|
|
|
.setIdentifier("properties")
|
|
|
.setName("属性标识符列表")
|
|
|
.setDescription("需要获取的属性标识符列表")
|
|
|
.setDirection("input"); // 设置为输入参数
|
|
|
|
|
|
// 创建数组类型，元素类型为文本类型（字符串）
|
|
|
- ThingModelArrayDataSpecs arrayType = new ThingModelArrayDataSpecs();
|
|
|
+ ThinkModelArrayDataSpecs arrayType = new ThinkModelArrayDataSpecs();
|
|
|
arrayType.setDataType("array");
|
|
|
- //ThingModelArraySpecs arraySpecs = new ThingModelArraySpecs();
|
|
|
- ThingModelDateOrTextDataSpecs textType = new ThingModelDateOrTextDataSpecs();
|
|
|
+ //ThinkModelArraySpecs arraySpecs = new ThinkModelArraySpecs();
|
|
|
+ ThinkModelDateOrTextDataSpecs textType = new ThinkModelDateOrTextDataSpecs();
|
|
|
textType.setDataType("text");
|
|
|
//arraySpecs.setItem(textType);
|
|
|
//arrayType.setSpecs(arraySpecs);
|
puhui999