Merge branch '20220420' into 'master'

fix: 告警分页信息

See merge request huang/thingsboard3.3.2!82

@@ -49,7 +49,7 @@ public class YtAlarmInfoController extends BaseController {
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(PAGE) int page,
-            @RequestParam(value = "status", required = false) 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 = "organizationId", required = false) String organizationId,
             @RequestParam(value = "organizationId", required = false) String organizationId,

+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.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
+import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
+import org.thingsboard.server.dao.yunteng.service.YtOpinionService;
+import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("api/yt/third")
+@Api(tags = {"第三方小程序"})
+@RequiredArgsConstructor
+public class YtThirdPlatformController extends BaseController {
+
+    private final YtThirdPlatformService thirdService;
+
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页")
+    public YtPageData<YtThirdUserDTO> pageAlarmProfile(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "platformName", required = false) ThirdPlatformEnum platformName,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+            throws ThingsboardException {
+
+
+        IPage<YtThirdUserEntity> pageInfrom = thirdService.getPage(page, pageSize, orderBy, orderType);
+        return thirdService.pageDatas(pageInfrom,platformName,name);
+    }
+
+    @PostMapping
+    @ApiOperation("绑定|编辑")
+    public YtThirdUserDTO saveOrUpdateAlarmProfile(
+            @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
+        return thirdService.saveOrUpdate(dto);
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+            throws ThingsboardException {
+        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return thirdService.deleteDataByIds(deleteDTO);
+    }
+
+
+}

@@ -78,6 +78,8 @@ public final class ModelConstants {
     public static final String IOTFS_VIDEO_STREAM_TABLE_NAME = "iotfs_device_camera";
     public static final String IOTFS_VIDEO_STREAM_TABLE_NAME = "iotfs_device_camera";
     /** 意见反馈 */
     /** 意见反馈 */
     public static final String IOTFS_OPINION_TABLE_NAME = "iotfs_opinion";
     public static final String IOTFS_OPINION_TABLE_NAME = "iotfs_opinion";
+    /** 意见反馈 */
+    public static final String IOTFS_THIRD_USER_TABLE_NAME = "iotfs_third_user";
   }
   }
 
 
   public static class TableFields {
   public static class TableFields {

+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.enums.ThirdPlatformEnum;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author Administrator
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class YtThirdUserDTO extends BaseDTO {
+
+    @ApiModelProperty(value = "第三方平台", required = true)
+    private ThirdPlatformEnum platformName;
+
+    @ApiModelProperty(value = "第三方平台用户ID", required = true)
+    @NotEmpty(message = "第三方平台用户ID不能为空")
+    private String thirdUserId;
+
+    @ApiModelProperty(value = "用户昵称", required = false)
+    private String nickName;
+    @ApiModelProperty(value = "用户头像", required = false)
+    private String avatarUrl;
+
+    @ApiModelProperty(value = "系统用户ID", required = true)
+    @NotEmpty(message = "系统用户ID不能为空")
+    private String appUserId;
+
+
+
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/** 第三方平台枚举值
+ * @author Administrator*/
+public enum ThirdPlatformEnum {
+  DING_TALK,
+  WECHAT
+}

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 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.yunteng.utils.YtDateTimeUtils;
 import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils;
 
 
+import javax.validation.constraints.NotEmpty;
 import java.util.UUID;
 import java.util.UUID;
 
 
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMILY_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMILY_NAME;
@@ -78,6 +80,8 @@ public class YtAlarmEntity {
   @TableField()
   @TableField()
   private String propagateRelationTypes;
   private String propagateRelationTypes;
 
 
+  private String organizationId;
+  private String organizationName;
 
 
   public String getStartTs() {
   public String getStartTs() {
     return YtDateTimeUtils.formate(this.startTs);
     return YtDateTimeUtils.formate(this.startTs);

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author Administrator
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.Table.IOTFS_THIRD_USER_TABLE_NAME)
+public class YtThirdUserEntity extends BaseEntity {
+
+    private ThirdPlatformEnum platformName;
+    private String thirdUserId;
+    private String nickName;
+    private String avatarUrl;
+    private String appUserId;
+
+}

@@ -42,11 +42,11 @@ 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, AlarmStatus status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
+  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) {
     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)){
-      Collection filter = Collections.emptyList();
+      List<String> filter = new ArrayList<>();
       filter.add(organizationId);
       filter.add(organizationId);
       List<OrganizationDTO> all =organizationMapper.findOrganizationTreeList(tenantId.getId().toString(),filter);
       List<OrganizationDTO> all =organizationMapper.findOrganizationTreeList(tenantId.getId().toString(),filter);
       for(OrganizationDTO item:all){
       for(OrganizationDTO item:all){

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.StringUtils;
+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.YtOpinionDTO;
+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.User;
+import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
+import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
+import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
+import org.thingsboard.server.dao.yunteng.mapper.YtOpinionMapper;
+import org.thingsboard.server.dao.yunteng.mapper.YtThirdPlatformMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
+import org.thingsboard.server.dao.yunteng.service.YtOpinionService;
+import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatformMapper, YtThirdUserEntity>
+    implements YtThirdPlatformService {
+
+  private final UserMapper userMapper;
+
+  @Override
+  public YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName, String name) {
+    Wrapper pageFilter = new QueryWrapper<YtThirdUserEntity>()
+            .lambda()
+            .eq(pageInfrom != null,YtThirdUserEntity::getPlatformName,platformName)
+            .like(StringUtils.isNotEmpty(name),YtThirdUserEntity::getNickName,name);
+    IPage<YtThirdUserEntity> page = baseMapper.selectPage(pageInfrom, pageFilter);
+    return getPageData(page, YtThirdUserDTO.class);
+  }
+
+
+
+
+
+  @Override
+  @Transactional(rollbackFor=Exception.class)
+  public YtThirdUserDTO saveOrUpdate(YtThirdUserDTO videoDTO) {
+    User user = userMapper.selectById(videoDTO.getAppUserId());
+    if(user == null){
+      throw new YtDataValidationException(ErrorMessage.USER_NOT_EXISTS.getMessage());
+    }
+    if(StringUtils.isEmpty(user.getAvatar()) && StringUtils.isNotEmpty(videoDTO.getAvatarUrl())){
+      user.setAvatar(videoDTO.getAvatarUrl());
+      userMapper.updateById(user);
+    }
+    Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
+            .eq(YtThirdUserEntity::getThirdUserId,videoDTO.getThirdUserId());
+    YtThirdUserEntity oldVideo = baseMapper.selectOne(filter);
+    if (null == oldVideo) {
+      baseMapper.insert(videoDTO.getEntity(YtThirdUserEntity.class));
+    }else {
+      videoDTO.setId(oldVideo.getId());
+      baseMapper.updateById(videoDTO.getEntity(YtThirdUserEntity.class));
+    }
+    return videoDTO;
+  }
+
+
+
+  @Override
+  @Transactional(rollbackFor=Exception.class)
+  public boolean deleteDataByIds(DeleteDTO deleteDTO) {
+    Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
+            .in(YtThirdUserEntity::getId,deleteDTO.getIds());
+    return baseMapper.delete(filter) > 0;
+  }
+
+
+  @Override
+  public String accessToken(String appKey, String appSecret) {
+    return null;
+  }
+
+  @Override
+  public JsonNode message(String receiver, JsonNode message) {
+    return null;
+  }
+}

@@ -28,7 +28,7 @@ public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
           ,@Param("alarmType")String alarmType
           ,@Param("alarmType")String alarmType
           ,@Param("startTime")Long startTime
           ,@Param("startTime")Long startTime
           ,@Param("endTime")Long endTime
           ,@Param("endTime")Long endTime
-          ,@Param("status")AlarmStatus status
+          ,@Param("status")List<AlarmStatus> status
           ,@Param("deviceId")String deviceId
           ,@Param("deviceId")String deviceId
           ,@Param("deviceType") DeviceTypeEnum deviceType
           ,@Param("deviceType") DeviceTypeEnum deviceType
           ,@Param("originatorType") EntityType originatorType
           ,@Param("originatorType") EntityType originatorType

+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.YtThirdUserEntity;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface YtThirdPlatformMapper extends BaseMapper<YtThirdUserEntity> {
+}

@@ -35,7 +35,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, AlarmStatus status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId);
+    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);
 
 
 
 
     /**
     /**

+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.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
+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.YtOpinionEntity;
+import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
+
+/**
+ * 第三方平台用户管理相关接口
+ * 例如：微信小程序、钉钉等。
+ * @author Administrator
+ */
+public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
+
+    /**
+     * @param pageInfrom      分页配置信息
+     * @param name            第三方平台用户昵称
+     * @return
+     */
+    YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName,String name);
+
+
+
+    /** 第三方平台用户与系统用户绑定
+     * @param dto
+     * @return
+     */
+    YtThirdUserDTO saveOrUpdate(YtThirdUserDTO dto);
+
+    /**
+     * @param deleteDTO
+     * @return
+     */
+    boolean deleteDataByIds(DeleteDTO deleteDTO);
+
+
+
+
+    /**
+     * 访问令牌
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    String accessToken(String appKey, String appSecret);
+
+    /**
+     * 推送第三方程序消息
+     * @param receiver
+     * @param message
+     * @return
+     */
+    JsonNode message(String receiver,JsonNode message);
+
+}

@@ -20,6 +20,9 @@
         <result property="clearTs" column="clear_ts"/>
         <result property="clearTs" column="clear_ts"/>
         <result property="details" column="additional_info" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="details" column="additional_info" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="propagate" column="propagate"/>
         <result property="propagate" column="propagate"/>
+        <result property="organizationId" column="organization_id"/>
+        <result property="organizationName" column="organization_name"/>
+
     </resultMap>
     </resultMap>
 
 
     <resultMap type="org.thingsboard.server.dao.yunteng.entities.SysDict" id="alarmType">
     <resultMap type="org.thingsboard.server.dao.yunteng.entities.SysDict" id="alarmType">
@@ -34,8 +37,10 @@
 
 
 
 
     <select id="alarmPage" resultMap="alarmInfo">
     <select id="alarmPage" resultMap="alarmInfo">
-        SELECT d.name AS device_name,d.id device_id,m.*
-        FROM alarm m LEFT JOIN iotfs_device d ON m.originator_id = d.tb_device_id::uuid
+        SELECT d.name AS device_name,d.id device_id,m.*,d.organization_id,org.name organization_name
+        FROM alarm m
+        LEFT JOIN iotfs_device d ON m.originator_id = d.tb_device_id::uuid
+        LEFT JOIN iotfs_organization org ON org.id = d.organization_id
         <where>
         <where>
             m.tenant_id = #{tenantId}
             m.tenant_id = #{tenantId}
             <if test="alarmType!=null">
             <if test="alarmType!=null">
@@ -48,7 +53,10 @@
                 AND created_time 	&lt;= #{endTime}
                 AND created_time 	&lt;= #{endTime}
             </if>
             </if>
             <if test="status!=null">
             <if test="status!=null">
-                AND status =  #{status.name}
+                AND status IN
+                <foreach collection="status" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
             </if>
             </if>
             <if test="deviceId!=null">
             <if test="deviceId!=null">
                 AND d.id = #{deviceId}
                 AND d.id = #{deviceId}