Merge branch '20220424' into 'master'

refactor: 第三方平台用户绑定和解绑接口逻辑优化

See merge request huang/thingsboard3.3.2!85

@@ -3,7 +3,6 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,8 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
@@ -24,7 +22,9 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
@@ -44,7 +44,7 @@ public class YtAlarmInfoController extends BaseController {
 
 
     //分页测试通过
     //分页测试通过
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
-    @ApiOperation(value="查询")
+    @ApiOperation(value = "查询")
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @GetMapping(params = {PAGE_SIZE, PAGE})
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE_SIZE) int pageSize,
@@ -52,6 +52,7 @@ public class YtAlarmInfoController extends BaseController {
             @RequestParam(value = "status", required = false) List<AlarmStatus> status,
             @RequestParam(value = "status", required = false) List<AlarmStatus> status,
             @RequestParam(value = "textSearch", required = false) String textSearch,
             @RequestParam(value = "textSearch", required = false) String textSearch,
             @RequestParam(value = "alarmType", required = false) String alarmType,
             @RequestParam(value = "alarmType", required = false) String alarmType,
+            @RequestParam(value = "severity", required = false) AlarmSeverity severity,
             @RequestParam(value = "organizationId", required = false) String organizationId,
             @RequestParam(value = "organizationId", required = false) String organizationId,
             @RequestParam(value = "deviceId", required = false) String deviceId,
             @RequestParam(value = "deviceId", required = false) String deviceId,
             @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
             @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
@@ -67,12 +68,11 @@ public class YtAlarmInfoController extends BaseController {
         if (orderType != null) {
         if (orderType != null) {
             pageFilter.put(ORDER_TYPE, orderType.name());
             pageFilter.put(ORDER_TYPE, orderType.name());
         }
         }
-        return alarmInfoService.alarmPage(pageFilter,getCurrentUser().getTenantId(),alarmType,startTime,endTime,status,deviceId,deviceType, EntityType.DEVICE,organizationId);
+        return alarmInfoService.alarmPage(pageFilter, getCurrentUser().getTenantId(), severity,alarmType, startTime, endTime, status, deviceId, deviceType, EntityType.DEVICE, organizationId);
     }
     }
 
 
 
 
-
-    @ApiOperation(value="告警类型")
+    @ApiOperation(value = "告警类型")
     @GetMapping()
     @GetMapping()
     public ResponseEntity<List<SysDictDTO>> alarmType() throws ThingsboardException {
     public ResponseEntity<List<SysDictDTO>> alarmType() throws ThingsboardException {
         List result = alarmInfoService.alarmType(getCurrentUser().getTenantId());
         List result = alarmInfoService.alarmType(getCurrentUser().getTenantId());
@@ -80,5 +80,4 @@ public class YtAlarmInfoController extends BaseController {
     }
     }
 
 
 
 
-
 }
 }

+package org.thingsboard.server.controller.yunteng;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.entities.YtRpcRecordEntity;
+import org.thingsboard.server.dao.yunteng.service.YtRpcRecordService;
+
+import java.util.UUID;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("api/yt/rpc")
+@Api(tags = {"命令下发记录"})
+@RequiredArgsConstructor
+public class YtRpcRecordController extends BaseController {
+    private final YtRpcRecordService recordService;
+
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页")
+    public YtPageData<YtRpcRecordDTO> pageAlarmProfile(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "status", required = false) RpcStatus status,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "tbDeviceId", required = false) String tbDeviceId,
+//            @RequestParam(value = "oneway", required = false) Boolean oneway,
+            @RequestParam(value = "organizationId", required = false) String organizationId,
+            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+            throws ThingsboardException {
+
+
+        IPage<YtRpcRecordEntity> pageInfrom = recordService.getPage(page, pageSize, orderBy, orderType);
+        return recordService.pageDatas(pageInfrom, getCurrentUser().getCurrentTenantId(), tbDeviceId,null, status, organizationId, name);
+    }
+
+
+}

@@ -65,16 +65,15 @@ public class YtThirdPlatformController extends BaseController {
     @ApiOperation("绑定")
     @ApiOperation("绑定")
     public JwtTokenPair saveOrUpdateAlarmProfile(
     public JwtTokenPair saveOrUpdateAlarmProfile(
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
-        UserDTO userDto = thirdService.saveOrUpdate(dto);
+        UserDTO userDto = thirdService.bindUser(dto);
         return buildJwtToken(userDto);
         return buildJwtToken(userDto);
     }
     }
 
 
     @DeleteMapping
     @DeleteMapping
-    @ApiOperation("删除")
-    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+    @ApiOperation("解绑")
+    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody YtThirdUserDTO dto)
             throws ThingsboardException {
             throws ThingsboardException {
-        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-        return thirdService.deleteDataByIds(deleteDTO);
+        return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(),dto.getThirdUserId());
     }
     }
 
 
     @GetMapping("login/{thirdId}")
     @GetMapping("login/{thirdId}")

@@ -59,7 +59,8 @@ public enum ErrorMessage {
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
-  SCENE_REACT_USED_ALARM_PROFILE(400041,"场景联动正在使用该告警配置"),
+  SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
+  APP_USER_BINDED(400043,"账号【%s】已绑定"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.LoginMethodEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
+
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class YtRpcRecordDTO  {
+    private String id;
+
+    @ApiModelProperty(value = "设备主键")
+    private String deviceId;
+    private String deviceName;
+    private String tbDeviceId;
+    @ApiModelProperty(value = "设备类型：GATEWAY,DIRECT_CONNECTION,SENSOR")
+    private DeviceTypeEnum deviceType;
+    private String deviceSn;
+
+
+    @ApiModelProperty(value = "设备组织ID")
+    private String organizationId;
+    @ApiModelProperty(value = "设备组织名称")
+    private String organizationName;
+
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
+    @ApiModelProperty(value = "租户名称")
+    private String tenantName;
+
+
+    private Long createTime;
+    private Long expirationTime;
+
+    @ApiModelProperty(value = "RPC请求内容")
+    private JsonNode request;
+
+    @ApiModelProperty(value = "RPC响应内容")
+    private JsonNode response;
+    @ApiModelProperty(value = "RPC扩展信息")
+    private JsonNode additionalInfo;
+    @ApiModelProperty(value = "RPC状态")
+    private RpcStatus status;
+
+
+
+
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
+import org.hibernate.annotations.Type;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+/**
+ * @author Administrator
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.RPC_TABLE_NAME)
+public class YtRpcRecordEntity extends TenantBaseEntity {
+
+    private String deviceId;
+
+    private long expirationTime;
+
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode request;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode response;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode additionalInfo;
+
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private RpcStatus status;
+
+
+}

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
@@ -42,7 +43,7 @@ public class YtAlarmInfoServiceImpl  implements YtAlarmInfoService  {
 private final YtAlarmMapper ytJpaAarmDao;
 private final YtAlarmMapper ytJpaAarmDao;
 private final OrganizationMapper organizationMapper;
 private final OrganizationMapper organizationMapper;
   @Override
   @Override
-  public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
+  public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
     IPage<YtAlarmEntity> page= getPage(pageMap, ModelConstants.CREATED_TIME_PROPERTY,false);
     IPage<YtAlarmEntity> page= getPage(pageMap, ModelConstants.CREATED_TIME_PROPERTY,false);
     List<String> ids =new ArrayList<>();
     List<String> ids =new ArrayList<>();
     if(StringUtils.isNotBlank(organizationId)){
     if(StringUtils.isNotBlank(organizationId)){
@@ -55,7 +56,7 @@ private final OrganizationMapper organizationMapper;
 
 
     }
     }
 
 
-    IPage<YtAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page,tenantId.getId(),alarmType,startTime,endTime,status,deviceId,deviceType, originatorType,ids.size()>0?ids:null);
+    IPage<YtAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page,tenantId.getId(),severity,alarmType,startTime,endTime,status,deviceId,deviceType, originatorType,ids.size()>0?ids:null);
     YtPageData<YtAlarmEntity> result = new YtPageData<>(tbDatas.getRecords(), tbDatas.getTotal());
     YtPageData<YtAlarmEntity> result = new YtPageData<>(tbDatas.getRecords(), tbDatas.getTotal());
     return result;
     return result;
   }
   }

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.YtRpcRecordEntity;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.YtRpcRecordMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.YtRpcRecordService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtRpcRecordServiceImpl extends AbstractBaseService<YtRpcRecordMapper, YtRpcRecordEntity>
+        implements YtRpcRecordService {
+
+
+    private final OrganizationMapper organizationMapper;
+
+    @Override
+    public YtPageData<YtRpcRecordDTO> pageDatas(IPage<YtRpcRecordEntity> pageInfrom, String tenantId, String deviceId, Boolean oneway, RpcStatus status, String organizationId, String name) {
+        List<String> organization = null;
+        if (StringUtils.isNotEmpty(organizationId)) {
+            List<String> organizationFilter = new ArrayList<>();
+            organizationFilter.add(organizationId);
+            organization = organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream().map(org -> org.getId()).collect(Collectors.toList());
+        }
+
+        IPage<YtRpcRecordDTO> page = baseMapper.getPageDatas(pageInfrom, tenantId, deviceId,name, status, organization, null);
+        return getPageData(page, YtRpcRecordDTO.class);
+    }
+
+
+}

@@ -60,7 +60,7 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public UserDTO saveOrUpdate(YtThirdUserDTO dto) {
+    public UserDTO bindUser(YtThirdUserDTO dto) {
         User user = null;
         User user = null;
         switch (dto.getLoginMethod()) {
         switch (dto.getLoginMethod()) {
             case PHONE:
             case PHONE:
@@ -73,21 +73,21 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
         if (user == null) {
         if (user == null) {
             throw new YtDataValidationException(ErrorMessage.USER_NOT_EXISTS.getMessage());
             throw new YtDataValidationException(ErrorMessage.USER_NOT_EXISTS.getMessage());
         }
         }
+
+        Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
+                .eq(YtThirdUserEntity::getAppUserId, user.getId());
+        YtThirdUserEntity oldBind = baseMapper.selectOne(filter);
+        if(oldBind != null){
+            throw new YtDataValidationException(String.format(ErrorMessage.APP_USER_BINDED.getMessage(),user.getUsername()));
+        }
+
         if (StringUtils.isEmpty(user.getAvatar()) && StringUtils.isNotEmpty(dto.getAvatarUrl())) {
         if (StringUtils.isEmpty(user.getAvatar()) && StringUtils.isNotEmpty(dto.getAvatarUrl())) {
             user.setAvatar(dto.getAvatarUrl());
             user.setAvatar(dto.getAvatarUrl());
             userMapper.updateById(user);
             userMapper.updateById(user);
         }
         }
         dto.setAppUserId(user.getId());
         dto.setAppUserId(user.getId());
+        baseMapper.insert(dto.getEntity(YtThirdUserEntity.class));
 
 
-        Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
-                .eq(YtThirdUserEntity::getThirdUserId, dto.getThirdUserId());
-        YtThirdUserEntity oldVideo = baseMapper.selectOne(filter);
-        if (null == oldVideo) {
-            baseMapper.insert(dto.getEntity(YtThirdUserEntity.class));
-        } else {
-            dto.setId(oldVideo.getId());
-            baseMapper.updateById(dto.getEntity(YtThirdUserEntity.class));
-        }
         return user.getDTO(UserDTO.class);
         return user.getDTO(UserDTO.class);
     }
     }
 
 
@@ -159,16 +159,22 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public boolean deleteDataByIds(DeleteDTO deleteDTO) {
+    public boolean unbindUser(String tenantId,String appUserId,String thirdUserId) {
+
+        User user = userMapper.selectById(appUserId);
+        if(!tenantId.equals(user.getTenantId())){
+            throw new YtDataValidationException(ErrorMessage.NO_PERMISSION.getMessage());
+        }
         Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
         Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
-                .in(YtThirdUserEntity::getId, deleteDTO.getIds());
+                .eq(YtThirdUserEntity::getAppUserId,appUserId)
+                .eq(YtThirdUserEntity::getThirdUserId,thirdUserId);
         return baseMapper.delete(filter) > 0;
         return baseMapper.delete(filter) > 0;
     }
     }
 
 
     @Override
     @Override
     public UserDTO login(String thirdUserId) {
     public UserDTO login(String thirdUserId) {
-        return baseMapper.login(thirdUserId)
-                .getDTO(UserDTO.class);
+        User user = baseMapper.login(thirdUserId);
+        return user==null?null:user.getDTO(UserDTO.class);
     }
     }
 
 
     @Override
     @Override

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
@@ -25,6 +26,7 @@ public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
   IPage<YtAlarmEntity> alarmPage(
   IPage<YtAlarmEntity> alarmPage(
           IPage<?> page
           IPage<?> page
           ,@Param("tenantId") UUID tenantId
           ,@Param("tenantId") UUID tenantId
+          ,@Param("severity") AlarmSeverity severity
           ,@Param("alarmType")String alarmType
           ,@Param("alarmType")String alarmType
           ,@Param("startTime")Long startTime
           ,@Param("startTime")Long startTime
           ,@Param("endTime")Long endTime
           ,@Param("endTime")Long endTime

+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.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO;
+import org.thingsboard.server.dao.yunteng.entities.YtRpcRecordEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface YtRpcRecordMapper extends BaseMapper<YtRpcRecordEntity> {
+    /**
+     * @param page
+     * @param tenantId
+     * @param name
+     * @param status
+     * @param organizationId
+     * @return
+     */
+    IPage<YtRpcRecordDTO> getPageDatas(IPage<?> page, @Param("tenantId") String tenantId, @Param("tbDeviceId") String tbDeviceId, @Param("name") String name, @Param("status") RpcStatus status, @Param("organization") List<String> organizationId, @Param("oneway") String oneway);
+}

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
@@ -35,7 +36,7 @@ public interface YtAlarmInfoService {
      * @param organizationId    告警所属组织
      * @param organizationId    告警所属组织
      * @return
      * @return
      */
      */
-    YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId);
+    YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, AlarmSeverity severity,String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId);
 
 
 
 
     /**
     /**

+package org.thingsboard.server.dao.yunteng.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO;
+import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.YtRpcRecordEntity;
+import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
+
+import java.util.UUID;
+
+/**
+ * 第三方平台用户管理相关接口
+ * 例如：微信小程序、钉钉等。
+ * @author Administrator
+ */
+public interface YtRpcRecordService extends BaseService<YtRpcRecordEntity> {
+
+    /**
+     *
+     * RPC记录分页数据
+     * @param pageInfrom       分页信息
+     * @param tenantId         租户ID
+     * @param oneway           响应方式：是否单向
+     * @param status           RPC状态
+     * @param organizationId   组织ID
+     * @param name             名称，例如：设备、命令、组织、租户
+     * @return
+     */
+    YtPageData<YtRpcRecordDTO> pageDatas(IPage<YtRpcRecordEntity> pageInfrom, String tenantId, String deviceId, Boolean oneway, RpcStatus status, String organizationId, String name);
+
+
+}

@@ -7,7 +7,6 @@ import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 
 
 /**
 /**
@@ -32,13 +31,15 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
      * @param dto
      * @param dto
      * @return
      * @return
      */
      */
-    UserDTO saveOrUpdate(YtThirdUserDTO dto);
+    UserDTO bindUser(YtThirdUserDTO dto);
 
 
     /**
     /**
-     * @param deleteDTO
+     * 第三方平台用户与系统用户解绑
+     * @param appUserId
+     * @param thirdUserId
      * @return
      * @return
      */
      */
-    boolean deleteDataByIds(DeleteDTO deleteDTO);
+    boolean unbindUser(String tenantId,String appUserId,String thirdUserId);
 
 
     /**
     /**
      * 第三方登录
      * 第三方登录

@@ -43,6 +43,9 @@
         LEFT JOIN iotfs_organization org ON org.id = d.organization_id
         LEFT JOIN iotfs_organization org ON org.id = d.organization_id
         <where>
         <where>
             m.tenant_id = #{tenantId}
             m.tenant_id = #{tenantId}
+            <if test="severity!=null">
+                AND severity = #{severity}
+            </if>
             <if test="alarmType!=null">
             <if test="alarmType!=null">
                 AND type LIKE CONCAT('%',#{alarmType},'%')
                 AND type LIKE CONCAT('%',#{alarmType},'%')
             </if>
             </if>

+<?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.YtRpcRecordMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO" id="dataMap">
+        <result property="id" column="id"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="tbDeviceId" column="tb_device_id"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler" />
+        <result property="deviceSn" column="sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="expirationTime" column="expiration_time"/>
+        <result property="request" column="request"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="response" column="response"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="additionalInfo" column="additional_info"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="status" column="status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="organizationId" column="organization_id"/>
+        <result property="organizationName" column="organization_name"/>
+        <result column="tenant_name" property="tenantName"/>
+        <result column="tenant_id" property="tenantId"/>
+<!--        <association property="request" javaType="org.thingsboard.server.common.data.yunteng.dto.YtRpcRequestDTO">-->
+<!--            <result column="deviceId" property="deviceId" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>-->
+<!--            <result column="oneway" property="oneway"/>-->
+<!--            <result column="tenant_enabled" property="retries"/>-->
+<!--            <result column="tenant_expire_time" property="body" />-->
+<!--        </association>-->
+    </resultMap>
+
+
+
+    <sql id="basicColumns">
+        base.id,base.created_time AS create_time,base.expiration_time,base.request,base.response,base.additional_info,base.status
+    </sql>
+
+    <sql id="detailColumns">
+        <include refid="basicColumns"/>
+        ,org.id AS organization_id,org.name AS organization_name
+        ,dev.name AS device_name,dev.tb_device_id,dev.device_type,dev.sn,dev.tenant_id,dev.id AS device_id
+        ,ten.title AS tenant_name
+    </sql>
+    <select id="getPageDatas" resultMap="dataMap">
+        SELECT  <include refid="detailColumns"/>
+        FROM rpc base
+        LEFT JOIN iotfs_device dev ON base.device_id =dev.tb_device_id::uuid
+        LEFT JOIN iotfs_organization org ON dev.organization_id = org.id
+        LEFT JOIN tenant ten ON base.tenant_id = ten.id
+        <where>
+            1=1
+            <if test="tenantId !=null and tenantId !=''">
+                AND base.tenant_id = #{tenantId}::uuid
+            </if>
+            <if test="tbDeviceId !=null ">
+                AND base.device_id = #{tbDeviceId}::uuid
+            </if>
+            <if test="name !=null and name !=''">
+                AND  (
+                        dev.name LIKE concat('%',#{name}::TEXT,'%')
+                    OR
+                        org.name LIKE concat('%',#{name}::TEXT,'%')
+                    OR
+                        ten.title LIKE concat('%',#{name}::TEXT,'%')
+                    OR
+                    base.request LIKE concat('%',#{name}::TEXT,'%')
+                )
+            </if>
+            <if test="oneway !=null and name !=''">
+                AND base.request LIKE concat('%',#{oneway}::TEXT,'%')
+            </if>
+            <if test="status !=null">
+                AND base.status = #{status}
+            </if>
+            <if test="organization !=null">
+                AND dev.organization_id IN
+                <foreach collection="organization" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
+
+
+
+
+</mapper>