Merge branch '20220516' into 'master'

20220516

See merge request huang/thingsboard3.3.2!100

@@ -3,6 +3,7 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,14 +63,12 @@ public class YtAlarmInfoController extends BaseController {
             @RequestParam(value = "endTime", required = false) Long endTime,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
-        TimePageLink pageLink = createTimePageLink(pageSize, page > 1 ? page - 1 : 0, textSearch, orderBy, orderType == null ? "" : orderType.name(), startTime, endTime);
         Map<String, Object> pageFilter = new HashMap<>();
         pageFilter.put(PAGE_SIZE, pageSize);
         pageFilter.put(PAGE, page);
         pageFilter.put(ORDER_FILED, orderBy);
-        if (orderType != null) {
-            pageFilter.put(ORDER_TYPE, orderType.name());
-        }
+        pageFilter.put(ORDER_TYPE, orderType);
+
         UUID customerId = null;
         if(getCurrentUser().isCustomerUser()){
             customerId = getCurrentUser().getCustomerId().getId();

@@ -510,8 +510,9 @@ spring.resources.chain:
     content:
       enabled: "true"
 
-spring.servlet.multipart.max-file-size: "50MB"
-spring.servlet.multipart.max-request-size: "50MB"
+spring.servlet.multipart:
+  max-file-size: "5MB"
+  max-request-size: "10MB"
 
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation: "true"
 spring.jpa.properties.hibernate.order_by.default_null_ordering: "last"

@@ -38,6 +38,7 @@ public class ModelConstants {
      */
     public static final String ID_PROPERTY = "id";
     public static final String CREATED_TIME_PROPERTY = "created_time";
+    public static final String STATUS_PROPERTY = "status";
     public static final String USER_ID_PROPERTY = "user_id";
     public static final String TENANT_ID_PROPERTY = "tenant_id";
     public static final String CUSTOMER_ID_PROPERTY = "customer_id";

@@ -44,7 +44,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
 
     @Override
     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.STATUS_PROPERTY, OrderTypeEnum.ASC);
         List<String> ids = new ArrayList<>();
         if (StringUtils.isNotBlank(organizationId)) {
             List<String> filter = new ArrayList<>();
@@ -62,7 +62,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
     }
 
 
-    protected IPage<YtAlarmEntity> getPage(Map<String, Object> params, String defaultOrderField, boolean isAsc) {
+    protected IPage<YtAlarmEntity> getPage(Map<String, Object> params, String defaultOrderField, OrderTypeEnum defaultOrder) {
         int curPage = 1;
         int limit = 10;
         if (params.get(PAGE) != null) {
@@ -75,21 +75,20 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
 
         Page<YtAlarmEntity> page = new Page<>(curPage, limit);
         String orderField = (String) params.get(ORDER_FILED);
-        String order = (String) params.get(ORDER_TYPE);
-        if (StringUtils.isNotBlank(orderField) && StringUtils.isNotBlank(order)) {
-            return OrderTypeEnum.ASC.name().equalsIgnoreCase(order)
-                    ? page.addOrder(OrderItem.asc(orderField))
-                    : page.addOrder(OrderItem.desc(orderField));
-        } else if (StringUtils.isBlank(defaultOrderField)) {
-            return page;
-        } else {
-            if (isAsc) {
-                page.addOrder(OrderItem.asc(defaultOrderField));
-            } else {
-                page.addOrder(OrderItem.desc(defaultOrderField));
-            }
-            return page;
+        OrderTypeEnum order = (OrderTypeEnum) params.get(ORDER_TYPE);
+        if(StringUtils.isBlank(orderField)){
+            orderField = defaultOrderField;
+        }
+        if(order == null){
+            order = defaultOrder;
         }
+        if(OrderTypeEnum.ASC.equals(order)){
+            page.addOrder(OrderItem.asc(orderField));
+        }else{
+            page.addOrder(OrderItem.desc(orderField));
+        }
+
+        return page;
     }
 
     @Override

@@ -25,7 +25,7 @@
 
 
     <sql id="basicColumns">
-        base.id,base.sn,base.name,base.avatar,base.video_url,base.description,base.status,base.additional_json,base.device_type,base.organization_id
+        base.id,base.sn,base.name,base.avatar,base.video_url,base.description,base.status,base.additional_json,base.device_type,base.organization_id,base.brand
         ,base.tenant_id,base.create_time,base.update_time,base.creator, base.updater
     </sql>