Merge branch '20220523' into 'master'

20220523

See merge request huang/thingsboard3.3.2!103

@@ -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);
     }

@@ -30,10 +30,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 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.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtCredentialsDto;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -357,6 +354,26 @@ public class YtDeviceController extends BaseController {
         return deviceService.findDevicesByDeviceTypeAndOrganizationId(deviceType,getCurrentUser().getCurrentTenantId(), organizationId);
     }
 
+    @GetMapping("/list/master/{organizationId}")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    @ApiOperation("主设备列表")
+    public List<SelectItemDTO> getMasterDevices(
+            @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId) throws ThingsboardException {
+        return deviceService.findMasterDevices(getCurrentUser().getCurrentTenantId()
+                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
+                , organizationId);
+    }
+    @GetMapping("/list/slave/{organizationId}")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    @ApiOperation("从设备列表")
+    public List<SelectItemDTO> getSlaveDevices(
+            @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId,
+            @ApiParam(value = "主设备ID") @RequestParam(value = "masterId",required = false) String masterId) throws ThingsboardException {
+        return deviceService.findSlaveDevices(masterId,getCurrentUser().getCurrentTenantId()
+                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
+                , organizationId);
+    }
+
     @GetMapping("/gateway/{tbDeviceId}")
     @ApiOperation("获取网关设备")
     public DeviceDTO findGateWayDeviceByTbDeviceId(

+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;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+@Data
+public class SelectItemDTO {
+  @ApiModelProperty("下拉选项值")
+  private String id;
+
+  @ApiModelProperty("下拉选项名")
+  private String name;
+
+  @ApiModelProperty("设备类型")
+  private DeviceTypeEnum deviceType;
+}

@@ -29,4 +29,6 @@ public class ConfigurationAct extends TenantBaseEntity {
     private String attr;
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode condition;
+    private boolean enabled;
+
 }

@@ -28,4 +28,6 @@ public class ConfigurationDatasource extends TenantBaseEntity {
     @TableField(typeHandler = ListStringTypeHandler.class)
     private List<String> attr;
     private String remark;
+    private boolean enabled;
+
 }

@@ -25,4 +25,5 @@ public class ConfigurationEvent extends TenantBaseEntity {
     @TableField(typeHandler = EnumTypeHandler.class)
     private EventTypeEnum type;
     private String remark;
+    private boolean enabled;
 }

@@ -39,6 +39,7 @@ public class YtConfigurationActServiceImpl
         ConfigurationAct old = baseMapper.selectOne(filter);
         ConfigurationAct newData = actDTO.getEntity(ConfigurationAct.class);
         if (old == null) {
+            newData.setEnabled(false);
             baseMapper.insert(newData);
         } else if(!actDTO.getTenantId().equals(old.getTenantId())){
             throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());

@@ -37,6 +37,7 @@ public class YtConfigurationDatasourceServiceImpl
         ConfigurationDatasource old = baseMapper.selectOne(filter);
         ConfigurationDatasource newData = sourceDTO.getEntity(ConfigurationDatasource.class);
         if (old == null) {
+            newData.setEnabled(false);
             baseMapper.insert(newData);
         } else if(!sourceDTO.getTenantId().equals(old.getTenantId())){
             throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());

@@ -40,6 +40,7 @@ public class YtConfigurationEventServiceImpl
         ConfigurationEvent old = baseMapper.selectOne(filter);
         ConfigurationEvent newData = eventDTO.getEntity(ConfigurationEvent.class);
         if (old == null) {
+            newData.setEnabled(false);
             baseMapper.insert(newData);
         } else if(!eventDTO.getTenantId().equals(old.getTenantId())){
             throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());

@@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
@@ -429,4 +430,19 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         }
         return false;
     }
+
+
+    @Override
+    public List<SelectItemDTO> findMasterDevices(String tenantId, String customerId, String organizationId) {
+        List<String> orgIds = organizationAllIds(tenantId,organizationId);
+        List<SelectItemDTO> result = baseMapper.masterDevices(customerId,tenantId,orgIds);
+        return result;
+    }
+
+    @Override
+    public List<SelectItemDTO> findSlaveDevices(String masterId,String tenantId,String customerId, String organizationId){
+        List<String> orgIds = organizationAllIds(tenantId,organizationId);
+        List<SelectItemDTO> result = baseMapper.slaveDevices(customerId,tenantId,orgIds,masterId);
+        return result;
+    }
 }

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 
@@ -84,4 +85,24 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
   Integer countMsgs(@Param("queryMap") Map<String, Object> queryMap);
 
   Integer countDataPoints(@Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 主设备列表
+   * @param customerId       客户ID
+   * @param tenantId         租户ID
+   * @param organizationIds  组织ID
+   * @return
+   */
+  List<SelectItemDTO> masterDevices(@Param("customerId") String customerId,@Param("tenantId") String tenantId,@Param("organizationIds") List<String> organizationIds);
+
+  /**
+   * 从设备列表
+   * @param customerId       客户ID
+   * @param tenantId         租户ID
+   * @param organizationIds  组织ID
+   * @param masterId         主设备ID
+   * @return
+   */
+  List<SelectItemDTO> slaveDevices(@Param("customerId") String customerId,@Param("tenantId") String tenantId
+          ,@Param("organizationIds") List<String> organizationIds,@Param("masterId") String masterId);
 }

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
@@ -103,4 +104,21 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @return
      */
     Boolean otherUsing(String deviceId,String tenantId);
+
+    /**
+     * 主设备信息
+     * @param tenantId        租户ID
+     * @param organizationId  组织ID
+     * @return   设备列表
+     */
+    List<SelectItemDTO> findMasterDevices(String tenantId, String customerId, String organizationId);
+
+    /**
+     * 从设备信息
+     * @param masterId        主设备ID
+     * @param tenantId        租户ID
+     * @param organizationId  组织ID
+     * @return   设备列表
+     */
+    List<SelectItemDTO> findSlaveDevices(String masterId,String tenantId,String customerId, String organizationId);
 }

@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DeviceMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO" id="listInform">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+    </resultMap>
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DeviceDTO" id="deviceMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
@@ -325,4 +330,53 @@
             </if>
         </where>
     </select>
+
+    <select id="masterDevices" resultMap="listInform">
+        SELECT
+        base.tb_device_id as id,base.name,base.device_type
+        FROM  iotfs_device base
+        LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
+        <where>
+            base.device_type  != 'SENSOR'
+            <if test="tenantId !=null and tenantId !=''">
+                AND base.tenant_id = #{tenantId}
+            </if>
+            <if test="customerId !=null and customerId !=''">
+                AND tde.customer_id :: TEXT = #{customerId}
+            </if>
+            <if test="organizationIds !=null">
+                AND base.organization_id IN
+                <foreach collection="organizationIds" item="orgId" open="(" separator="," close=")">
+                    #{orgId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="slaveDevices" resultMap="listInform">
+        SELECT
+        ide.tb_device_id as id,ide.name,ide.device_type
+        FROM  (select * from relation where relation_type_group = 'COMMON' AND relation_type = 'Created' AND from_type = 'DEVICE' AND to_type = 'DEVICE'
+            <if test="masterId !=null and masterId !=''">
+                AND from_id :: TEXT = #{masterId}
+            </if>
+        ) base
+        LEFT JOIN device tde ON base.to_id = tde.id
+        LEFT JOIN iotfs_device ide ON tde.ID :: TEXT = ide.tb_device_id
+        <where>
+            ide.device_type  = 'SENSOR'
+            <if test="tenantId !=null and tenantId !=''">
+                AND ide.tenant_id = #{tenantId}
+            </if>
+            <if test="organizationIds !=null">
+                AND ide.organization_id IN
+                <foreach collection="organizationIds" item="orgId" open="(" separator="," close=")">
+                    #{orgId}
+                </foreach>
+            </if>
+            <if test="customerId !=null and customerId !=''">
+                AND tde.customer_id :: TEXT = #{customerId}
+            </if>
+        </where>
+    </select>
 </mapper>