Merge branch '20220428' into 'master'

fix: 查看告警时客户合租户管理员兼容问题修复

See merge request huang/thingsboard3.3.2!89

@@ -26,6 +26,7 @@ import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.UUID;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
@@ -69,11 +70,11 @@ public class YtAlarmInfoController extends BaseController {
         if (orderType != null) {
         if (orderType != null) {
             pageFilter.put(ORDER_TYPE, orderType.name());
             pageFilter.put(ORDER_TYPE, orderType.name());
         }
         }
-        CustomerId customerId = null;
-        if (getCurrentUser().isCustomerUser()) {
-            customerId = getCurrentUser().getCustomerId();
+        UUID customerId = null;
+        if(getCurrentUser().isCustomerUser()){
+            customerId = getCurrentUser().getCustomerId().getId();
         }
         }
-        return alarmInfoService.alarmPage(pageFilter, getCurrentUser().getTenantId(), customerId, severity, alarmType, startTime, endTime, status, deviceId, deviceType, EntityType.DEVICE, organizationId);
+        return alarmInfoService.alarmPage(pageFilter, getCurrentUser().getTenantId(), customerId,severity,alarmType, startTime, endTime, status, deviceId, deviceType, EntityType.DEVICE, organizationId);
     }
     }
 
 
 
 

@@ -27,6 +27,7 @@ import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.UUID;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
@@ -42,7 +43,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
     private final OrganizationMapper organizationMapper;
     private final OrganizationMapper organizationMapper;
 
 
     @Override
     @Override
-    public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, CustomerId customerId, AlarmSeverity severity, 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, UUID customerId, 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 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
 
 
         }
         }
 
 
-        IPage<YtAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page, tenantId.getId(), customerId.getId(), severity, alarmType, startTime, endTime, status, deviceId, deviceType, originatorType, ids.size() > 0 ? ids : null);
+        IPage<YtAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page, tenantId.getId(), customerId, 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;
     }
     }

@@ -37,7 +37,7 @@ public interface YtAlarmInfoService {
      * @param organizationId    告警所属组织
      * @param organizationId    告警所属组织
      * @return
      * @return
      */
      */
-    YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, CustomerId customerId, AlarmSeverity severity, 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, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId);
 
 
 
 
     /**
     /**

@@ -44,7 +44,7 @@
         <where>
         <where>
             m.tenant_id = #{tenantId}
             m.tenant_id = #{tenantId}
             <if test="customerId!=null">
             <if test="customerId!=null">
-                AND customer_id = #{customerId}
+                AND m.customer_id = #{customerId}
             </if>
             </if>
             <if test="severity!=null">
             <if test="severity!=null">
                 AND severity = #{severity}
                 AND severity = #{severity}