diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java index 2e8e47d..f573c28 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * 整体数据结构 overallDataStructure + * 整体数据结构 overallStructure * * @author LeYang * on 2024/4/28 diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java index 17d18cc..26cca92 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java @@ -24,6 +24,18 @@ public class DataDisplay { * 库名 */ private String warName; + /** + * kvtName + */ + private String kvtName; + /** + * 字段名 + */ + private String fieldName; + /** + * 表名 + */ + private String tableName; /** * 类型 */ diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java index d87f21e..a12e185 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java @@ -1,11 +1,7 @@ package com.muyu.kvt.domain; -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.web.domain.BaseEntity; -import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -20,6 +16,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @SuperBuilder public class ChildrenList { + private Integer id; private String name; private String as; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java index 2305e74..01e9bd6 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java @@ -151,11 +151,10 @@ public class KvtController extends BaseController { * @param databaseName 数据库名称 * @return */ - @PostMapping("/selectDataAuthorization") - public Result selectDataAuthorization (@RequestParam String databaseName){ - kvtService.selectDataAuthorization(databaseName); - return Result.success(); + public Result> selectDataAuthorization (@RequestParam String databaseName){ + List dataAuthorizations = kvtService.selectDataDisplayList(databaseName); + return Result.success(dataAuthorizations); } @@ -310,4 +309,21 @@ public class KvtController extends BaseController { kvtService.AddDepartment(permissionsUser); return Result.success("添加成功"); } + + /** + * 根据表名查询规则引擎版本中字段的值 + * @param tableName + * @return + */ + @PostMapping("/selectDataStructureTableName") + public Result> selectDataStructureTableName (@RequestParam String tableName){ + List list= kvtService.selectDataStructureTableName(tableName); + return Result.success(list); + } + + @PostMapping("/selectDataDisplayVal") + public Result> selectDataDisplayVal(@RequestParam String tableName){ + List list= kvtService.selectDataDisplayVal(tableName); + return Result.success(list); + } } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java index 95f489b..67c0d15 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java @@ -109,4 +109,10 @@ public interface KvtMapper extends BaseMapper { List selectDataStructureAll(); + + List selectDataDisplayList(String databaseName); + + List selectDataStructureTableName(String tableName); + + List selectDataDisplayVal(String tableName); } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java index d8d36cb..9ef05f3 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java @@ -49,7 +49,6 @@ public interface KvtService extends IService { List selectDictionaryy(Integer id); - List selectDataAuthorization(String databaseName); Result synchronizationAdd(Kvt kvt) throws SQLException, ClassNotFoundException; @@ -82,4 +81,10 @@ public interface KvtService extends IService { List selectTableName(String tableName); void AddDepartment(PermissionsUser permissionsUser); + + List selectDataDisplayList(String databaseName); + + List selectDataStructureTableName(String tableName); + + List selectDataDisplayVal(String tableName); } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java index fe0f428..34713d6 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java @@ -319,12 +319,6 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe } - @Override - public List selectDataAuthorization(String databaseName) { - - List list = baseMapper.selectDepartment(databaseName); - return null; - } @Autowired private RemoteUserService remoteUserSer; @@ -374,13 +368,14 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe this.selectDatabaseName(connection, kvt); - Result sysUserResult = remoteUserSer.selectUserId(SecurityUtils.getUserId()); - SysUser data = sysUserResult.getData(); - DeptUserKvt build = DeptUserKvt.builder() - .userId(SecurityUtils.getUserId()) - .kvtId(kvt.getId()) - .deptId(data.getDeptId()).build(); - baseMapper.DeptUserKvtAdd(build); +// Result sysUserResult = remoteUserSer.selectUserId(SecurityUtils.getUserId()); +// SysUser data = sysUserResult.getData(); +// DeptUserKvt build = DeptUserKvt.builder() +// .userId(SecurityUtils.getUserId()) +// .kvtId(kvt.getId()) +// .deptId(data.getDeptId()).build(); +// baseMapper.DeptUserKvtAdd(build); + resultSet.close(); //结束时间 @@ -416,19 +411,19 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe int columnCount = metaDataTest.getColumnCount(); - List dataDisplays = new ArrayList<>(); while (resultSet2.next()) { for (int i = 1; i <= columnCount; i++) { - DataDisplay dataDisplay = new DataDisplay(); - String columnName = metaDataTest.getColumnName(i); - //资产展示类型 - String typeName = metaDataTest.getColumnTypeName(i); - dataDisplay.setValue(resultSet2.getObject(i)); - dataDisplay.setType(typeName); - dataDisplay.setWarName(kvt.getDatabaseName() + "-" + tableName + "-" + columnName); - dataDisplays.add(dataDisplay); + DataDisplay build = DataDisplay.builder() + .warName(kvt.getDatabaseName() + "-" + tableName + "-" + metaDataTest.getColumnName(i)) + .type(metaDataTest.getColumnTypeName(i)) + .kvtName(kvt.getDatabaseName()) + .value(resultSet2.getObject(i)) + .tableName(tableName) + .fieldName(metaDataTest.getColumnName(i)) + .build(); + dataDisplays.add(build); } } @@ -646,6 +641,16 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe .isPrimaryKey(null) .build(); baseMapper.childAdd(build1); + DataAuthorization build = DataAuthorization.builder() + .name(name) + .systemName(kvt.getSystemName()) + .databaseName(kvt.getDatabaseName()) + .tableName(name) + .as(as) + .dataTotal(Integer.valueOf(dataTotal)) + .build(); + baseMapper.DataAuthorizationAdd(build); + } } catch (SQLException e) { @@ -829,6 +834,22 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe }); } + @Override + public List selectDataDisplayList(String databaseName) { + + return baseMapper.selectDataDisplayList(databaseName); + } + + @Override + public List selectDataStructureTableName(String tableName) { + return baseMapper.selectDataStructureTableName(tableName); + } + + @Override + public List selectDataDisplayVal(String tableName) { + return baseMapper.selectDataDisplayVal(tableName); + } + /** * 查询 根据库名跟表名查询字段信息 * diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml index 37b7154..c67508c 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml @@ -83,16 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from synchronization + + + + + INSERT INTO `data_basete`.`synchronization` ( `name`, `system_name`, `type`, `host`, `port`, `database_name`, @@ -302,10 +310,10 @@ SELECT INSERT INTO `data_basete`.`data_display` - (`war_name`, `type`, `value`) + (`war_name`, `type`, `value`,`field_name`,`table_name`,`kvt_name`) VALUES - (#{dataDisplays.warName}, #{dataDisplays.type}, #{dataDisplays.value}) + (#{dataDisplays.warName}, #{dataDisplays.type}, #{dataDisplays.value},#{dataDisplays.fieldName},#{dataDisplays.tableName},#{dataDisplays.kvtName})