Update 优化字符串拼接转换等

SERVER/VberAdminPlusV3/vber-common/vber-common-core/src/main/java/com/vber/common/core/utils/StringUtils.java

@@ -280,13 +280,13 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         if (s != null) {
             final int len = s.length();
             if (s.length() <= size) {
-                sb.append(String.valueOf(c).repeat(size - len));
+                sb.append(Convert.toStr(c).repeat(size - len));
                 sb.append(s);
             } else {
                 return s.substring(len - size, len);
             }
         } else {
-            sb.append(String.valueOf(c).repeat(Math.max(0, size)));
+            sb.append(Convert.toStr(c).repeat(Math.max(0, size)));
         }
         return sb.toString();
     }
@@ -382,5 +382,26 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         }
     }
 
+    /**
+     * 将可迭代对象中的元素使用逗号拼接成字符串
+     *
+     * @param iterable 可迭代对象，如 List、Set 等
+     * @return 拼接后的字符串
+     */
+    public static String joinComma(Iterable<?> iterable) {
+        return StringUtils.join(iterable, SEPARATOR);
+    }
+
+
+    /**
+     * 将数组中的元素使用逗号拼接成字符串
+     *
+     * @param array 任意类型的数组
+     * @return 拼接后的字符串
+     */
+    public static String joinComma(Object[] array) {
+        return StringUtils.join(array, SEPARATOR);
+    }
+
 
 }

SERVER/VberAdminPlusV3/vber-common/vber-common-mybatis/src/main/java/com/vber/common/sharding/LongDateShardingAlgorithm.java

@@ -33,13 +33,13 @@ public class LongDateShardingAlgorithm implements StandardShardingAlgorithm<Long
     }
 
     private int getSecondIndex(Properties props) {
-        return Integer.parseInt(String.valueOf(props.getProperty("second-index", "4")));
+        return Integer.parseInt(Convert.toStr(props.getProperty("second-index", "4")));
     }
 
     @Override
     public String doSharding(Collection<String> availableTargetNames, PreciseShardingValue<Long> shardingValue) {
         Long value = shardingValue.getValue();
-        String tableName = String.valueOf(value).substring(firstIndex, secondIndex);
+        String tableName = Convert.toStr(value).substring(firstIndex, secondIndex);
         for (String each : availableTargetNames) {
             if (each.endsWith(tableName)) {
                 return each;
@@ -56,10 +56,10 @@ public class LongDateShardingAlgorithm implements StandardShardingAlgorithm<Long
     public Collection<String> doSharding(Collection<String> availableTargetNames, RangeShardingValue<Long> shardingValue) {
         Collection<String> result = new LinkedHashSet<>(availableTargetNames.size());
         Range<Long> range = shardingValue.getValueRange();
-        int lowerEndPoint = Integer.parseInt(String.valueOf(range.lowerEndpoint()).substring(firstIndex, secondIndex));
-        int upperEndpoint = Integer.parseInt(String.valueOf(range.upperEndpoint()).substring(firstIndex, secondIndex));
+        int lowerEndPoint = Integer.parseInt(Convert.toStr(range.lowerEndpoint()).substring(firstIndex, secondIndex));
+        int upperEndpoint = Integer.parseInt(Convert.toStr(range.upperEndpoint()).substring(firstIndex, secondIndex));
         for (Integer value = lowerEndPoint; value <= upperEndpoint; value++) {
-            String database_index = String.valueOf(value);
+            String database_index = Convert.toStr(value);
             for (String each : availableTargetNames) {
                 if (each.endsWith(database_index)) {
                     result.add(each);

SERVER/VberAdminPlusV3/vber-common/vber-common-satoken/src/main/java/com/vber/common/satoken/utils/LoginHelper.java

@@ -216,7 +216,8 @@ public class LoginHelper {
      */
     public static boolean isLogin() {
         try {
-            return getLoginUser() != null;
+            StpUtil.checkLogin();
+            return true;
         } catch (Exception e) {
             return false;
         }

SERVER/VberAdminPlusV3/vber-extend/vber-job-admin/src/main/java/com/vber/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java

@@ -69,7 +69,7 @@ public class ExecutorRouteConsistentHash extends ExecutorRouter {
             }
         }
 
-        long jobHash = hash(String.valueOf(jobId));
+        long jobHash = hash(Convert.toStr(jobId));
         SortedMap<Long, String> lastRing = addressRing.tailMap(jobHash);
         if (!lastRing.isEmpty()) {
             return lastRing.get(lastRing.firstKey());

SERVER/VberAdminPlusV3/vber-modules/vber-generator/src/main/java/com/vber/generator/util/VelocityUtils.java

@@ -248,7 +248,7 @@ public class VelocityUtils {
         List<GenTableColumn> columns = genTable.getColumns();
         Set<String> dicts = new HashSet<>();
         addDicts(dicts, columns);
-        return StringUtils.join(dicts, ", ");
+        return StringUtils.joinComma(dicts);
     }
 
     /**

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/domain/bo/SysTenantPackageBo.java

@@ -37,7 +37,7 @@ public class SysTenantPackageBo extends BaseEntity {
     /**
      * 关联菜单id
      */
-    @AutoMapping(target = "menuIds", expression = "java(com.vber.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))")
+    @AutoMapping(target = "menuIds", expression = "java(com.vber.common.core.utils.StringUtils.joinComma(source.getMenuIds()))")
     private Long[] menuIds;
 
     /**

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/service/impl/SysConfigServiceImpl.java

@@ -173,7 +173,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
         List<SysConfig> list = baseMapper.selectByIds(configIds);
         list.forEach(config -> {
             if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) {
-                throw new ServiceException(String.format("内置参数【%s】不能删除", config.getConfigKey()));
+                throw new ServiceException("内置参数【{}】不能删除", config.getConfigKey());
             }
             CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
         });

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/service/impl/SysOrgServiceImpl.java

@@ -195,7 +195,7 @@ public class SysOrgServiceImpl implements ISysOrgService, OrgService {
                 list.add(vo.getOrgName());
             }
         }
-        return String.join(StringUtils.SEPARATOR, list);
+        return StringUtils.joinComma(list);
     }
 
     /**

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/service/impl/SysOssConfigServiceImpl.java

@@ -129,7 +129,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
     private void validEntityBeforeSave(SysOssConfig entity) {
         if (StringUtils.isNotEmpty(entity.getConfigKey())
                 && !checkConfigKeyUnique(entity)) {
-            throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!");
+            throw new ServiceException("操作配置'{}'失败, 配置key已存在!", entity.getConfigKey());
         }
     }
 

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/service/impl/SysTaskAssigneeServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.Map;
 /**
  * 工作流设计器获取任务执行人
  *
- * @author Lion Li
+ * @author Iwb
  */
 @RequiredArgsConstructor
 @Service
@@ -59,7 +59,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysRoleVo> page = roleService.selectPageRoleList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-                item -> String.valueOf(item.getRoleId()), SysRoleVo::getRoleKey, SysRoleVo::getRoleName, null, SysRoleVo::getCreateTime);
+                item -> Convert.toStr(item.getRoleId()), SysRoleVo::getRoleKey, SysRoleVo::getRoleName, null, SysRoleVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -83,7 +83,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysPostVo> page = postService.selectPagePostList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-                p -> String.valueOf(p.getPostId()), SysPostVo::getPostCategory, SysPostVo::getPostName, SysPostVo::getOrgId, SysPostVo::getCreateTime);
+                p -> Convert.toStr(p.getPostId()), SysPostVo::getPostCategory, SysPostVo::getPostName, SysPostVo::getOrgId, SysPostVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -107,7 +107,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysOrgVo> page = orgService.selectPageOrgList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-                d -> String.valueOf(d.getOrgId()), SysOrgVo::getOrgCategory, SysOrgVo::getOrgName, SysOrgVo::getParentId, SysOrgVo::getCreateTime);
+                d -> Convert.toStr(d.getOrgId()), SysOrgVo::getOrgCategory, SysOrgVo::getOrgName, SysOrgVo::getParentId, SysOrgVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -131,7 +131,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysUserVo> page = userService.selectPageUserList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-                u -> String.valueOf(u.getUserId()), SysUserVo::getUserName, SysUserVo::getNickName, SysUserVo::getOrgId, SysUserVo::getCreateTime);
+                u -> Convert.toStr(u.getUserId()), SysUserVo::getUserName, SysUserVo::getNickName, SysUserVo::getOrgId, SysUserVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/service/impl/SysTenantPackageServiceImpl.java

@@ -92,11 +92,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService, Te
         SysTenantPackage add = MapstructUtils.convert(bo, SysTenantPackage.class);
         // 保存菜单id
         List<Long> menuIds = Arrays.asList(bo.getMenuIds());
-        if (CollUtil.isNotEmpty(menuIds)) {
-            add.setMenuIds(StringUtils.join(menuIds, ", "));
-        } else {
-            add.setMenuIds("");
-        }
+        add.setMenuIds(CollUtil.isNotEmpty(menuIds) ? StringUtils.joinComma(menuIds) : "");
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setPackageId(add.getPackageId());
@@ -114,11 +110,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService, Te
         SysTenantPackage update = MapstructUtils.convert(bo, SysTenantPackage.class);
         // 保存菜单id
         List<Long> menuIds = Arrays.asList(bo.getMenuIds());
-        if (CollUtil.isNotEmpty(menuIds)) {
-            update.setMenuIds(StringUtils.join(menuIds, ", "));
-        } else {
-            update.setMenuIds("");
-        }
+        update.setMenuIds(CollUtil.isNotEmpty(menuIds) ? StringUtils.joinComma(menuIds) : "");
         return baseMapper.updateById(update) > 0;
     }