Merge pull request #1484 from congyuluo/identifier-refactorings

Refactored Identifiers

Author: Chat2DB-Pro

chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DashboardServiceImpl.java

@@ -66,8 +66,8 @@ public DataResult<Long> createWithPermission(DashboardCreateParam param) {
 
     @Override
     public ActionResult updateWithPermission(DashboardUpdateParam param) {
-        Dashboard data = queryExistent(param.getId()).getData();
-        PermissionUtils.checkOperationPermission(data.getUserId());
+        Dashboard dashboardData = queryExistent(param.getId()).getData();
+        PermissionUtils.checkOperationPermission(dashboardData.getUserId());
 
         param.setGmtModified(LocalDateTime.now());
         DashboardDO dashboardDO = dashboardConverter.updateParam2do(param);
@@ -106,14 +106,14 @@ public DataResult<Dashboard> queryExistent(DashboardQueryParam param) {
         if (CollectionUtils.isEmpty(page.getRecords())) {
             throw new DataNotFoundException();
         }
-        Dashboard data = dashboardConverter.do2model(page.getRecords().get(0));
+        Dashboard dashboardData = dashboardConverter.do2model(page.getRecords().get(0));
         LambdaQueryWrapper<DashboardChartRelationDO> dashboardChartRelationQueryWrapper = new LambdaQueryWrapper<>();
         dashboardChartRelationQueryWrapper.eq(DashboardChartRelationDO::getDashboardId, param.getId());
         List<DashboardChartRelationDO> relationDO = getMapper1().selectList(
             dashboardChartRelationQueryWrapper);
         List<Long> chartIds = relationDO.stream().map(DashboardChartRelationDO::getChartId).toList();
-        data.setChartIds(chartIds);
-        return DataResult.of(data);
+        dashboardData.setChartIds(chartIds);
+        return DataResult.of(dashboardData);
     }
 
     @Override

chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DatabaseServiceImpl.java

@@ -87,16 +87,16 @@ private void sortSchema(List<Schema> schemas, Connection connection) {
             log.error("get url error", e);
         }
         // If the database name contains the name of the current database, the current database is placed in the first place
-        int num = -1;
+        int targetIndex = -1;
         for (int i = 0; i < schemas.size(); i++) {
             String schema = schemas.get(i).getName();
             if (StringUtils.isNotBlank(ulr) && schema!=null && ulr.contains(schema)) {
-                num = i;
+                targetIndex = i;
                 break;
             }
         }
-        if (num != -1 && num != 0) {
-            Collections.swap(schemas, num, 0);
+        if (targetIndex != -1 && targetIndex != 0) {
+            Collections.swap(schemas, targetIndex, 0);
         }
     }
 

chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java

@@ -75,12 +75,12 @@ public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServl
                         if (user == null) {
                             return null;
                         }
-                        boolean admin = RoleCodeEnum.ADMIN.getCode().equals(user.getRoleCode());
+                        boolean iaAdmin = RoleCodeEnum.ADMIN.getCode().equals(user.getRoleCode());
 
                         return LoginUser.builder()
                             .id(user.getId())
                             .nickName(user.getNickName())
-                            .admin(admin)
+                            .admin(iaAdmin)
                             .roleCode(user.getRoleCode())
                             .build();
                     });

chat2db-server/chat2db-server-web-start/src/main/java/ai/chat2db/server/web/start/config/config/Chat2dbWebMvcConfigurer.java

@@ -190,10 +190,10 @@ private String buildHeaderString(HttpServletRequest request) {
         StringBuilder stringBuilder = new StringBuilder();
         Enumeration<String> headerNames = request.getHeaderNames();
         while (headerNames.hasMoreElements()) {
-            String headName = headerNames.nextElement();
-            stringBuilder.append(headName);
+            String headerName = headerNames.nextElement();
+            stringBuilder.append(headerName);
             stringBuilder.append(SymbolConstant.COLON);
-            stringBuilder.append(request.getHeader(headName));
+            stringBuilder.append(request.getHeader(headerName));
             stringBuilder.append(SymbolConstant.COMMA);
         }
         return stringBuilder.toString();