Merge remote-tracking branch 'origin/master' into ljl1207

+package org.thingsboard.server.config.yunteng;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.UUID;
+
+@Configuration
+public class AppConfig {
+  @Bean
+  public MybatisPlusPropertiesCustomizer plusPropertiesCustomizer() {
+    return plusProperties ->
+        plusProperties
+            .getGlobalConfig()
+            .setIdentifierGenerator(
+                new IdentifierGenerator() {
+                  @Override
+                  public Number nextId(Object entity) {
+                    return new DefaultIdentifierGenerator().nextId(entity);
+                  }
+
+                  @Override
+                  public String nextUUID(Object entity) {
+                    return UUID.randomUUID().toString();
+                  }
+                });
+  }
+
+  @Bean
+  public MybatisPlusInterceptor mybatisPlusInterceptor() {
+    MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+    interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+    return interceptor;
+  }
+}

+package org.thingsboard.server.config.yunteng;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Component
+public class MyBatisMetaObjectHandler implements MetaObjectHandler {
+  public MyBatisMetaObjectHandler() {}
+  private SecurityUser user = null;
+  public void insertFill(MetaObject metaObject) {
+    try {
+      user = getCurrentUser();
+      if (user != null) {
+        this.strictInsertFill(
+            metaObject,
+            ModelConstants.TablePropertyMapping.CREATOR,
+            String.class,
+            user.getCurrentUserId());
+        this.strictInsertFill(
+            metaObject,
+            ModelConstants.TablePropertyMapping.CREATE_TIME,
+            LocalDateTime.class,
+            LocalDateTime.now());
+      }
+    } catch (Exception e) {
+      // do nothing
+    }
+  }
+
+  public void updateFill(MetaObject metaObject) {
+    user = getCurrentUser();
+    if (user != null) {
+      this.strictUpdateFill(
+          metaObject, ModelConstants.TablePropertyMapping.UPDATER, String.class, user.getCurrentUserId());
+      this.strictUpdateFill(
+          metaObject,
+          ModelConstants.TablePropertyMapping.UPDATE_TIME,
+          LocalDateTime.class,
+          LocalDateTime.now());
+    }
+  }
+  private SecurityUser getCurrentUser(){
+    SecurityUser securityUser = null;
+    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    if (authentication != null && authentication.getPrincipal() instanceof SecurityUser){
+      securityUser = (SecurityUser) authentication.getPrincipal();
+    }
+    return securityUser;
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.exception.FastIotException;
+import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.MenuService;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/menu")
+public class YtMenuController extends BaseController {
+
+  private final MenuService menuService;
+
+  @GetMapping("/me/menus")
+  public List<MenuDTO> getMyMenus() throws ThingsboardException {
+    return menuService.getMyMenus(
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId(),
+        getCurrentUser().isPtSysadmin(),
+        getCurrentUser().isPtTenantAdmin());
+  }
+
+  @GetMapping("getMenuIdsByRoleId/{roleId}")
+  public Set<String> getMenuIdsByRoleId(@PathVariable("roleId") String roleId) {
+    return menuService.getMenuIdsByRoleId(roleId);
+  }
+
+  @PutMapping("/manage/assign/{roleId}")
+  public void assignMenuToRole(
+      @RequestBody String[] menuIds, @PathVariable("roleId") String roleId) {
+    menuService.assignMenuToRole(menuIds, roleId);
+  }
+
+  @GetMapping("{id}")
+  public ResponseEntity<MenuDTO> getMenus(@PathVariable("id") String id) {
+    return ResponseEntity.of(menuService.getMenu(id));
+  }
+
+  @PutMapping
+  //  @PreAuthorize("@iot.check('menu:update')")
+  public MenuDTO updateMenu(@RequestBody MenuDTO menuDTO) throws ThingsboardException {
+    Assert.notNull(menuDTO.getId(), "menuId cannot be null");
+    return menuService.updateMenu(
+        getCurrentUser().getCurrentTenantId(), getCurrentUser().isPtSysadmin(), menuDTO);
+  }
+
+  @PostMapping
+  @PreAuthorize("hasAnyRole('SYS_ADMIN','TENANT_ADMIN')")
+  public ResponseEntity<MenuDTO> saveMenu(@RequestBody MenuDTO menuDTO)
+      throws FastIotException, ThingsboardException {
+    MenuDTO newMenuDTO =
+        menuService.saveMenu(
+            getCurrentUser().getCurrentTenantId(), getCurrentUser().isPtSysadmin(), menuDTO);
+    return Optional.ofNullable(newMenuDTO)
+        .map(
+            dto -> {
+              URI location =
+                  ServletUriComponentsBuilder.fromCurrentRequest()
+                      .path("/{id}")
+                      .buildAndExpand(newMenuDTO.getId())
+                      .toUri();
+              return ResponseEntity.created(location).body(newMenuDTO);
+            })
+        .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+  }
+
+  @DeleteMapping
+  @PreAuthorize("hasAnyRole('SYS_ADMIN','TENANT_ADMIN')")
+  public void deleteMenus(@RequestBody String[] ids) throws ThingsboardException {
+    if (ids.length == 0) {
+      throw new DataValidationException("please provide menu ids to delete");
+    }
+    menuService.deleteMenus(getCurrentUser().getCurrentTenantId(), ids);
+  }
+}

@@ -10,7 +10,9 @@ import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.dao.yunteng.entities.SysTown;
 import org.thingsboard.server.dao.yunteng.entities.SysTown;
 import org.thingsboard.server.dao.yunteng.service.SysTownService;
 import org.thingsboard.server.dao.yunteng.service.SysTownService;
 
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * @author: 徐浩然
  * @author: 徐浩然
@@ -36,4 +38,10 @@ public class YtTownController {
       @PathVariable("variable") String variable, @PathVariable("value") String value) {
       @PathVariable("variable") String variable, @PathVariable("value") String value) {
     return ResponseEntity.ok(sysTownService.findChilds(variable, value));
     return ResponseEntity.ok(sysTownService.findChilds(variable, value));
   }
   }
+
+  @GetMapping("tree")
+  @ApiOperation("查询城市树形结构")
+  public ResponseEntity<LinkedList<Map<String, Object>>> tree() {
+    return ResponseEntity.ok(sysTownService.tree());
+  }
 }
 }

 package org.thingsboard.server.dao.yunteng.impl;
 package org.thingsboard.server.dao.yunteng.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -9,8 +10,7 @@ import org.thingsboard.server.dao.yunteng.mapper.SysTownMapper;
 import org.thingsboard.server.dao.yunteng.service.SysTownService;
 import org.thingsboard.server.dao.yunteng.service.SysTownService;
 
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Stack;
+import java.util.*;
 
 
 /**
 /**
  * @author: 徐浩然
  * @author: 徐浩然
@@ -24,6 +24,11 @@ public class SysTownServiceImpl implements SysTownService {
 
 
   private final SysTownMapper sysTownMapper;
   private final SysTownMapper sysTownMapper;
 
 
+  private final String PID = "pid";
+  private final String ID = "id";
+  private final String NAME = "name";
+  private final String CHILD = "child";
+
   @Override
   @Override
   public List<SysTown> findChilds(String variable, String value) {
   public List<SysTown> findChilds(String variable, String value) {
     Field[] fields = SysTown.class.getDeclaredFields();
     Field[] fields = SysTown.class.getDeclaredFields();
@@ -47,13 +52,10 @@ public class SysTownServiceImpl implements SysTownService {
             // 组成需要groupby的字段
             // 组成需要groupby的字段
             .toArray(String[]::new);
             .toArray(String[]::new);
     return sysTownMapper.selectList(
     return sysTownMapper.selectList(
-        new QueryWrapper<SysTown>()
-            .select(groupBy)
-            .eq(to_(variable), value)
-            .groupBy(groupBy));
+        new QueryWrapper<SysTown>().select(groupBy).eq(to_(variable), value).groupBy(groupBy));
   }
   }
 
 
-  private String to_(String s){
+  private String to_(String s) {
     return s.replaceAll("[A-Z]", "_$0").toLowerCase();
     return s.replaceAll("[A-Z]", "_$0").toLowerCase();
   }
   }
 
 
@@ -67,4 +69,108 @@ public class SysTownServiceImpl implements SysTownService {
   public List<SysTown> getCityList() {
   public List<SysTown> getCityList() {
     return sysTownMapper.getCityList();
     return sysTownMapper.getCityList();
   }
   }
+
+  @Override
+  public LinkedList<Map<String, Object>> tree() {
+    // 查询有序数据
+    List<SysTown> cityList =
+        sysTownMapper.selectList(
+            new LambdaQueryWrapper<SysTown>()
+                .orderByAsc(
+                    SysTown::getCodeProv,
+                    SysTown::getCodeCity,
+                    SysTown::getCodeCoun,
+                    SysTown::getCodeTown));
+    // 省
+    LinkedList<Map<String, Object>> prov = new LinkedList<>();
+    // 市
+    LinkedList<Map<String, Object>> city = new LinkedList<>();
+    // 区
+    LinkedList<Map<String, Object>> coun = new LinkedList<>();
+    // 县
+    LinkedList<Map<String, Object>> town = new LinkedList<>();
+    for (SysTown sysTown : cityList) {
+      if (coun.size() != 0 && !coun.getLast().get(ID).equals(sysTown.getCodeCoun())) {
+        // 切换区则县链改变
+        town = new LinkedList<>();
+      }
+      // 添加县
+      addTown(town, sysTown);
+
+      if (city.size() != 0 && !city.getLast().get(ID).equals(sysTown.getCodeCity())) {
+        // 切换市则区链改变
+        coun = new LinkedList<>();
+      }
+      // 添加区
+      addCoun(coun, town, sysTown);
+      if (prov.size() != 0 && !prov.getLast().get(ID).equals(sysTown.getCodeProv())) {
+        // 切换省则市链改变
+        city = new LinkedList<>();
+      }
+      // 添加市
+      addCity(city, coun, sysTown);
+      // 添加省
+      addProv(prov, city, sysTown);
+    }
+    return prov;
+  }
+
+  private void addTown(LinkedList<Map<String, Object>> town, SysTown sysTown) {
+    if (town.size() == 0 || !town.getLast().get(ID).equals(sysTown.getCodeTown())) {
+      town.addLast(
+          new HashMap<>() {
+            {
+              put(PID, sysTown.getCodeCoun());
+              put(ID, sysTown.getCodeTown());
+              put(NAME, sysTown.getNameTown());
+              // put(CHILD, null);
+            }
+          });
+    }
+  }
+
+  private void addCoun(
+      LinkedList<Map<String, Object>> coun, LinkedList<Map<String, Object>> town, SysTown sysTown) {
+    if (coun.size() == 0 || !coun.getLast().get(ID).equals(sysTown.getCodeCoun())) {
+      coun.addLast(
+          new HashMap<>() {
+            {
+              put(PID, sysTown.getCodeCity());
+              put(ID, sysTown.getCodeCoun());
+              put(NAME, sysTown.getNameCoun());
+              put(CHILD, town);
+            }
+          });
+    }
+  }
+
+  private void addCity(
+      LinkedList<Map<String, Object>> city, LinkedList<Map<String, Object>> coun, SysTown sysTown) {
+    if (city.size() == 0 || !city.getLast().get(ID).equals(sysTown.getCodeCity())) {
+      city.addLast(
+          new HashMap<>() {
+            {
+              put(PID, sysTown.getCodeProv());
+              put(ID, sysTown.getCodeCity());
+              put(NAME, sysTown.getNameCity());
+              put(CHILD, coun);
+            }
+          });
+    }
+  }
+
+  private void addProv(
+      LinkedList<Map<String, Object>> prov, LinkedList<Map<String, Object>> city, SysTown sysTown) {
+    if (prov.size() == 0 || !prov.getLast().get(ID).equals(sysTown.getCodeProv())) {
+      prov.addLast(
+          new HashMap<>() {
+            {
+              // put(PID, null);
+              put(ID, sysTown.getCodeProv());
+              put(NAME, sysTown.getNameProv());
+              put(CHILD, city);
+            }
+          });
+    }
+  }
 }
 }

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
@@ -54,7 +55,7 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
   public PageData<TenantDTO> page(Map<String, Object> queryMap) {
   public PageData<TenantDTO> page(Map<String, Object> queryMap) {
     IPage<Tenant> tenantIPage = getPage(queryMap, "create_time", true);
     IPage<Tenant> tenantIPage = getPage(queryMap, "create_time", true);
     IPage<TenantDTO> userPage =
     IPage<TenantDTO> userPage =
-        baseMapper.getTenantPage(tenantIPage, (String) queryMap.get("tenantName"));
+        baseMapper.getTenantPage(tenantIPage, (String) queryMap.get("tenantName"), EntityId.NULL_UUID.toString());
     PageData<TenantDTO> pageData = getPageData(userPage, TenantDTO.class);
     PageData<TenantDTO> pageData = getPageData(userPage, TenantDTO.class);
     determineTenantStatus(pageData.getItems());
     determineTenantStatus(pageData.getItems());
     return pageData;
     return pageData;

@@ -14,5 +14,8 @@ import java.util.Set;
 public interface TenantMapper extends BaseMapper<Tenant> {
 public interface TenantMapper extends BaseMapper<Tenant> {
   Set<String> getTenantIdsByTenantIds(@Param("tenantIds") Collection<String> tenantIds);
   Set<String> getTenantIdsByTenantIds(@Param("tenantIds") Collection<String> tenantIds);
 
 
-  IPage<TenantDTO> getTenantPage(IPage<?> page, @Param("tenantName") String tenantName);
+  IPage<TenantDTO> getTenantPage(
+      IPage<?> page,
+      @Param("tenantName") String tenantName,
+      @Param("defaultTenantId") String defaultTenantId);
 }
 }

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
-
-
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
-
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
 
 
 public interface MenuService {
 public interface MenuService {
-
   /**
   /**
    * sysadmin获取所有的menu，但是不获取租户自己创建的menu
    * sysadmin获取所有的menu，但是不获取租户自己创建的menu
    *
    *
@@ -22,17 +18,18 @@ public interface MenuService {
    *
    *
    * @return list 树状menu
    * @return list 树状menu
    */
    */
-  List<MenuDTO> getMyMenus(String tenantId,String userId,boolean isSysAdmin,boolean isTenantAdmin);
+  List<MenuDTO> getMyMenus(
+      String tenantId, String userId, boolean isPtSysAdmin, boolean isPtTenantAdmin);
 
 
-  MenuDTO saveMenu(String tenantId,boolean isSysAdmin,MenuDTO menuDTO);
+  MenuDTO saveMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);
 
 
   Optional<MenuDTO> getMenu(String id);
   Optional<MenuDTO> getMenu(String id);
 
 
-  MenuDTO updateMenu(String tenantId,boolean isSysAdmin,MenuDTO menuDTO);
+  MenuDTO updateMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);
 
 
-  boolean deleteMenus(String tenantId,String[] ids);
+  boolean deleteMenus(String tenantId, String[] ids);
 
 
-  boolean assignMenuToTenant(String tenantId,String[] menuId);
+  boolean assignMenuToTenant(String tenantId, String[] menuId);
 
 
   boolean assignMenuToRole(String[] menuId, String roleId);
   boolean assignMenuToRole(String[] menuId, String roleId);
 
 

@@ -2,7 +2,9 @@ package org.thingsboard.server.dao.yunteng.service;
 
 
 import org.thingsboard.server.dao.yunteng.entities.SysTown;
 import org.thingsboard.server.dao.yunteng.entities.SysTown;
 
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * @author: 徐浩然
  * @author: 徐浩然
@@ -16,4 +18,6 @@ public interface SysTownService {
     SysTown findParent(String variable, String value);
     SysTown findParent(String variable, String value);
 
 
     List<SysTown> getCityList();
     List<SysTown> getCityList();
+
+    LinkedList<Map<String, Object>> tree();
 }
 }

@@ -24,7 +24,7 @@
         SELECT id, tenant_id,name, enabled, description, default_config, tenant_expire_time, create_time,icon
         SELECT id, tenant_id,name, enabled, description, default_config, tenant_expire_time, create_time,icon
         FROM sys_tenant
         FROM sys_tenant
         <where>
         <where>
-            tenant_id != 'DEFAULT_SYS_ADMIN_TENANT_CODE'
+            tenant_id != #{defaultTenantId}
             <if test="tenantName!=null">
             <if test="tenantName!=null">
                AND name LIKE CONCAT('%',#{tenantName}::TEXT,'%')
                AND name LIKE CONCAT('%',#{tenantName}::TEXT,'%')
             </if>
             </if>