Merge branch 'master' into 20220322

云中非
2 parents 82865fa5 970a0e63
Showing 6 changed files with 121 additions and 30 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TrendType.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/HomePageService.java
dao/src/main/resources/mapper/DeviceMapper.xml
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
View file @39ae0c1
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
View file @39ae0c1
@@ -10,16 +10,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
-import org.thingsboard.server.dao.yunteng.service.YtTenantService;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
@@ -32,22 +35,16 @@ public class HomePageController extends BaseController {
   private final HomePageService homePageService;
-  private final YtTenantService tenantService;
-
   @GetMapping("left/top")
   @ApiOperation(value = "获取左侧顶部信息")
-  public HomePageLeftTopDTO getLeftTopInfo() {
-    try {
-      return homePageService.getHomePageLeftTopInfo(
-          getCurrentUser().isPtSysadmin(),
-          getCurrentUser().isPtAdmin(),
-          getCurrentUser().isPtTenantAdmin(),
-          getCurrentUser().getCurrentTenantId(),
-          getCurrentUser().getCurrentUserId());
-    } catch (Exception e) {
-      handleException(e);
-    }
-    return null;
+  public HomePageLeftTopDTO getLeftTopInfo()
+      throws ThingsboardException, ExecutionException, InterruptedException {
+    return homePageService.getHomePageLeftTopInfo(
+        getCurrentUser().isPtSysadmin(),
+        getCurrentUser().isPtAdmin(),
+        getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId());
   }
   @GetMapping("right/overdue")
@@ -70,12 +67,25 @@ public class HomePageController extends BaseController {
   @GetMapping("left/bottom")
   @ApiOperation(value = "获取左侧底部信息")
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','CUSTOMER_USER')")
   public DeferredResult<List<TsValue>> getLeftBottomInfo(
       @RequestParam(value = "startTs") long startTs,
       @RequestParam("endTs") long endTs,
       @RequestParam("interval") long interval,
-      @RequestParam("trend") TrendType trend) {
-    return homePageService.getHomePageLeftBottomInfo(startTs, endTs, interval, trend);
+      @RequestParam("trend") TrendType trend)
+      throws ThingsboardException {
+    String customerId = getCurrentUser().getCustomerId().getId().toString();
+    boolean isCustomer = getCurrentUser().isCustomerUser();
+    if(TrendType.CUSTOMER_MESSAGE_STATISTICAL == trend || TrendType.CUSTOMER_ALARM_STATISTICAL == trend){
+      if(!isCustomer){
+        throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+    }
+    if(TrendType.TENANT_TREND == trend || TrendType.CUSTOMER_TREND == trend){
+      if(isCustomer){
+        throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+    }
+    return homePageService.getHomePageLeftBottomInfo(customerId, startTs, endTs, interval, trend,isCustomer);
   }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TrendType.java
View file @39ae0c1
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/enums/TrendType.java
View file @39ae0c1
@@ -9,4 +9,14 @@ public enum TrendType {
      * 客户趋势
      */
     CUSTOMER_TREND,
+
+    /**
+     * 客户告警统计
+     */
+    CUSTOMER_ALARM_STATISTICAL,
+
+    /**
+     * 客户消息统计
+     */
+    CUSTOMER_MESSAGE_STATISTICAL
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
View file @39ae0c1
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
View file @39ae0c1
@@ -126,7 +126,12 @@ public class HomePageServiceImpl implements HomePageService {
   @Override
   public DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
-      long startTs, long endTs, long interval, TrendType trend) {
+      String customerId,
+      long startTs,
+      long endTs,
+      long interval,
+      TrendType trend,
+      boolean isCustomer) {
     List<CompletableFuture<TsValue>> futures = new ArrayList<>();
     interval = interval < 7200000 ? 7200000 : interval;
     long stepTs = startTs;
@@ -139,10 +144,25 @@ public class HomePageServiceImpl implements HomePageService {
       LocalDateTime endTime =
           LocalDateTime.ofEpochSecond(tempEndTs / 1000, 0, ZoneOffset.ofHours(8));
       CompletableFuture<TsValue> tsValueCompletableFuture = null;
-      if (trend.equals(TrendType.TENANT_TREND)) {
-        tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, ts);
-      } else if (trend.equals(TrendType.CUSTOMER_TREND)) {
-        tsValueCompletableFuture = ytUserService.findUsersAsyncByTs(startTime, endTime, ts);
+      //客户查询的是告警统计 消息统计
+      if (isCustomer) {
+        if (trend == TrendType.CUSTOMER_ALARM_STATISTICAL) {
+          tsValueCompletableFuture =
+              findDeviceInfoByTs(
+                  customerId, tempStartTs, tempEndTs, ts, TrendType.CUSTOMER_ALARM_STATISTICAL);
+        }
+        if (trend == TrendType.CUSTOMER_MESSAGE_STATISTICAL) {
+          tsValueCompletableFuture =
+              findDeviceInfoByTs(
+                  customerId, tempStartTs, tempEndTs, ts, TrendType.CUSTOMER_MESSAGE_STATISTICAL);
+        }
+      } else {
+        if (trend == TrendType.TENANT_TREND) {
+          tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, ts);
+        }
+        if (trend == TrendType.CUSTOMER_TREND) {
+          tsValueCompletableFuture = ytUserService.findUsersAsyncByTs(startTime, endTime, ts);
+        }
       }
       futures.add(tsValueCompletableFuture);
       stepTs = tempEndTs;
@@ -533,4 +553,15 @@ public class HomePageServiceImpl implements HomePageService {
       }
     };
   }
+
+  private CompletableFuture<TsValue> findDeviceInfoByTs(
+      String customerId, Long startTs, Long endTs, long ts, TrendType trend) {
+    Integer value;
+    if (trend == TrendType.CUSTOMER_MESSAGE_STATISTICAL) {
+      value = deviceMapper.findDeviceMessageInfoByTs(customerId, startTs, endTs);
+    } else {
+      value = deviceMapper.findDeviceAlarmInfoByCreatedTime(customerId, startTs, endTs);
+    }
+    return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(value)));
+  }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
View file @39ae0c1
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
View file @39ae0c1
@@ -4,10 +4,8 @@ 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.Device;
 import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.HomePageTopMessage;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
@@ -69,6 +67,15 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
       @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
   List<BaseHomePageTop> findDeviceAlarmInfoByCustomer(
-          @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+      @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+
+  Integer findDeviceMessageInfoByTs(
+      @Param("customerId") String customerId,
+      @Param("startTime") Long startTime,
+      @Param("endTime") Long endTime);
+  Integer findDeviceAlarmInfoByCreatedTime(
+      @Param("customerId") String customerId,
+      @Param("startTime") Long startTime,
+      @Param("endTime") Long endTime);
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/HomePageService.java
View file @39ae0c1
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/HomePageService.java
View file @39ae0c1
@@ -2,10 +2,8 @@ package org.thingsboard.server.dao.yunteng.service;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftTopDTO;
-import org.thingsboard.server.common.data.yunteng.dto.HomePageRightDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantTransportMessageDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
@@ -52,19 +50,23 @@ public interface HomePageService {
    * @param trend 趋势类型
    * @return 左侧底部信息
    */
-  DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(long startTs, long endTs, long interval, TrendType trend);
+  DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
+      String customerId, long startTs, long endTs, long interval, TrendType trend,boolean isCustomer);
   /**
    * 获取首页TOP10
+   *
    * @return top10
    */
   DeferredResult<List<TenantTransportMessageDTO>> getTop10();
   /**
    * 获取租户的传输信息
+   *
    * @param tenantId 租户ID
    * @param tenantName 租户姓名
    * @return 传输信息
    */
-  CompletableFuture<TenantTransportMessageDTO> getTransportMessageByTenantId(TenantId tenantId,String tenantName);
+  CompletableFuture<TenantTransportMessageDTO> getTransportMessageByTenantId(
+      TenantId tenantId, String tenantName);
 }
--- a/dao/src/main/resources/mapper/DeviceMapper.xml
View file @39ae0c1
+++ b/dao/src/main/resources/mapper/DeviceMapper.xml
View file @39ae0c1
@@ -237,4 +237,35 @@
         FROM alarm
         WHERE customer_id ::TEXT = #{customerId} AND originator_type = 5;
     </select>
+
+    <select id="findDeviceMessageInfoByTs" resultType="java.lang.Integer">
+        SELECT COUNT
+        ( ts.ts ) AS sum_count
+        FROM
+        (
+        SELECT
+        tk.ts
+        FROM
+        ts_kv tk
+        LEFT JOIN device d ON tk.entity_id = d.ID
+        WHERE
+        d.customer_id ::TEXT = #{customerId}
+        AND tk.ts &gt;= #{startTime}
+        AND tk.ts &lt; #{endTime}
+        GROUP BY
+        tk.ts
+        ) ts;
+    </select>
+
+    <select id="findDeviceAlarmInfoByCreatedTime" resultType="java.lang.Integer">
+        SELECT COUNT
+        ( ID ) AS sum_count
+        FROM
+        alarm
+        WHERE
+        customer_id ::TEXT = #{customerId}
+        AND created_time &gt;= #{startTime}
+        AND created_time &lt; #{endTime}
+        AND originator_type = 5;
+    </select>
 </mapper>