Merge remote-tracking branch 'origin/i18n' into i18n

@@ -44,6 +44,7 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -113,6 +114,17 @@ public class ThingsModelController extends BaseController {
     return ResponseEntity.ok(saveOrUpdate(thingsModelDTO));
   }
 
+  @PostMapping("/updateSort")
+  @ApiOperation("修改物模型排序接口")
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+  public ResponseEntity<Boolean> updateSort(
+          @RequestParam(value = "sortType: up向上，down向下，topUp置顶，bottomUp置底" ) String sortType,
+          @RequestParam(value = "id") String id,
+          @RequestParam (value = "isCategory 是否品类") Boolean isCategory)
+          throws ThingsboardException {
+    return ResponseEntity.ok(thingsModelService.updateSort(id,sortType,isCategory));
+  }
+
   @DeleteMapping
   @ApiOperation("删除")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:delete'})")
@@ -440,6 +452,8 @@ public class ThingsModelController extends BaseController {
          dto.setExtensionDesc(extensionDesc);
          dto.setRemark(row.getCell(10)==null?null:row.getCell(10).toString());
          dto.setTenantId(tenantId);
+         AtomicInteger sort = new AtomicInteger(thingsModelService.getCountById(deviceProfileId, false)+1);
+         dto.setSort(sort.get());
          if(dto.getCategoryId()!=null){
            thingsModelService.categorySaveOrUpdate(dto);
          }else{
@@ -555,6 +569,8 @@ public class ThingsModelController extends BaseController {
         dto.setAccessMode(accessMode.equals("读写")?"rw":accessMode.equals("只读")?"r":null);
         dto.setRemark(row.getCell(8)==null?null:row.getCell(8).toString());
         dto.setTenantId(tenantId);
+        AtomicInteger sort = new AtomicInteger(thingsModelService.getCountById(categoryId, true)+1);
+        dto.setSort(sort.get());
         if(dto.getCategoryId()!=null){
           thingsModelService.categorySaveOrUpdate(dto);
         }else{

@@ -66,4 +66,7 @@ public class ThingsModelDTO extends TenantDTO {
 
   @ApiModelProperty(value = "品类Id")
   private String categoryId;
+
+  @ApiModelProperty(value = "排序")
+  private Integer sort;
 }

@@ -38,6 +38,7 @@ import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 @Service
@@ -68,7 +69,7 @@ public class ThingsModelServiceImpl
         }
         IPage<TkThingsModelEntity> iPage =
                 baseMapper.selectPage(
-                        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
+                        getPage(queryMap, "sort", true),
                         new LambdaQueryWrapper<TkThingsModelEntity>()
                                 .eq(StringUtils.isNotEmpty(tenantId), TkThingsModelEntity::getTenantId, tenantId)
                                 .eq(StringUtils.isNotEmpty(deviceProfileId), TkThingsModelEntity::getDeviceProfileId, deviceProfileId)
@@ -361,7 +362,7 @@ public class ThingsModelServiceImpl
         DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(new TenantId(UUID.fromString(tenantId)), new DeviceProfileId(UUID.fromString(profileDTO.getTbProfileId())));
         DeviceTypeEnum type = profileDTO.getDeviceType();
         String transportType = String.valueOf(deviceProfile.getTransportType());
-        if (transportType.equals("TCP") && type.equals(DeviceTypeEnum.SENSOR) && (null != importThingsModel.getData().getServices() || null != importThingsModel.getData().getEvents())) {
+        if (transportType.equals("TCP") && type.equals(DeviceTypeEnum.SENSOR) && (!importThingsModel.getData().getServices().isEmpty() || !importThingsModel.getData().getEvents().isEmpty())) {
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER_IMPORT.getI18nCode()));
         }
         if (Objects.equals(importThingsModel.getFunctionType(), FunctionTypeEnum.all)
@@ -406,6 +407,10 @@ public class ThingsModelServiceImpl
                     entities,
                     null);
         }
+        AtomicInteger i = new AtomicInteger(getCountById(tkDeviceProfileId, false)+1);
+        entities.stream().forEach(e->{
+            e.setSort(i.getAndIncrement());
+        });
         insertBatch(entities, TkThingsModelEntity.class);
         entities.forEach(entity -> {
             //云边同步
@@ -458,6 +463,10 @@ public class ThingsModelServiceImpl
                     entities,
                     categoryId);
         }
+        AtomicInteger i = new AtomicInteger(getCountById(categoryId, true)+1);
+        entities.stream().forEach(e->{
+            e.setSort(i.getAndIncrement());
+        });
         return insertBatch(entities, TkThingsModelEntity.class);
     }
 
@@ -507,6 +516,77 @@ public class ThingsModelServiceImpl
         return list;
     }
 
+    @Override
+    public boolean updateSort(String id, String sortType,Boolean isCategory) {
+        TkThingsModelEntity entity = baseMapper.selectById(id);
+        TkThingsModelEntity sortEntity ;
+        List<TkThingsModelEntity> sortEntityList;
+        switch (sortType) {
+            case "up":
+                sortEntity =  getSortEntity(entity,entity.getSort()-1,isCategory);
+                swapSortValues(entity,sortEntity);
+                break;
+            case "down":
+                sortEntity =  getSortEntity(entity,entity.getSort()+1,isCategory);
+                swapSortValues(entity,sortEntity);
+                break;
+            case "topUp":
+                entity.setSort(0);
+                baseMapper.updateById(entity);
+                getSortEntityList(entity,isCategory);
+                break;
+            case "bottomUp":
+                sortEntityList  = getSortEntityList(entity,isCategory);
+                entity.setSort(sortEntityList.size()+1);
+                baseMapper.updateById(entity);
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    public Integer getCountById(String id, Boolean isCategory) {
+        return Math.toIntExact(baseMapper.selectCount(
+                new LambdaQueryWrapper<TkThingsModelEntity>()
+                        .eq(isCategory, TkThingsModelEntity::getCategoryId, id)
+                        .eq(!isCategory, TkThingsModelEntity::getDeviceProfileId, id)));
+    }
+
+    private List<TkThingsModelEntity> getSortEntityList(TkThingsModelEntity entity,Boolean isCategory){
+        List<TkThingsModelEntity> list =   baseMapper.selectList(
+                new LambdaQueryWrapper<TkThingsModelEntity>()
+                        .notIn(TkThingsModelEntity::getId,entity.getId())
+                        .eq(isCategory, TkThingsModelEntity::getCategoryId, entity.getCategoryId())
+                        .eq(!isCategory, TkThingsModelEntity::getDeviceProfileId, entity.getDeviceProfileId())
+                        .orderBy(true, true, TkThingsModelEntity::getSort));
+        AtomicInteger i= new AtomicInteger(1);
+        list.stream().forEach(e->{
+            e.setSort(i.getAndIncrement());
+            baseMapper.updateById(e);
+        });
+        return list;
+    }
+
+    private TkThingsModelEntity getSortEntity(TkThingsModelEntity entity ,Integer sort ,Boolean isCategory){
+        return baseMapper.selectOne(
+                new LambdaQueryWrapper<TkThingsModelEntity>()
+                        .eq(TkThingsModelEntity::getSort,sort)
+                        .eq(isCategory, TkThingsModelEntity::getCategoryId, entity.getCategoryId())
+                        .eq(!isCategory, TkThingsModelEntity::getDeviceProfileId, entity.getDeviceProfileId()));
+    }
+
+    // 交换两个对象的 sort 值
+    private void swapSortValues(TkThingsModelEntity entity1, TkThingsModelEntity entity2) {
+        if(null!=entity1&&null!=entity2){
+            Integer oldSort = entity1.getSort();
+            Integer newSort = entity2.getSort();
+            entity1.setSort(newSort);
+            entity2.setSort(oldSort);
+            baseMapper.updateById(entity1);
+            baseMapper.updateById(entity2);
+        }
+    }
+
     private void checkNameAndIdentifier(
             List<String> existIdentifiers,
             FunctionTypeEnum functionType,

@@ -61,4 +61,9 @@ public interface ThingsModelService extends BaseService<TkThingsModelEntity>{
   List<BatchDeviceProfileInfoDTO> getDeviceProfileTSLInfoByIds(String tenantId, List<String> deviceProfileIds,
                                                                FunctionTypeEnum functionTypeEnum);
 
+  boolean updateSort(String id,String sortType,Boolean isCategory);
+
+  Integer getCountById(String id,Boolean isCategory);
+
+
 }