Merge branch 'master' into ljl1207

@@ -557,7 +557,7 @@ public abstract class BaseController {
         }
     }
 
-    DeviceProfile checkDeviceProfileId(DeviceProfileId deviceProfileId, Operation operation) throws ThingsboardException {
+    protected DeviceProfile checkDeviceProfileId(DeviceProfileId deviceProfileId, Operation operation) throws ThingsboardException {
         try {
             validateId(deviceProfileId, "Incorrect deviceProfileId " + deviceProfileId);
             DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(getCurrentUser().getTenantId(), deviceProfileId);

@@ -105,6 +105,8 @@ public class YtDeviceController extends BaseController {
       @RequestParam(value = "deviceState", required = false) DeviceState deviceState,
       @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
       @RequestParam(value = "organizationId",required = false) String organizationId,
+      @RequestParam(value = "alarmStatus",required = false) Integer alarmStatus,
+      @RequestParam(value = "profileId",required = false) String profileId,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
     HashMap<String, Object> queryMap = new HashMap<>();
@@ -112,6 +114,8 @@ public class YtDeviceController extends BaseController {
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put("name", name);
+    queryMap.put("alarmStatus", alarmStatus);
+    queryMap.put("profileId", profileId);
     if (deviceState != null) {
       queryMap.put("deviceState", deviceState.name());
     }

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+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.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
+
+/** @Description 场景联动 @Author cxy @Date 2021/11/25 11:25 */
+@RestController
+@RequestMapping("/api/yt/sceneLinkage")
+@RequiredArgsConstructor
+@Api(tags = "场景联动")
+public class YtSceneLinkageController extends BaseController {
+
+  private final SceneLinkageService sceneLinkageService;
+
+  @ApiOperation(value = "保存新增的场景联动数据")
+  @PostMapping
+  public ResponseEntity<SceneLinkageDTO> saveSceneLinkage(
+      @Validated(AddGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO)
+      throws ThingsboardException {
+    SceneLinkageDTO newSceneLinkageDTO =
+        sceneLinkageService.saveScenelinkage(
+            sceneLinkageDTO, getCurrentUser().getCurrentTenantId());
+    return Optional.ofNullable(newSceneLinkageDTO)
+        .map(
+            dto -> {
+              URI location =
+                  ServletUriComponentsBuilder.fromCurrentRequest()
+                      .path("/{id}")
+                      .buildAndExpand(newSceneLinkageDTO.getId())
+                      .toUri();
+              return ResponseEntity.created(location).body(newSceneLinkageDTO);
+            })
+        .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+  }
+
+  @ApiOperation("修改场景联动的数据")
+  @PostMapping("/update")
+  public void updateSceneLinkage(
+      @Validated(UpdateGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO) {
+    sceneLinkageService.updateSceneLinkage(sceneLinkageDTO);
+  }
+
+  @ApiOperation("场景联动的分页")
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public PageData<SceneLinkageDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "status", required = false) Integer status,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
+      @RequestParam(value = "triggers", required = false) List<TriggerDTO> triggers)
+      throws ThingsboardException {
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put("name", name);
+    queryMap.put("status", status);
+    queryMap.put("organizationId", organizationId);
+    queryMap.put("triggers", triggers);
+    return sceneLinkageService.page(queryMap, getCurrentUser().getCurrentTenantId());
+  }
+
+  @ApiOperation(value = "删除场景联动")
+  @DeleteMapping
+  public void delete(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    sceneLinkageService.deleteSceneLinkage(
+        deleteDTO.getIds(), getCurrentUser().getCurrentTenantId());
+  }
+
+  @ApiOperation(value = "修改场景联动所属状态")
+  @PutMapping("/updateSceneStatus/{sceneLinkageId}/{status}")
+  public void updateRoleStatus(
+      @PathVariable String sceneLinkageId, @PathVariable("status") int status)
+      throws ThingsboardException {
+
+    sceneLinkageService.updateSceneStatus(
+        sceneLinkageId, status, getCurrentUser().getCurrentTenantId());
+  }
+
+  @ApiOperation(value = "通过场景id获取所属组织的设备集合")
+  @GetMapping("/device")
+  public ResponseEntity<Map> findDeviceList(@RequestParam String organizationId) {
+    HashMap<String, Object> map =
+        new HashMap<>() {
+          {
+            put("items", sceneLinkageService.findDeviceList(organizationId));
+          }
+        };
+    return ResponseEntity.ok(map);
+  }
+}

@@ -60,6 +60,14 @@ public final class ModelConstants {
     public static final String SYS_APP_DESIGN_TABLE_NAME = "sys_app_design";
     /** 中国城镇区街 */
     public static final String SYS_TOWN_TABLE_NAME = "sys_town";
+    /** 场景联动表 */
+    public static final String IOTFS_SCENE_LINKAGE_TABLE_NAME = "iotfs_scene_linkage";
+    /** 场景触发器 */
+    public static final String IOTFS_TRIGGER_TABLE_NAME = "iotfs_trigger";
+    /** 执行条件表 */
+    public static final String IOTFS_DO_CONDITION_TABLE_NAME = "iotfs_do_condition";
+    /** 条件动作表 */
+    public static final String IOTFS_DO_ACTION_TABLE_NAME = "iotfs_do_action";
   }
 
   public static class TableFields {

@@ -70,5 +70,6 @@ public class DeviceDTO extends TenantDTO {
   /** 设备凭证 */
   private DeviceCredentialsType deviceCredentials;
   /** 告警状态：0：正常 1：告警 */
+  @ApiModelProperty(value="告警状态:0正常,1告警")
   private Integer alarmStatus;
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @Description  场景联动执行动作数据传输表
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DoActionDTO  extends  TenantDTO{
+
+    @ApiModelProperty(value = "所属设备id")
+    private String deviceId;
+
+    @ApiModelProperty(value = "设备输出方式")
+    private String outPut;
+
+    @ApiModelProperty(value = "下发指令")
+    private String command;
+
+    @ApiModelProperty(value = "输出目标:设备,场景,其他")
+    private String outTarget;
+
+    @ApiModelProperty(value = "场景联动id")
+    private String sceneLinkageId;
+
+    @ApiModelProperty(value = "所属设备集合")
+    private List<DeviceDTO> deviceDTOList;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @Description 场景联动执行条件数据传输表
+ * @Author cxy
+ * @Date 2021/11/24 17:33
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DoConditionDTO  extends TenantDTO{
+
+    @ApiModelProperty(value = "所属设备id")
+    private String deviceId;
+
+    @ApiModelProperty(value = "设备状态")
+    private String status;
+
+    @ApiModelProperty(value = "属性")
+    private String property;
+
+    @ApiModelProperty(value = "比较大小,0为=, 1为<, 2为 >,3为<=, 4为>=")
+    private Integer compare;
+
+    @ApiModelProperty(value = "请输入比较值")
+    private String value;
+
+    @ApiModelProperty(value = "场景联动id")
+    private String sceneLinkageId;
+
+    @ApiModelProperty(value = "所属设备集合")
+    private List<DeviceDTO> deviceDTOList;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @Description 场景联动数据传输表
+ * @Author cxy
+ * @Date 2021/11/24 17:31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SceneLinkageDTO extends TenantDTO{
+
+    @ApiModelProperty(value = "场景联动名称", required = true)
+    @NotEmpty(message = "名称不能为空或字符串", groups = AddGroup.class)
+    private String name;
+
+    @ApiModelProperty(value = "状态:0表示已停用,1表示启用")
+    private Integer status;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @NotEmpty(message = "所属组织不能为空或者空字符串", groups = {AddGroup.class})
+    @ApiModelProperty(value = "所属组织id",required = true)
+    private String organizationId;
+
+    @ApiModelProperty(value = "触发器")
+    private List<TriggerDTO> triggers;
+
+    @ApiModelProperty(value = "执行动作")
+    private List<DoActionDTO> doActions;
+
+    @ApiModelProperty(value = "执行条件")
+    private List<DoConditionDTO> doConditions;
+
+}

@@ -32,20 +32,9 @@ public class SysEnterpriseDTO extends BaseDTO {
   private String area;
   @ApiModelProperty(value = "联系电话")
   private String tel;
-  @ApiModelProperty(value = "省")
-  private String nameProv;
-  @ApiModelProperty(value = "省code")
-  private String codeProv;
-  @ApiModelProperty(value = "市")
-  private String nameCity;
-  @ApiModelProperty(value = "市code")
-  private String codeCity;
-  @ApiModelProperty(value = "区")
-  private String nameCoun;
-  @ApiModelProperty(value = "区code")
-  private String codeCoun;
-  @ApiModelProperty(value = "县")
-  private String nameTown;
-  @ApiModelProperty(value = "县code")
+  @ApiModelProperty(value = "区域信息")
+  private SysTownDTO sysTown;
   private String codeTown;
+  @ApiModelProperty(value = "二维码")
+  private String qrCode;
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@ApiModel(value = "区域信息")
+@RequiredArgsConstructor
+public class SysTownDTO {
+    @ApiModelProperty(value = "省")
+    private String nameProv;
+    @ApiModelProperty(value = "省code")
+    private String codeProv;
+    @ApiModelProperty(value = "市")
+    private String nameCity;
+    @ApiModelProperty(value = "市code")
+    private String codeCity;
+    @ApiModelProperty(value = "区")
+    private String nameCoun;
+    @ApiModelProperty(value = "区code")
+    private String codeCoun;
+    @ApiModelProperty(value = "县")
+    private String nameTown;
+    @ApiModelProperty(value = "县code")
+    private String codeTown;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @Description  场景联动触发器数据传输表
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TriggerDTO extends TenantDTO{
+
+    @ApiModelProperty(value = "所属设备id")
+    private String deviceId;
+
+    @ApiModelProperty(value = "触发方式")
+    private String touchWay;
+
+    @ApiModelProperty(value = "触发事件")
+    private String triggerEvent;
+
+    @ApiModelProperty(value = "属性选择")
+    private String attributeChoose;
+
+    @ApiModelProperty(value = "场景联动id")
+    private String sceneLinkageId;
+
+    @ApiModelProperty(value = "比较大小,0为=, 1为<, 2为 >,3为<=, 4为>=")
+    private Integer compare;
+
+    @ApiModelProperty(value = "请输入比较值")
+    private String value;
+
+    @ApiModelProperty(value = "设备集合")
+    private List<DeviceDTO> deviceDTOList;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum AreaLevelEnum {
+  COUNTRY,
+  PROVINCE,
+  CITY,
+  COUNTY,
+  TOWN
+}

+package org.thingsboard.server.dao.yunteng.entities;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/** @Description 执行动作 @Author cxy @Date 2021/11/24 17:24 */
+@Data
+@TableName(value = ModelConstants.Table.IOTFS_DO_ACTION_TABLE_NAME,autoResultMap = true)
+@EqualsAndHashCode(callSuper = true)
+public class DoAction extends TenantBaseEntity {
+
+  private static final long serialVersionUID = -5459834451418047957L;
+
+  private String deviceId;
+  /** 设备输出方式 */
+  private String outPut;
+  /** 下发指令 */
+  private String command;
+
+  /** 输出目标:设备,场景,其他 */
+  private String outTarget;
+
+  /** 场景联动id */
+  private String sceneLinkageId;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/** @Description 执行条件实体表 @Author cxy @Date 2021/11/24 17:16 */
+@Data
+@TableName(value = ModelConstants.Table.IOTFS_DO_CONDITION_TABLE_NAME)
+@EqualsAndHashCode(callSuper = true)
+public class DoCondition extends TenantBaseEntity {
+  private static final long serialVersionUID = 2827674377416477646L;
+  /** 设备 */
+  private String deviceId;
+  /** 设备状态 */
+  private String status;
+  /** 设备属性 */
+  private String property;
+
+  /** 比较大小: 0为=, 1为<, 2为 >,3为<=, 4为>= */
+  private Integer compare;
+
+  /** 请输入比较值 */
+  private String value;
+
+  private String sceneLinkageId;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/** @Description 场景联动实体表 @Author cxy @Date 2021/11/24 16:40 */
+@Data
+@TableName(value = ModelConstants.Table.IOTFS_SCENE_LINKAGE_TABLE_NAME)
+@EqualsAndHashCode(callSuper = true)
+public class SceneLinkage extends TenantBaseEntity {
+
+  private static final long serialVersionUID = -306446373876239910L;
+
+  private String name;
+  /**
+   * 0表示已停用,1表示启用
+   */
+  private Integer status;
+
+  private String description;
+
+  private String organizationId;
+}

 package org.thingsboard.server.dao.yunteng.entities;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -36,25 +35,6 @@ public class SysEnterprise extends TenantBaseEntity {
   private String tel;
   /** 县code */
   private String codeTown;
-  /** 省 */
-  @TableField(exist = false)
-  private String nameProv;
-  /** 省code */
-  @TableField(exist = false)
-  private String codeProv;
-  /** 市 */
-  @TableField(exist = false)
-  private String nameCity;
-  /** 市code */
-  @TableField(exist = false)
-  private String codeCity;
-  /** 区 */
-  @TableField(exist = false)
-  private String nameCoun;
-  /** 区code */
-  @TableField(exist = false)
-  private String codeCoun;
-  /** 县 */
-  @TableField(exist = false)
-  private String nameTown;
+  /** 二维码 */
+  private String qrCode;
 }

+package org.thingsboard.server.dao.yunteng.entities;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+/** @Description 触发器实体表 @Author cxy @Date 2021/11/24 17:06 */
+@Data
+@TableName(value = ModelConstants.Table.IOTFS_TRIGGER_TABLE_NAME)
+@EqualsAndHashCode(callSuper = true)
+public class Trigger extends TenantBaseEntity {
+
+  private static final long serialVersionUID = -1847061176808850967L;
+  /** 设备 */
+  private String deviceId;
+  /** 触发方式 */
+  private String touchWay;
+  /** 触发事件 */
+  private String triggerEvent;
+  /** 属性选择 */
+  private String attributeChoose;
+  /** 场景联动id */
+  private String sceneLinkageId;
+  /** 比较大小: 0为=, 1为<, 2为 >,3为<=, 4为>= */
+  private Integer compare;
+  /** 请输入比较值 */
+  private String value;
+}

+package org.thingsboard.server.dao.yunteng.impl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.DoAction;
+import org.thingsboard.server.dao.yunteng.mapper.DoActionMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.DoActionService;
+
+/**
+ * @Description
+ * @Author cxy
+ * @Date 2021/12/6 20:23
+ */
+@Service
+@RequiredArgsConstructor
+public class DoActionServiceImpl extends AbstractBaseService<DoActionMapper, DoAction>
+        implements DoActionService {
+}

+package org.thingsboard.server.dao.yunteng.impl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.DoCondition;
+import org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.DoConditionService;
+
+/**
+ * @Description
+ * @Author cxy
+ * @Date 2021/12/6 20:16
+ */
+@Service
+@RequiredArgsConstructor
+public class DoConditionServiceImpl extends AbstractBaseService<DoConditionMapper, DoCondition>
+        implements DoConditionService {
+}

@@ -46,7 +46,8 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
   private final UserRoleMapper userRoleMapper;
 
   @Override
-  public PageData<RoleDTO> page(boolean isSysadmin,boolean isPlatformAdmin, String tenantId,Map<String, Object> queryMap) {
+  public PageData<RoleDTO> page(
+      boolean isSysadmin, boolean isPlatformAdmin, String tenantId, Map<String, Object> queryMap) {
     IPage<Role> roleIPage =
         baseMapper.selectPage(
             getPage(queryMap, "create_time", false),
@@ -56,14 +57,10 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
                 .eq(queryMap.get("roleType") != null, Role::getRoleType, queryMap.get("roleType"))
                 .ne(queryMap.get("roleType") == null, Role::getRoleType, RoleEnum.TENANT_ADMIN)
                 .ne(
-                    queryMap.get("roleType") == null
-                        && isPlatformAdmin,
+                    queryMap.get("roleType") == null && isPlatformAdmin,
                     Role::getRoleType,
                     RoleEnum.SYS_ADMIN)
-                .eq(
-                    !isSysadmin,
-                    Role::getTenantId,
-                    tenantId)
+                .eq(!isSysadmin, Role::getTenantId, tenantId)
                 .like(
                     queryMap.get("roleName") != null,
                     Role::getName,
@@ -73,14 +70,11 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
 
   @Override
   @Transactional
-  public boolean deleteRole(String[] roleIds,String tenantId) {
+  public boolean deleteRole(String[] roleIds, String tenantId) {
     Set<String> ids = Set.of(roleIds);
     int notTenantMenuCount =
         baseMapper.selectCount(
-            new QueryWrapper<Role>()
-                .lambda()
-                .ne(Role::getTenantId, tenantId)
-                .in(Role::getId, ids));
+            new QueryWrapper<Role>().lambda().ne(Role::getTenantId, tenantId).in(Role::getId, ids));
     if (notTenantMenuCount > 0) {
       throw new AccessDeniedException("cannot delete role that not create by you");
     }
@@ -99,40 +93,32 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
   }
 
   @Override
-  public Set<String> getPermissions(boolean isSysadmin,boolean isTenantAdmin,String tenantId,String useerId) {
+  public Set<String> getPermissions(
+      boolean isSysadmin, boolean isTenantAdmin, String tenantId, String useerId) {
     Set<String> permissions = Sets.newHashSet();
     Set<String> allPermission;
     String cacheKey;
     boolean cachePresent;
     if (isSysadmin) {
-      cacheKey =
-          FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + RoleEnum.SYS_ADMIN.name();
+      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + RoleEnum.SYS_ADMIN.name();
       Optional<Set<String>> optionalPermission =
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       allPermission = optionalPermission.orElseGet(menuMapper::getAllPermission);
     } else if (isTenantAdmin) {
-      cacheKey =
-          FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX
-              + tenantId;
+      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + tenantId;
       Optional<Set<String>> optionalPermission =
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       allPermission =
-          optionalPermission.orElseGet(
-              () ->
-                  menuMapper.getAllPermissionsByTenantId(tenantId));
+          optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByTenantId(tenantId));
     } else {
-      cacheKey =
-          FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX
-              + useerId;
+      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + useerId;
       Optional<Set<String>> optionalPermission =
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       allPermission =
-          optionalPermission.orElseGet(
-              () ->
-                  menuMapper.getAllPermissionsByUserId(useerId));
+          optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByUserId(useerId));
     }
     if (cachePresent) {
       return allPermission;
@@ -146,16 +132,13 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
 
   @Override
   @Transactional
-  public void updateRoleStatus(String roleId, int status,boolean isSysadmin,String tenantId) {
+  public void updateRoleStatus(String roleId, int status, boolean isSysadmin, String tenantId) {
     Optional.ofNullable(
             baseMapper.selectOne(
                 new QueryWrapper<Role>()
                     .lambda()
                     .eq(Role::getId, roleId)
-                    .eq(
-                        !isSysadmin,
-                        Role::getTenantId,
-                        tenantId)))
+                    .eq(!isSysadmin, Role::getTenantId, tenantId)))
         .ifPresent(
             role -> {
               role.setEnabled(status == 1);
@@ -165,15 +148,15 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
 
   @Override
   @Transactional
-  public RoleDTO saveOrUpdateRoleInfoWithMenu(RoleReqDTO roleReqDTO,boolean isSysadmin,boolean isPlatformAdmin,String tenantId) {
+  public RoleDTO saveOrUpdateRoleInfoWithMenu(
+      RoleReqDTO roleReqDTO, boolean isSysadmin, boolean isPlatformAdmin, String tenantId) {
     Role role;
     // 默认普通管理员角色,即租户管理员添加的角色
     var roleType = RoleEnum.CUSTOMER_USER.name();
     if (null != roleReqDTO.getRoleType()) {
       roleType = roleReqDTO.getRoleType().name();
     } else {
-      if (isSysadmin
-          || isPlatformAdmin) {
+      if (isSysadmin || isPlatformAdmin) {
         roleType = RoleEnum.PLATFORM_ADMIN.name();
       }
     }
@@ -185,10 +168,7 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
               new QueryWrapper<Role>()
                   .lambda()
                   .eq(Role::getId, roleReqDTO.getId())
-                  .eq(
-                      !isSysadmin,
-                      Role::getTenantId,
-                      tenantId));
+                  .eq(!isSysadmin, Role::getTenantId, tenantId));
       if (role == null) {
         return null;
       } else {
@@ -223,27 +203,25 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
       tenantRoles.forEach(
           tenantRole -> {
             String updateTenantId = tenantRole.getTenantId();
-            int deleteCount =
-                tenantMenuMapper.delete(
-                    new QueryWrapper<TenantMenu>()
-                        .lambda()
-                        .eq(TenantMenu::getTenantId, updateTenantId));
-            if (deleteCount > 0) {
-              menus.forEach(
-                  menu -> {
-                    TenantMenu tenantMenu = new TenantMenu();
-                    tenantMenu.setMenuId(menu);
-                    tenantMenu.setTenantId(updateTenantId);
-                    tenantMenuMapper.insert(tenantMenu);
-                  });
-            }
+            tenantMenuMapper.delete(
+                new QueryWrapper<TenantMenu>()
+                    .lambda()
+                    .eq(TenantMenu::getTenantId, updateTenantId));
+            menus.forEach(
+                menu -> {
+                  TenantMenu tenantMenu = new TenantMenu();
+                  tenantMenu.setMenuId(menu);
+                  tenantMenu.setTenantId(updateTenantId);
+                  tenantMenuMapper.insert(tenantMenu);
+                });
           });
     }
     return role.getDTO(RoleDTO.class);
   }
 
   @Override
-  public List<RoleDTO> findRoleInfo(boolean isTenantAdmin,String tenantId,String userId,RoleDTO roleDTO) {
+  public List<RoleDTO> findRoleInfo(
+      boolean isTenantAdmin, String tenantId, String userId, RoleDTO roleDTO) {
     if (StringUtils.isEmpty(roleDTO.getTenantId())) {
       roleDTO.setTenantId(tenantId);
     }

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+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.dto.*;
+import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.yunteng.entities.*;
+import org.thingsboard.server.dao.yunteng.mapper.*;
+import org.thingsboard.server.dao.yunteng.service.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/** @Description 场景联动业务实现层 @Author cxy @Date 2021/11/25 11:22 */
+@Service
+@RequiredArgsConstructor
+public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMapper, SceneLinkage>
+    implements SceneLinkageService {
+
+  private final SceneLinkageMapper sceneLinkageMapper;
+  private final DeviceMapper deviceMapper;
+  private final DoActionMapper doActionMapper;
+  private final DoConditionMapper doConditionMapper;
+  private final TriggerMapper triggerMapper;
+  private final OrganizationMapper organizationMapper;
+  private final TriggerServiceImpl triggerService;
+  private final DoConditionServiceImpl doConditionService;
+  private final DoActionServiceImpl doActionService;
+  /**
+   * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
+   *
+   * @param sceneLinkageDTO 场景对象
+   * @return SceneLinkageDTO 场景
+   */
+  @Override
+  @Transactional
+  public SceneLinkageDTO saveScenelinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId) {
+    sceneLinkageDTO.setTenantId(tenantId);
+    // 第一步保存场景,获取场景ID
+    // 场景对象
+    SceneLinkage sceneLinkage = sceneLinkageDTO.getEntity(SceneLinkage.class);
+    // 新增
+    int insert = sceneLinkageMapper.insert(sceneLinkage);
+    if (insert > 0) {
+      sceneLinkage.copyToDTO(sceneLinkageDTO);
+    }
+    // 拿到场景id
+    String sceneLinkageId = sceneLinkage.getId();
+    // 拿到场景id的组织,假如是云腾公司的组织id
+    String organizationId = sceneLinkage.getOrganizationId();
+    // 拿到当前组织id所包含的设备集合
+    List<YtDevice> deviceList =
+        deviceMapper.selectList(
+            new QueryWrapper<YtDevice>()
+                .lambda()
+                .select(YtDevice::getId)
+                .eq(
+                    StringUtils.isNoneBlank(organizationId),
+                    YtDevice::getOrganizationId,
+                    organizationId));
+    // 判断设备id是否包含
+    List<TriggerDTO> triggerDTOS = sceneLinkageDTO.getTriggers();
+    if (triggerDTOS != null) {
+      boolean condition = false;
+      for (TriggerDTO triggerDTO : triggerDTOS) {
+        String deviceId = triggerDTO.getDeviceId();
+        if (deviceId == null) {
+          break;
+        }
+        for (YtDevice device : deviceList) {
+          String id = device.getId();
+          if (deviceId.equals(id)) {
+            triggerDTO.setDeviceId(id);
+            condition = true;
+            break;
+          }
+        }
+        if (!condition) {
+          throw new DataValidationException("触发器里面该设备不存在");
+        }
+      }
+    }
+    List<DoConditionDTO> doConditionList = sceneLinkageDTO.getDoConditions();
+    // 定义常量,如果满足条件,则新增,循环完了不满足则抛出异常
+    if (doConditionList != null) {
+      boolean conditionC = false;
+      for (DoConditionDTO conditionDTO : doConditionList) {
+        String deviceIdC = conditionDTO.getDeviceId();
+        if (deviceIdC == null) {
+          break;
+        }
+        for (YtDevice deviceC : deviceList) {
+          String id = deviceC.getId();
+          if (deviceIdC.equals(id)) {
+            conditionDTO.setDeviceId(id);
+            conditionC = true;
+            break;
+          }
+        }
+        if (!conditionC) {
+          throw new DataValidationException("执行条件里面该设备不存在");
+        }
+      }
+    }
+    List<DoActionDTO> doActionDTOList = sceneLinkageDTO.getDoActions();
+    // 定义常量,如果满足条件,则新增,循环完了不满足则抛出异常
+    if (doActionDTOList != null) {
+      boolean conditionA = false;
+      for (DoActionDTO actionDTO : doActionDTOList) {
+        String deviceIdA = actionDTO.getDeviceId();
+        if (deviceIdA == null) {
+          break;
+        }
+        for (YtDevice deviceA : deviceList) {
+          String id = deviceA.getId();
+          if (deviceIdA.equals(id)) {
+            actionDTO.setDeviceId(id);
+            conditionA = true;
+            break;
+          }
+        }
+        if (!conditionA) {
+          throw new DataValidationException("执行动作里面该设备不存在");
+        }
+      }
+    }
+    // 3.批量新增Trigger
+    List<Trigger> collect =
+        sceneLinkageDTO.getTriggers().stream()
+            .peek(triggerDTO -> triggerDTO.setSceneLinkageId(sceneLinkageId))
+            .peek(triggerDTO -> triggerDTO.setTenantId(tenantId))
+            .map(triggerDTO -> triggerDTO.getEntity(Trigger.class))
+            .collect(Collectors.toList());
+    triggerService.insertBatch(collect, 1000);
+    // 4.批量新增执行条件
+    List<DoCondition> collectC =
+        sceneLinkageDTO.getDoConditions().stream()
+            .peek(doConditionDTO -> doConditionDTO.setSceneLinkageId(sceneLinkageId))
+            .peek(doConditionDTO -> doConditionDTO.setTenantId(tenantId))
+            .map(doConditionDTO -> doConditionDTO.getEntity(DoCondition.class))
+            .collect(Collectors.toList());
+    doConditionService.insertBatch(collectC, 1000);
+    // 5.批量新增执行动作
+    List<DoAction> collectA =
+        sceneLinkageDTO.getDoActions().stream()
+            .peek(doActionDTO -> doActionDTO.setSceneLinkageId(sceneLinkageId))
+            .peek(doActionDTO -> doActionDTO.setTenantId(tenantId))
+            .map(doActionDTO -> doActionDTO.getEntity(DoAction.class))
+            .collect(Collectors.toList());
+    doActionService.insertBatch(collectA, 1000);
+    return sceneLinkageDTO;
+  }
+
+  /**
+   * byId删除场景联动
+   *
+   * @param ids 删除的ids
+   */
+  @Override
+  public void deleteSceneLinkage(Set<String> ids, String tenantId) {
+    // 删除场景,一并删除数据库触发器,执行条件,执行动作的数据
+    triggerMapper.delete(
+        new LambdaQueryWrapper<Trigger>()
+            .eq(Trigger::getTenantId, tenantId)
+            .in(Trigger::getSceneLinkageId, ids));
+    doConditionMapper.delete(
+        new LambdaQueryWrapper<DoCondition>()
+            .eq(DoCondition::getTenantId, tenantId)
+            .in(DoCondition::getSceneLinkageId, ids));
+    doActionMapper.delete(
+        new LambdaQueryWrapper<DoAction>()
+            .eq(DoAction::getTenantId, tenantId)
+            .in(DoAction::getSceneLinkageId, ids));
+    LambdaQueryWrapper<SceneLinkage> Wrapper =
+        new QueryWrapper<SceneLinkage>()
+            .lambda()
+            .eq(SceneLinkage::getTenantId, tenantId)
+            .in(SceneLinkage::getId, ids);
+    sceneLinkageMapper.delete(Wrapper);
+  }
+  /**
+   * 修改场景联动和包含的触发器,执行条件,执行动作
+   *
+   * @param sceneLinkageDTO 场景
+   * @return SceneLinkageDTO 场景
+   */
+  @Override
+  @Transactional
+  public SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO) {
+    // 获取场景
+    SceneLinkage sceneLinkage = baseMapper.selectById(sceneLinkageDTO.getId());
+    if (sceneLinkage == null) {
+      throw new YtDataValidationException("此场景已不存在");
+    }
+    sceneLinkageDTO.copyToEntity(sceneLinkage);
+
+    updateTrigger(sceneLinkageDTO);
+    updateDoAction(sceneLinkageDTO);
+    updateDoCondition(sceneLinkageDTO);
+    sceneLinkageMapper.updateById(sceneLinkage);
+    return sceneLinkage.getDTO(SceneLinkageDTO.class);
+  }
+  /**
+   * 修改触发器
+   *
+   * @param sceneLinkageDTO 修改场景
+   */
+  private void updateTrigger(SceneLinkageDTO sceneLinkageDTO) {
+    // 先删除触发器
+    triggerMapper.delete(
+        new QueryWrapper<Trigger>()
+            .lambda()
+            .eq(
+                StringUtils.isNoneBlank(sceneLinkageDTO.getId()),
+                Trigger::getSceneLinkageId,
+                sceneLinkageDTO.getId()));
+    // 如果获取的触发器不为空,进行添加操作
+    if (null != sceneLinkageDTO.getTriggers() && !sceneLinkageDTO.getTriggers().isEmpty()) {
+      sceneLinkageDTO
+          .getTriggers()
+          .forEach(
+              triggerDTO -> {
+                Trigger trigger = new Trigger();
+                triggerDTO.copyToEntity(trigger);
+                triggerMapper.insert(trigger);
+              });
+    }
+  }
+  /**
+   * 修改执行动作
+   *
+   * @param sceneLinkageDTO 场景
+   */
+  private void updateDoAction(SceneLinkageDTO sceneLinkageDTO) {
+    doActionMapper.delete(
+        new QueryWrapper<DoAction>()
+            .lambda()
+            .eq(
+                StringUtils.isNoneBlank(sceneLinkageDTO.getId()),
+                DoAction::getSceneLinkageId,
+                sceneLinkageDTO.getId()));
+    if (null != sceneLinkageDTO.getDoActions() && !sceneLinkageDTO.getDoActions().isEmpty()) {
+      sceneLinkageDTO
+          .getDoActions()
+          .forEach(
+              doActionDTO -> {
+                DoAction doAction = new DoAction();
+                doActionDTO.copyToEntity(doAction);
+                doActionMapper.insert(doAction);
+              });
+    }
+  }
+  /**
+   * 修改执行动作
+   *
+   * @param sceneLinkageDTO 场景
+   */
+  private void updateDoCondition(SceneLinkageDTO sceneLinkageDTO) {
+    doConditionMapper.delete(
+        new QueryWrapper<DoCondition>()
+            .lambda()
+            .eq(
+                StringUtils.isNoneBlank(sceneLinkageDTO.getId()),
+                DoCondition::getSceneLinkageId,
+                sceneLinkageDTO.getId()));
+    if (null != sceneLinkageDTO.getDoConditions() && !sceneLinkageDTO.getDoActions().isEmpty()) {
+      sceneLinkageDTO
+          .getDoConditions()
+          .forEach(
+              doConditionDTO -> {
+                DoCondition doCondition = new DoCondition();
+                doConditionDTO.copyToEntity(doCondition);
+                doConditionMapper.insert(doCondition);
+              });
+    }
+  }
+  /**
+   * 通过分页查询
+   *
+   * @param queryMap 封装参数
+   * @return SceneLinkageDTO 场景对象
+   */
+  @Override
+  @Transactional
+  public PageData<SceneLinkageDTO> page(Map<String, Object> queryMap, String tenantId) {
+    queryMap.put("tenantCode", tenantId);
+    // 拿到传入的组织id
+    String organizationId = (String) queryMap.get("organizationId");
+    // 不为空
+    if (!StringUtils.isEmpty(organizationId)) {
+      // 新建组织集合
+      List<String> organizationIds = new ArrayList<>();
+      // 添加拿到的组织
+      organizationIds.add(organizationId);
+      // 查询该组织的所有子类
+      List<OrganizationDTO> organizationDTOS =
+          organizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+      // 遍历组织id
+      List<String> queryOrganizationIds = new ArrayList<>();
+      organizationDTOS.forEach(
+          item -> {
+            queryOrganizationIds.add(item.getId());
+          });
+      queryMap.put("organizationIds", queryOrganizationIds);
+    }
+    IPage<SceneLinkage> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<SceneLinkageDTO> scenePage = baseMapper.getScenePage(page, queryMap);
+    scenePage
+        .getRecords()
+        .forEach(
+            sceneLinkageDTO -> {
+              List<TriggerDTO> collect =
+                  triggerMapper
+                      .selectList(
+                          new LambdaQueryWrapper<Trigger>()
+                              .in(Trigger::getSceneLinkageId, sceneLinkageDTO.getId()))
+                      .stream()
+                      .map(trigger -> trigger.getDTO(TriggerDTO.class))
+                      .collect(Collectors.toList());
+              sceneLinkageDTO.setTriggers(collect);
+            });
+    return getPageData(scenePage, SceneLinkageDTO.class);
+  }
+  /** 获取当前租户的场景联动 */
+  @Override
+  public List<SceneLinkageDTO> findSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId) {
+    List<SceneLinkage> scenelinkageList =
+        baseMapper.selectList(
+            new QueryWrapper<SceneLinkage>()
+                .lambda()
+                .eq(SceneLinkage::getTenantId, tenantId)
+                .like(SceneLinkage::getName, sceneLinkageDTO.getName())
+                .like(SceneLinkage::getOrganizationId, sceneLinkageDTO.getOrganizationId())
+                .like(SceneLinkage::getStatus, sceneLinkageDTO.getStatus()));
+    return ReflectUtils.sourceToTarget(scenelinkageList, SceneLinkageDTO.class);
+  }
+  /**
+   * 修改当前场景联动的状态,启用或者停用
+   *
+   * @param sceneLinkageId 场景id
+   * @param status 状态
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public void updateSceneStatus(String sceneLinkageId, int status, String tenantId) {
+    Optional.ofNullable(
+            baseMapper.selectOne(
+                new QueryWrapper<SceneLinkage>()
+                    .lambda()
+                    .eq(SceneLinkage::getId, sceneLinkageId)
+                    .eq(SceneLinkage::getTenantId, tenantId)))
+        .ifPresent(
+            sceneLinkage -> {
+              sceneLinkage.setStatus(status);
+              baseMapper.updateById(sceneLinkage);
+            });
+  }
+  /**
+   * 通过组织id查询全部的设备集合
+   *
+   * @param organizationId
+   * @return 设备集合
+   */
+  @Override
+  public List<DeviceDTO> findDeviceList(String organizationId) {
+    // 拿到当前组织id所包含的设备集合
+    List<YtDevice> deviceList =
+        deviceMapper.selectList(
+            new QueryWrapper<YtDevice>()
+                .lambda()
+                .eq(
+                    StringUtils.isNoneBlank(organizationId),
+                    YtDevice::getOrganizationId,
+                    organizationId));
+    List<DeviceDTO> deviceDTOList =
+        deviceList.stream()
+            .map(device -> device.getDTO(DeviceDTO.class))
+            .collect(Collectors.toList());
+    return ReflectUtils.sourceToTarget(deviceDTOList, DeviceDTO.class);
+  }
+}

@@ -30,8 +30,7 @@ public class SysEnterpriseServiceImpl
 
   @Override
   public SysEnterpriseDTO get(String tenantId) {
-    SysEnterprise sysEnterprise = baseMapper.get(tenantId).getEntity(SysEnterprise.class);
-    return sysEnterprise == null ? null : sysEnterprise.getDTO(SysEnterpriseDTO.class);
+    return baseMapper.get(tenantId);
   }
 
   @Override

@@ -47,15 +47,14 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
   public PageData<SysNoticeDTO> page(Map<String, Object> queryMap) {
     IPage<SysNotice> sysNoticeIPage =
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, true);
-    sysNoticeIPage = baseMapper.page(sysNoticeIPage, queryMap);
+    baseMapper.page(sysNoticeIPage, queryMap);
     return getPageData(sysNoticeIPage, SysNoticeDTO.class);
   }
 
   @Override
   public SysNoticeDTO get(String id,String tenantId) {
     return baseMapper
-        .get(id, tenantId)
-        .getDTO(SysNoticeDTO.class);
+        .get(id, tenantId);
   }
 
   @Override

+package org.thingsboard.server.dao.yunteng.impl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.entities.Trigger;
+import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TriggerService;
+
+/**
+ * @Description
+ * @Author cxy
+ * @Date 2021/12/6 19:53
+ */
+@Service
+@RequiredArgsConstructor
+public class TriggerServiceImpl extends AbstractBaseService<TriggerMapper, Trigger>
+        implements TriggerService {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.DoAction;
+
+/**
+ * @Description 执行动作mapper
+ * @Author cxy
+ * @Date 2021/11/26 9:38
+ */
+@Mapper
+public interface DoActionMapper extends BaseMapper<DoAction> {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.DoCondition;
+
+/**
+ * @Description 执行条件mapper
+ * @Author cxy
+ * @Date 2021/11/26 9:39
+ */
+@Mapper
+public interface DoConditionMapper extends BaseMapper<DoCondition> {
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.dao.yunteng.entities.SceneLinkage;
+
+import java.util.Map;
+
+/**
+ * @Description  场景联动持久层
+ * @Author cxy
+ * @Date 2021/11/25 10:48
+ */
+@Mapper
+public interface SceneLinkageMapper extends BaseMapper<SceneLinkage> {
+    /**
+     * 分页条件查询
+     * @param page
+     * @param queryMap
+     * @return
+     */
+    IPage<SceneLinkageDTO> getScenePage(
+            IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+
+}

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysNotice;
 
 import java.util.Map;
@@ -20,11 +21,11 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
    * @param queryMap
    * @return 系统通知分页
    */
-  IPage<SysNotice> page(IPage<SysNotice> page, @Param("queryMap") Map<String, Object> queryMap);
+  IPage<SysNoticeDTO> page(IPage<SysNotice> page, @Param("queryMap") Map<String, Object> queryMap);
 
   /**
    * @param id
    * @return 消息详情
    */
-  SysNotice get(@Param("id") String id, @Param("tenantId") String tenantId);
+  SysNoticeDTO get(@Param("id") String id, @Param("tenantId") String tenantId);
 }

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.Trigger;
+
+/**
+ * @Description 触发器mapper层
+ * @Author cxy
+ * @Date 2021/11/26 9:30
+ */
+@Mapper
+public interface TriggerMapper extends BaseMapper<Trigger> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+/**
+ * @Description
+ * @Author cxy
+ * @Date 2021/12/6 20:23
+ */
+public interface DoActionService {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+/**
+ * @Description
+ * @Author cxy
+ * @Date 2021/12/6 20:14
+ */
+public interface DoConditionService {
+}

+package org.thingsboard.server.dao.yunteng.service;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @Description  场景联动的业务
+ * @Author cxy
+ * @Date 2021/11/25 11:19
+ */
+public interface SceneLinkageService {
+    /**
+     *  新增场景联动
+     * @param sceneLinkageDTO
+     * @return
+     */
+    SceneLinkageDTO saveScenelinkage(SceneLinkageDTO sceneLinkageDTO,String tenantId);
+
+    /**
+     * 删除场景联动
+     * @param ids
+     * @return
+     */
+   void deleteSceneLinkage(Set<String> ids,String tenantId);
+
+    /**
+     * 修改场景联动
+     * @param sceneLinkageDTO
+     * @return
+     */
+    SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO);
+
+    /**
+     * 分页查询
+     * @param queryMap
+     * @return
+     */
+    PageData<SceneLinkageDTO> page(Map<String, Object> queryMap,String tenantId);
+
+    /**
+     *  查找场景联动所有数据
+     * @param sceneLinkageDTO
+     * @return
+     */
+    List<SceneLinkageDTO> findSceneLinkage(SceneLinkageDTO sceneLinkageDTO,String tenantId);
+
+    /**
+     *  修改场景的状态
+     * @param sceneLinkageId
+     * @param status
+     */
+    void updateSceneStatus(String sceneLinkageId, int status,String tenantId);
+
+    /**
+     *  通过组织id查询设备集合
+     * @param organizationId
+     * @return
+     */
+    List<DeviceDTO> findDeviceList(String organizationId);
+
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+/**
+ * @Description
+ * @Author cxy
+ * @Date 2021/12/6 19:52
+ */
+public interface TriggerService {
+}

@@ -12,6 +12,7 @@
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <select id="findOrganizationTreeList" resultMap="organizationDTOMap">

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.SceneLinkageMapper">
+    <resultMap id="sceneLinkageMap" type="org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="organizationId" column="organization_id"/>
+        <result property="status" column="status"/>
+        <result property="description" column="description"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="updater" column="updater"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="creator" column="creator"/>
+    </resultMap>
+    <sql id="columns">
+        s.id,s.name,s.organization_id,s.status,s.description,s.tenant_id,s.updater,s.update_time,s.create_time,s.creator
+    </sql>
+    <select id="getScenePage" resultMap="sceneLinkageMap">
+        SELECT
+        <include refid="columns"/>
+        FROM iotfs_scene_linkage s
+        LEFT JOIN iotfs_organization io ON io.id = s.organization_id
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND s.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND s.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
+            </if>
+            <if test="queryMap.status !=null and queryMap.status!=''">
+                AND s.status = #{queryMap.status}
+            </if>
+            <if test="queryMap.organizationId !=null">
+                AND s.organization_id IN
+                <foreach collection="queryMap.organizationIds" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

@@ -13,13 +13,17 @@
         <result property="area" column="area"/>
         <result property="tel" column="tel"/>
         <result property="codeTown" column="code_town"/>
-        <result property="nameProv" column="name_prov"/>
-        <result property="codeProv" column="code_prov"/>
-        <result property="nameCity" column="name_city"/>
-        <result property="codeCity" column="code_city"/>
-        <result property="nameCoun" column="name_coun"/>
-        <result property="codeCoun" column="code_coun"/>
-        <result property="nameTown" column="name_town"/>
+        <result property="qrCode" column="qr_code"/>
+        <association property="sysTown" javaType="org.thingsboard.server.common.data.yunteng.dto.SysTownDTO">
+            <result property="nameProv" column="name_prov"/>
+            <result property="codeProv" column="code_prov"/>
+            <result property="nameCity" column="name_city"/>
+            <result property="codeCity" column="code_city"/>
+            <result property="nameCoun" column="name_coun"/>
+            <result property="codeCoun" column="code_coun"/>
+            <result property="nameTown" column="name_town"/>
+            <result property="codeTown" column="code_town"/>
+        </association>
     </resultMap>
 
     <select id="get" resultMap="entity">
@@ -33,6 +37,7 @@
                se.area             area,
                se.tel              tel,
                se.code_town        code_town,
+               se.qr_code          qr_code,
                st.name_prov        name_prov,
                st.code_prov        code_prov,
                st.name_city        name_city,

@@ -55,7 +55,7 @@
         WHERE
         sn.tenant_id = #{queryMap.tenantId}
         <if test="queryMap.type != null">
-            sn.type = #{queryMap.type}
+        AND  sn.type = #{queryMap.type}
         </if>
     </select>
     <select id="get" resultMap="sysNotice">