资产更新版本3.0豪华版优化字段名称查询

cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java

@@ -142,14 +142,15 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 //在取数据数据遍历里获取表名称查询方法
                 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
 
-                    this.dataDeptShow(tableIdAndBasicId,dataName);
+                    if (tableIdAndBasicId.getUserId().equals(userId) || tableIdAndBasicId.getDeptId().equals(deptId)){
+                        this.dataDeptShow(tableIdAndBasicId,dataName);
+                    }
+
 
                 });
                 idByDeptId.forEach(tableIdAndBasicId -> {
-                    if (tableIdAndBasicId.getDeptId()==tableIdAndBasicId.getDeptId()){
+                    this.dataDeptShow(tableIdAndBasicId,dataName);
 
-                            this.dataDeptShow(tableIdAndBasicId,dataName);
-                    }
                 });
 
             }
@@ -181,7 +182,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
         if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
         //在内部封装方法
         dataName.getTableNames().forEach(tableName1 -> {
-            this.tableNameRun(tableName1,dataName);
+            this.tableStructureShow(tableName1);
         });
     }
 
@@ -221,9 +222,6 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 //将添加好的实体类集合进行遍历操作
                 log.info("数据库表名称:{}",dataName.getTableNames());
                 if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
-                //在内部封装方法
-                dataName.getTableNames().forEach(tableName1 -> {this.tableNameRun(tableName1,dataName);});
-
             }
         });
         //返回所有数据
@@ -231,17 +229,6 @@ public class DataRunNameServiceImpl implements DataRunNameService {
 
     }
 
-
-    /**
-     * 查询字段信息
-     * @param tableName1 表明参数
-     * @param dataName  库名参数
-     */
-    public void tableNameRun(TableNames tableName1, DataName dataName) {
-
-
-    }
-
     /**
      * 查询值
      *
@@ -316,48 +303,50 @@ public class DataRunNameServiceImpl implements DataRunNameService {
      * @param preparedStatement
      * @throws SQLException
      */
-    private void getDataResult(DruidPooledConnection conn, List<DataValue> list, PreparedStatement preparedStatement) throws SQLException {
+    private void getDataResult(DruidPooledConnection conn, List<DataValue> list, PreparedStatement preparedStatement) {
-        ResultSet resultSet = preparedStatement.executeQuery();
+       try {
-        ResultSetMetaData metaData = resultSet.getMetaData();
+           ResultSet resultSet = preparedStatement.executeQuery();
-        int columnCount = metaData.getColumnCount();
+           ResultSetMetaData metaData = resultSet.getMetaData();
+           int columnCount = metaData.getColumnCount();
 
-        HashMap<Integer, DataValue> map = new HashMap<>();
+           HashMap<Integer, DataValue> map = new HashMap<>();
-        while (resultSet.next()){
+           while (resultSet.next()){
-            for (int i = 1; i <= columnCount; i++) {
+               for (int i = 1; i <= columnCount; i++) {
 
-                if (resultSet.isFirst()){
+                   if (resultSet.isFirst()){
-                    String columnTypeName = metaData.getColumnTypeName(i);
+                       String columnTypeName = metaData.getColumnTypeName(i);
 
-                    DatabaseMetaData metaData1 = conn.getMetaData();
+                       DatabaseMetaData metaData1 = conn.getMetaData();
-                    ResultSet columns = metaData1.getColumns(null, null, metaData.getTableName(i), metaData.getColumnName(i));
+                       ResultSet columns = metaData1.getColumns(null, null, metaData.getTableName(i), metaData.getColumnName(i));
-                    String remarks =null;
+                       String remarks =null;
-                    while (columns.next()){
+                       while (columns.next()){
-                        remarks = columns.getString("REMARKS");
+                           remarks = columns.getString("REMARKS");
-                        log.info("字段备注:{}", remarks);
+                           log.info("字段备注:{}", remarks);
-                    }
+                       }
+                       DataValue build = DataValue.builder()
+                               .key(metaData.getColumnName(i))
+                               .label(remarks)
+                               .value(resultSet.getObject(i, DataType.convertType(columnTypeName)))
+                               .type(DataType.findBySqlType(columnTypeName))
+                               .build();
+                       list.add(build);
+                       map.put(i, build);
+                   }else {
+                       DataValue build = DataValue.builder()
+                               .key(metaData.getColumnName(i))
+                               .label(map.get(i).getLabel())
+                               .value(resultSet.getObject(i, map.get(i).getType().getTargetType()))
+                               .type(map.get(i).getType())
+                               .build();
+                       list.add(build);
+                   }
 
-
+               }
-                    DataValue build = DataValue.builder()
+           }
-                            .key(metaData.getColumnName(i))
+           JdbcHelper.close(null,preparedStatement,null);
-                            .label(remarks)
+       } catch (Exception e) {
-                            .value(resultSet.getObject(i, DataType.convertType(columnTypeName)))
+           log.error(e.getMessage(),e);
-                            .type(DataType.findBySqlType(columnTypeName))
+       }
-                            .build();
-                    list.add(build);
-                    map.put(i, build);
-                }else {
-                    DataValue build = DataValue.builder()
-                            .key(metaData.getColumnName(i))
-                            .label(map.get(i).getLabel())
-                            .value(resultSet.getObject(i, map.get(i).getType().getTargetType()))
-                            .type(map.get(i).getType())
-                            .build();
-                    list.add(build);
-                }
-
-            }
-        }
-        JdbcHelper.close(null,preparedStatement,null);
     }
 
     /**
@@ -466,7 +455,9 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                     .map(TableFie::tableFieBuild).toList();
             log.info("字段类型名称集合：{}", tableFieList);
             DataName dataName = dataNameService.getById(tableNames.getDataId());
+
             List<DataValue> tableValue = this.findTableValue(String.valueOf(dataName.getId()), tableNames.getName());
+
             tableFieList.forEach(tableFy -> {
                 //查询字段映射信息
                 String str = this.tableFySelect(dataName.getName(), tableNames.getName(), tableFy.getField());