fix: 保存组态节点信息，包括：数据源、数据交互、数据动效。

云中非
1 parent 3bf13839
Showing 2 changed files with 71 additions and 5 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationNodeController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ConfigurationNodeDTO.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationNodeController.java
View file @e0443b6
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationNodeController.java
View file @e0443b6
@@ -10,9 +10,12 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationActDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationDatasourceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationEventDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationNodeDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationActService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationDatasourceService;
@@ -21,6 +24,7 @@ import org.thingsboard.server.dao.yunteng.service.YtConfigurationEventService;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 /**
  * @author Administrator
@@ -35,6 +39,39 @@ public class YtConfigurationNodeController extends BaseController {
     private final YtConfigurationEventService eventService;
     private final YtConfigurationActService actService;
+    @PostMapping
+    @ApiOperation("编辑节点信息")
+    public ResponseEntity<ConfigurationNodeDTO> saveNode(
+            @Validated({AddGroup.class}) @RequestBody ConfigurationNodeDTO nodeDTO)
+            throws ThingsboardException {
+        String tenantId = getCurrentUser().getCurrentTenantId();
+        Optional.ofNullable(nodeDTO.getDataSources()).ifPresent(datas ->{
+            datas.forEach(one -> {
+                if(!one.getTenantId().equals(tenantId)){
+                    throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
+                }
+                datasourceService.saveConfigurationDatasource(one);
+            });
+        });
+        Optional.ofNullable(nodeDTO.getEvent()).ifPresent(datas ->{
+            datas.forEach(one -> {
+                if(!one.getTenantId().equals(tenantId)){
+                    throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
+                }
+                eventService.saveConfigurationEvent(one);
+            });
+        });
+        Optional.ofNullable(nodeDTO.getAct()).ifPresent(datas ->{
+            datas.forEach(one -> {
+                if(!one.getTenantId().equals(tenantId)){
+                    throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
+                }
+                actService.saveConfigurationAct(one);
+            });
+        });
+        return ResponseEntity.ok(nodeDTO);
+    }
+
     @PostMapping("datascource")
     @ApiOperation("编辑数据源")
     public ResponseEntity<ConfigurationDatasourceDTO> saveDatascource(
@@ -92,7 +129,7 @@ public class YtConfigurationNodeController extends BaseController {
     @GetMapping("/{levelType}/{levelId}")
     @ApiOperation("组件信息")
-    public ResponseEntity<Map<String, List>> nodeInform(
+    public ResponseEntity<ConfigurationNodeDTO> nodeInform(
             @ApiParam(value = "组态资源类型，例如：CONFIGURE、CONTENT、NODE", required = true, defaultValue = "NODE") @PathVariable("levelType") String levelType,
             @ApiParam(value = "组态资源ID", required = true) @PathVariable("levelId") String levelId) throws ThingsboardException {
         String tenantId = getCurrentUser().getCurrentTenantId();
@@ -100,15 +137,15 @@ public class YtConfigurationNodeController extends BaseController {
         List<ConfigurationDatasourceDTO> sources = datasourceService.listConfigurationDatasource(tenantId, levelType, levelId);
         List<ConfigurationEventDTO> events = eventService.listConfigurationEvent(tenantId, levelType, levelId);
         List<ConfigurationActDTO> acts = actService.listConfigurationAct(tenantId, levelType, levelId);
-        Map<String, List> result = new HashMap<>();
+        ConfigurationNodeDTO result = new ConfigurationNodeDTO();
         if (sources != null && sources.size() > 0) {
-            result.put("dataSources", sources);
+            result.setDataSources(sources);
         }
         if (events != null && events.size() > 0) {
-            result.put("event", events);
+            result.setEvent(events);
         }
         if (acts != null && acts.size() > 0) {
-            result.put("act", acts);
+            result.setAct(acts);
         }
         return ResponseEntity.ok(result);
     }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ConfigurationNodeDTO.java 0 → 100644
View file @e0443b6
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ConfigurationNodeDTO.java 0 → 100644
View file @e0443b6
+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.ActTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 组态节点动画效果
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConfigurationNodeDTO extends TenantDTO {
+  @ApiModelProperty(value = "数据源")
+  private List<ConfigurationDatasourceDTO> dataSources;
+
+  @ApiModelProperty(value = "事件集合")
+  private List<ConfigurationEventDTO> event;
+
+  @ApiModelProperty(value = "动画集合")
+  private List<ConfigurationActDTO> act;
+}