From 63eed1d18e1407b2c0c0efc620c2a0d3fcd84298 Mon Sep 17 00:00:00 2001 From: rouchen <3133657697@qq.com> Date: Tue, 23 Apr 2024 21:03:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E8=B5=84=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/kvt/domain/Child.java | 37 ++++++ .../com/muyu/kvt/domain/ChildrenList.java | 6 + .../com/muyu/kvt/domain/DataStructure.java | 75 ++++++++++++ .../main/java/com/muyu/kvt/domain/Kvt.java | 7 +- .../main/java/com/muyu/kvt/domain/User.java | 19 +++ .../com/muyu/kvt/domain/req/KvtEditReq.java | 3 +- .../com/muyu/kvt/domain/req/KvtQueryReq.java | 2 - .../com/muyu/kvt/domain/req/KvtSaveReq.java | 3 +- muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml | 6 +- .../java/com/muyu/kvt/MuyuApplication.java | 30 ++++- .../muyu/kvt/controller/KvtController.java | 42 ++++++- .../java/com/muyu/kvt/mapper/KvtMapper.java | 24 +++- .../java/com/muyu/kvt/service/KvtService.java | 22 +++- .../muyu/kvt/service/impl/KvtServiceImpl.java | 109 +++++++++++++++--- .../main/resources/mapper/kvt/KvtMapper.xml | 90 +++++++++++++-- pom.xml | 6 +- 16 files changed, 432 insertions(+), 49 deletions(-) create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java new file mode 100644 index 0000000..f3eb25f --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java @@ -0,0 +1,37 @@ +package com.muyu.kvt.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 资产模型基本信息 Child + * + * @author LeYang + * on 2024/4/23 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class Child { + /** + * 主键 + */ + private Integer id; + + private String name; + + private String as; + + private Integer dataTotal; + + private String isPrimaryKey; + + + + + + +} 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 1609c19..cc003cb 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,8 +1,13 @@ 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; /** * ChildrenList 子列表 @@ -13,6 +18,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor +@SuperBuilder public class ChildrenList { private String name; private String as; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java new file mode 100644 index 0000000..19de2a1 --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java @@ -0,0 +1,75 @@ +package com.muyu.kvt.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 數據結構 DataStructure + * + * @author LeYang + * on 2024/4/22 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class DataStructure { + /** + * 主键 + */ + private Integer id; + + + private String tableName; + private String warName; + + /** + * 名称 + */ + private String name; + /** + * 注释 + */ + private String comment; + /** + * 是否主键 + */ + private String isPrimaryKey; + /** + * 类型 + */ + private String type; + /** + * 映射类型 + */ + private String mappingType; + /** + * 长度 + */ + private String length; + /** + * 小数位 + */ + private String decimalPlaces; + /** + * 是否为空 + */ + private String isNull; + /** + * 默认值 + */ + private String defaultValue; + /** + * 是否字典 + */ + private String isDict; + /** + * 映射字典 + */ + private String dictKey; + + + +} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java index c355aa7..08ec7d1 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java @@ -110,9 +110,7 @@ public class Kvt extends BaseEntity { @ApiModelProperty(name = "密码",value = "密码") private String password; - @Excel(name = "数据库类型") - @ApiModelProperty(name = "数据库类型",value = "数据库类型") - private Integer dateTypeId; + /** @@ -133,7 +131,6 @@ public class Kvt extends BaseEntity { .maxWaitSize(kvtQueryReq.getMaxWaitSize()) .username(kvtQueryReq.getUsername()) .password(kvtQueryReq.getPassword()) - .dateTypeId(kvtQueryReq.getDateTypeId()) .build(); } @@ -155,7 +152,6 @@ public class Kvt extends BaseEntity { .maxWaitSize(kvtSaveReq.getMaxWaitSize()) .username(kvtSaveReq.getUsername()) .password(kvtSaveReq.getPassword()) - .dateTypeId(kvtSaveReq.getDateTypeId()) .build(); } @@ -178,7 +174,6 @@ public class Kvt extends BaseEntity { .maxWaitSize(kvtEditReq.getMaxWaitSize()) .username(kvtEditReq.getUsername()) .password(kvtEditReq.getPassword()) - .dateTypeId(kvtEditReq.getDateTypeId()) .build(); } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java new file mode 100644 index 0000000..17778c4 --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java @@ -0,0 +1,19 @@ +package com.muyu.kvt.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * User + * + * @author LeYang + * on 2024/4/23 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class User { + private Integer id; + private String name; +} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java index 25f581a..a7be023 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java @@ -81,6 +81,5 @@ public class KvtEditReq extends BaseEntity { @ApiModelProperty(name = "密码",value = "密码") public String password; - @ApiModelProperty(name = "数据库类型",value = "数据库类型") - private Integer dateTypeId; + } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java index ab141e8..a5c3a45 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java @@ -83,6 +83,4 @@ public class KvtQueryReq extends BaseEntity { public String password; - @ApiModelProperty(name = "数据库类型",value = "数据库类型") - private Integer dateTypeId; } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java index bb90b97..2b8e5df 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java @@ -98,6 +98,5 @@ public class KvtSaveReq extends BaseEntity { @ApiModelProperty(name = "密码",value = "密码") public String password; - @ApiModelProperty(name = "数据库类型",value = "数据库类型") - private Integer dateTypeId; + } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml b/muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml index 9512600..c50da50 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml @@ -17,7 +17,11 @@ UTF-8 - + + org.postgresql + postgresql + 42.2.18 + com.alibaba.cloud diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java index 6b9adf8..423341d 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java @@ -6,6 +6,8 @@ import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import java.sql.*; + /** * MuyuApplication * @@ -18,6 +20,32 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class MuyuApplication { public static void main(String[] args) { - SpringApplication.run(MuyuApplication.class); + SpringApplication.run(MuyuApplication.class); + +// Connection connection=null; +// Statement statement=null; +// try { +// Class.forName("org.postgresql.Driver"); +// +// String url = "jdbc:postgresql://localhost:5432/postgres"; +// String user = "postgres"; +// String password = "root"; +// connection = DriverManager.getConnection(url,user,password); +// statement= connection.createStatement(); +// String sql =" select * from user"; +// ResultSet resultSet = statement.executeQuery(sql); +// while (resultSet.next()){ +// System.out.println("wfegrth"+resultSet); +// } +// resultSet.close(); +// statement.close(); +// connection.close(); +// +// } catch (ClassNotFoundException e) { +// throw new RuntimeException(e); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } + } } 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 8f6d59d..18b6dd4 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 @@ -11,10 +11,7 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.kvt.domain.AssetStructureList; -import com.muyu.kvt.domain.DataType; -import com.muyu.kvt.domain.Kvt; -import com.muyu.kvt.domain.Tables; +import com.muyu.kvt.domain.*; import com.muyu.kvt.domain.req.AssetStructureResponse; import com.muyu.kvt.domain.req.KvtEditReq; import com.muyu.kvt.domain.req.KvtQueryReq; @@ -140,10 +137,34 @@ public class KvtController extends BaseController { @PostMapping("/synchronizationAdd") public Result synchronizationAdd (@RequestBody Kvt kvt) throws SQLException, ClassNotFoundException { kvtService.synchronizationAdd(kvt); - return Result.success(); + return Result.success("同步成功"); } + //查询数据 + @PostMapping("/selectDataSource") + public Result> assetStructureList(){ + List assetStructureLists= kvtService.assetStructureList(); + return Result.success(assetStructureLists); + } + + //部門 + @PostMapping("/selectDepartment") + public Result> selectDepartment(@RequestParam String databaseName){ + List list= kvtService.selectDepartment(databaseName); + return Result.success(list); + } + + @PostMapping("/selectDataStructure") + public Result> selectDataStructure(@RequestParam String databaseName,String name){ + return Result.success(); + } + @PostMapping("/selectDataStur") + public Result> selectDataStur(@RequestParam String tableName){ + List structureList= kvtService.selectDataStur(tableName); + return Result.success(structureList); + } + // @PostMapping("/selectName") // public Result> listResult(@RequestParam String name) throws SQLException, ClassNotFoundException { // Kvt kvt= kvtService.listResult(name); @@ -158,4 +179,15 @@ public class KvtController extends BaseController { // return Result.success(assetStructureList) ; // } + @PostMapping("/selectChild") + public Result selectChild(@RequestParam String tableName){ + Child child= kvtService.selectChild(tableName); + return Result.success(child); + } + + @PostMapping("/selectChildAll") + public Result> selectChildAll(){ + List childList=kvtService.selectChildAll(); + return Result.success(childList); + } } 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 0f0b8af..faf3077 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 @@ -1,9 +1,8 @@ package com.muyu.kvt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.kvt.domain.AssetStructureList; -import com.muyu.kvt.domain.DataType; -import com.muyu.kvt.domain.Kvt; +import com.muyu.kvt.domain.*; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,4 +24,23 @@ public interface KvtMapper extends BaseMapper { void synchronizationAdd(Kvt kvt); + + + List selectDepartment(String databaseName); + + Kvt selectType(String databaseName); + + List selectDataStructure(@Param("databaseName") String databaseName, @Param("name") String name); + + void add(DataStructure dataStructure); + + + List selectDataStur(@Param("tableName") String tableName); + + void ChildAdd(@Param("assetStructureLists") List assetStructureLists); + + Child selectChild(String tableName); + + List selectChildAll(); + } 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 2e08cd9..a645a2f 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 @@ -1,10 +1,9 @@ package com.muyu.kvt.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.kvt.domain.AssetStructureList; -import com.muyu.kvt.domain .DataType; -import com.muyu.kvt.domain.Kvt; +import com.muyu.kvt.domain.*; import com.muyu.kvt.domain.req.AssetStructureResponse; +import org.apache.ibatis.annotations.Param; import java.sql.SQLException; import java.util.List; @@ -42,6 +41,23 @@ public interface KvtService extends IService { void synchronizationAdd(Kvt kvt) throws SQLException, ClassNotFoundException; + + List assetStructureList(); + + List selectDepartment(String databaseName); + + List selectDataStructure(@Param("databaseName") String databaseName, @Param("name") String name); + + void add(DataStructure dataStructure); + + List selectDataStur(String tableName); + + Child selectChild(String tableName); + + List selectChildAll(); + + + // List kvtList(Kvt kvt) throws ClassNotFoundException, SQLException; } 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 4e495e8..119b0ec 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 @@ -7,10 +7,7 @@ import java.util.List; import com.muyu.common.core.utils.ObjUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.kvt.domain.AssetStructureList; -import com.muyu.kvt.domain.ChildrenList; -import com.muyu.kvt.domain.DataType; -import com.muyu.kvt.domain.Kvt; +import com.muyu.kvt.domain.*; import com.muyu.kvt.domain.req.AssetStructureResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -92,18 +89,36 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe @Override public boolean connectionTest(Kvt kvt) throws ClassNotFoundException, SQLException { - String user = kvt.getUsername(); - String password = kvt.getPassword(); - String jdbcDriver = "com.mysql.cj.jdbc.Driver"; - String jdbcUrl = "jdbc:mysql://"+kvt.getHost()+":"+kvt.getPort()+"/"+kvt.getDatabaseName()+"?"+kvt.getConnectionParam(); - Class.forName(jdbcDriver); - Connection connection = DriverManager.getConnection(jdbcUrl, user, password); - if (connection==null){ - return false; - } - return true; - } + if (kvt.getType() ==1){ + return Mysql(kvt); + } + return PostgreSQL(kvt); + } + public boolean Mysql(Kvt kvt) throws SQLException, ClassNotFoundException { + String user = kvt.getUsername(); + String password = kvt.getPassword(); + String jdbcDriver = "com.mysql.cj.jdbc.Driver"; + String jdbcUrl = "jdbc:mysql://"+kvt.getHost()+":"+kvt.getPort()+"/"+kvt.getDatabaseName()+"?"+kvt.getConnectionParam(); + Class.forName(jdbcDriver); + Connection connection = DriverManager.getConnection(jdbcUrl, user, password); + if (connection==null){ + return false; + } + return true; + } + public boolean PostgreSQL(Kvt kvt) throws SQLException, ClassNotFoundException { + String user = kvt.getUsername(); + String password = kvt.getPassword(); + String jdbcDriver="org.postgresql.Driver"; + String jdbcUrl = "jdbc:postgresql://"+kvt.getHost()+":"+kvt.getPort()+"/"+kvt.getDatabaseName(); + Class.forName(jdbcDriver); + Connection connection = DriverManager.getConnection(jdbcUrl, user, password); + if (connection==null){ + return false; + } + return true; + } @Override public List dataTypeList() { return baseMapper.dataTypeList(); @@ -203,7 +218,7 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe childrenList.setAs(tableName); - childrenList.setType(kvt.getType()); +// childrenList.setType(kvt.getType()); childrenLists.add(childrenList); } } @@ -222,6 +237,18 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe boolean b = this.connectionTest(kvt); if (b){ baseMapper.synchronizationAdd(kvt); + List assetStructureLists= baseMapper.selectDepartment(kvt.getDatabaseName()); + baseMapper.ChildAdd(assetStructureLists); + for (ChildrenList assetStructureList : assetStructureLists) { + ListdataStructure= baseMapper.selectDataStructure(kvt.getDatabaseName(),assetStructureList.getName()); + for (DataStructure structure : dataStructure) { + structure.setTableName(assetStructureList.getName()); + structure.setWarName(kvt.getDatabaseName()); + baseMapper.add(structure); + + + } + } }else { throw new RuntimeException("同步失败"); @@ -229,6 +256,56 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe } + @Override + public List assetStructureList() { + + return baseMapper.assetStructureList(); + } + + @Override + public List selectDepartment(String databaseName) { + List list = baseMapper.selectDepartment(databaseName); + Kvt kvt = baseMapper.selectType(databaseName); + List childrenLists = new ArrayList<>(); + for (ChildrenList childrenList : list) { + ChildrenList build = ChildrenList.builder() + .name(childrenList.getName()) + .dataTotal(childrenList.getDataTotal()) + .as(childrenList.getAs()) + .type(Long.valueOf(2)) + .build(); + childrenLists.add(build); + } + return childrenLists; + + } + + @Override + public List selectDataStructure(String databaseName, String name) { + return baseMapper.selectDataStructure(databaseName,name); + } + + @Override + public void add(DataStructure dataStructure) { + baseMapper.add(dataStructure); + } + + @Override + public List selectDataStur(String tableName) { + return baseMapper.selectDataStur(tableName); + } + + @Override + public Child selectChild(String tableName) { + return baseMapper.selectChild(tableName); + } + + @Override + public List selectChildAll() { + return baseMapper.selectChildAll(); + } + + // @Override // public List kvtList(Kvt kvt) { // String user = kvt.getUsername(); 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 013ce46..3ec780d 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 @@ -25,11 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select id, name, system_name, type, host, port, database_name, connection_param, init_num, max_num, max_wait_time, max_wait_size, remark, create_by, create_time, update_by, update_time,date_type_id + select id, name, system_name, type, host, port, database_name, connection_param, init_num, max_num, max_wait_time, max_wait_size, remark, create_by, create_time, update_by, update_time from kvt @@ -40,15 +39,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from kvt where name =#{name} + + + + + + - INSERT INTO `ry-cloud`.`synchronization` - ( `name`, `system_name`,`type`, `host`, `port`, `database_name`, - `connection_param`) - VALUES ( #{name}, #{systemName},#{type}, #{host}, #{port}, #{databaseName}, #{connectionParam}); + INSERT INTO `data_basete`.`synchronization` + ( `name`, `system_name`, `type`, `host`, `port`, `database_name`, + `connection_param`, `init_num`, `max_num`, `max_wait_time`, + `max_wait_size`, `remark`, `create_by`, `create_time`, `update_by`, + `update_time`, `username`, `password`) + VALUES ( #{name}, #{systemName}, #{type}, #{host},#{port},#{databaseName}, + #{connectionParam}, + #{initNum}, #{maxNum}, #{maxWaitTime}, #{maxWaitSize}, #{remark}, #{createBy}, + #{createTime}, #{updateBy}, #{updateTime}, #{username}, #{password}); + + + + + INSERT INTO `data_basete`.`data_structure` + ( `name`, `comment`,`war_name`,`table_name`, `isPrimaryKey`, `type`, `mappingType`, + `length`, `decimalPlaces`, `isNull`, `defaultValue`, `isDict`, + `dictKey`) + VALUES ( #{name}, #{comment}, #{warName} ,#{tableName},#{isPrimaryKey}, #{type}, #{mappingType}, + #{length}, #{decimalPlaces}, #{isNull}, #{defaultValue}, #{isDict}, + #{dictKey}); + + + + + INSERT INTO `data_basete`.`child` ( `name`, `as`, `data_total`, `is_primary_key`) + VALUES + + (#{assetStructureLists.name}, #{assetStructureLists.as}, #{assetStructureLists.dataTotal} + , #{assetStructureLists.name}) + + diff --git a/pom.xml b/pom.xml index fc97f1d..30bbf57 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,11 @@ - + + org.postgresql + postgresql + 42.2.18 + org.springframework.cloud