From a0d4a53459bce8b264a05570d9b1f7dc945ae2c3 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Wed, 21 Aug 2024 20:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/Main.java | 7 +++ .../src/main/java/com/muyu/Main.java | 7 +++ .../muyu/cloud/etl/service/EtlService.java | 19 ++++++++ .../muyu/cloud/etl/service/SourceService.java | 16 +++++++ .../cloud/etl/service/SourceTypeService.java | 11 +++++ .../etl/service/impl/EtlServiceImpl.java | 37 +++++++++++++++ .../etl/service/impl/SourceServiceImpl.java | 37 +++++++++++++++ .../service/impl/SourceTypeServiceImpl.java | 19 ++++++++ .../muyu/cloud/mart/MuYuMartApplication.java | 21 --------- .../src/main/resources/banner.txt | 16 ------- .../src/main/resources/bootstrap.yml | 27 ++++++----- .../src/main/resources/logback/dev.xml | 2 +- .../src/main/resources/logback/prod.xml | 2 +- .../src/main/resources/logback/test.xml | 2 +- .../src/main/resources/mapper/EtlMapper.xml | 20 ++++++++ .../main/resources/mapper/SourceMapper.xml | 47 +++++++++++++++++++ 16 files changed, 239 insertions(+), 51 deletions(-) create mode 100644 cloud-mart-client/src/main/java/com/muyu/Main.java create mode 100644 cloud-mart-remote/src/main/java/com/muyu/Main.java create mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java create mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java create mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java create mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java create mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java create mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java delete mode 100644 cloud-mart-server/src/main/java/com/muyu/cloud/mart/MuYuMartApplication.java create mode 100644 cloud-mart-server/src/main/resources/mapper/EtlMapper.xml create mode 100644 cloud-mart-server/src/main/resources/mapper/SourceMapper.xml diff --git a/cloud-mart-client/src/main/java/com/muyu/Main.java b/cloud-mart-client/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..95690d4 --- /dev/null +++ b/cloud-mart-client/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/cloud-mart-remote/src/main/java/com/muyu/Main.java b/cloud-mart-remote/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..95690d4 --- /dev/null +++ b/cloud-mart-remote/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java new file mode 100644 index 0000000..77a6eb5 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java @@ -0,0 +1,19 @@ +package com.muyu.cloud.etl.service; + +import com.muyu.domain.AssetImpower; + +import javax.xml.transform.Result; +import java.util.List; + +/** + * @Author：qdm + * @Package：com.muyu.service + * @Project：cloud-etl + * @name：EtlService + * @Date：2024/8/20 20:46 + */ +public interface EtlService { + List selectAssetImpowerList(AssetImpower assetImpower); + + Result deleteAssetImpowerByIds(Long[] ids); +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java new file mode 100644 index 0000000..ec17d40 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.etl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.Source; +import com.muyu.domain.req.SourceReq; + +import java.util.List; + +public interface SourceService extends IService { + List selectSourceList(SourceReq sourceReq); + + Source getInfo(Long id); + + int insertBasicConfigInfo(Source sourceReq); + +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java new file mode 100644 index 0000000..c0342ef --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java @@ -0,0 +1,11 @@ +package com.muyu.cloud.etl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.SourceType; +import java.util.List; + + +public interface SourceTypeService extends IService { + + List findSourceType(); +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java new file mode 100644 index 0000000..15bedd2 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java @@ -0,0 +1,37 @@ +package com.muyu.cloud.etl.service.impl; + +import com.muyu.domain.AssetImpower; +import com.muyu.cloud.etl.mapper.EtlMapper; +import com.muyu.cloud.etl.service.EtlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.xml.transform.Result; +import java.util.List; + +/** + * @Author：qdm + * @Package：com.muyu.service.serviceImpl + * @Project：cloud-etl + * @name：EtlService + * @Date：2024/8/20 20:46 + */ +@Service +public class EtlServiceImpl implements EtlService { + + @Autowired + private EtlMapper etlMapper; + + @Override + public List selectAssetImpowerList(AssetImpower assetImpower) { + List assetImpowers = etlMapper.list(assetImpower); + return assetImpowers; + } + + @Override + public Result deleteAssetImpowerByIds(Long[] ids) { + return etlMapper.deleteAssetImpowerByIds(ids); + } + + +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java new file mode 100644 index 0000000..9ac1666 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java @@ -0,0 +1,37 @@ +package com.muyu.cloud.etl.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.etl.service.SourceService; +import com.muyu.domain.Source; +import com.muyu.domain.req.SourceReq; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SourceServiceImpl extends ServiceImpl implements SourceService { + @Autowired + private SourceMapper sourceMapper; + + @Override + public List selectSourceList(SourceReq sourceReq) { + return sourceMapper.selectSourceList(sourceReq); + } + + @Override + public Source getInfo(Long id) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Source::getId, id); + return this.sourceMapper.selectOne(lambdaQueryWrapper); + } + + //新增 + @Override + public int insertBasicConfigInfo(Source sourceReq) { + int insert = sourceMapper.insert(sourceReq); + return insert; + } + +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java new file mode 100644 index 0000000..40a14b2 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.muyu.cloud.etl.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.etl.service.SourceTypeService; +import com.muyu.domain.SourceType; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SourceTypeServiceImpl extends ServiceImpl implements SourceTypeService { + + @Override + public List findSourceType() { + LambdaQueryWrapper sourceTypeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + return this.list(sourceTypeLambdaQueryWrapper); + } +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MuYuMartApplication.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MuYuMartApplication.java deleted file mode 100644 index 85f4fe3..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MuYuMartApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.muyu.cloud.mart; - -import lombok.extern.log4j.Log4j2; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author: wangxinyuan - * @Date: 2024/8/20 上午9:55 - */ -@Log4j2 -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class MuYuMartApplication { - public static void main(String[] args) { - SpringApplication.run(MuYuMartApplication.class, args); - } -} diff --git a/cloud-mart-server/src/main/resources/banner.txt b/cloud-mart-server/src/main/resources/banner.txt index c81936f..0dd5eee 100644 --- a/cloud-mart-server/src/main/resources/banner.txt +++ b/cloud-mart-server/src/main/resources/banner.txt @@ -1,18 +1,2 @@ Spring Boot Version: ${spring-boot.version} Spring Application Name: ${spring.application.name} - - - _,--._.-, - /\_r-,\_ ) - .-.) _;='_/ (.; - \ \' \/S ) - L.'-. _.'|-' - <_`-'\'_.'/ - `'-._( \ Shanaka Dias - ___ \\, ___ - \ .'-. \\ .-'_. / - '._' '.\\/.-'_.' - '--``\('--' - snd \\ - `\\, - \| diff --git a/cloud-mart-server/src/main/resources/bootstrap.yml b/cloud-mart-server/src/main/resources/bootstrap.yml index 9111194..5b4040f 100644 --- a/cloud-mart-server/src/main/resources/bootstrap.yml +++ b/cloud-mart-server/src/main/resources/bootstrap.yml @@ -1,23 +1,19 @@ # Tomcat server: - port: 9798 + port: 10005 # nacos线上地址 nacos: addr: 47.116.184.54:8848 user-name: nacos password: nacos - namespace: cloud-2112 - - + namespace: text # Spring spring: - main: - allow-bean-definition-overriding: true application: # 应用名称 - name: cloud-mart + name: cloud-datamart profiles: # 环境配置 active: dev @@ -49,8 +45,17 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 配置 MyBatis 的日志输出实现类，这里是输出到控制台 + mapper-locations: classpath:/mapper/*.xml # MyBatis Mapper 文件的位置，这里假设是 XML 形式的 Mapper + global-config: + db-config: + id-type: auto # 主键生成策略，这里设置为自动增长 + logic-delete-value: 1 # 逻辑删除标记值，例如设置为 1 表示已删除 + logic-not-delete-value: 0 # 逻辑未删除标记值，例如设置为 0 表示未删除 + banner: false # 关闭控制台打印的 MyBatis-Plus Banner diff --git a/cloud-mart-server/src/main/resources/logback/dev.xml b/cloud-mart-server/src/main/resources/logback/dev.xml index 22a9c95..100deef 100644 --- a/cloud-mart-server/src/main/resources/logback/dev.xml +++ b/cloud-mart-server/src/main/resources/logback/dev.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-mart-server/src/main/resources/logback/prod.xml b/cloud-mart-server/src/main/resources/logback/prod.xml index b78c75b..bcab75a 100644 --- a/cloud-mart-server/src/main/resources/logback/prod.xml +++ b/cloud-mart-server/src/main/resources/logback/prod.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-mart-server/src/main/resources/logback/test.xml b/cloud-mart-server/src/main/resources/logback/test.xml index be7c5f6..6ca2751 100644 --- a/cloud-mart-server/src/main/resources/logback/test.xml +++ b/cloud-mart-server/src/main/resources/logback/test.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-mart-server/src/main/resources/mapper/EtlMapper.xml b/cloud-mart-server/src/main/resources/mapper/EtlMapper.xml new file mode 100644 index 0000000..eb3a66e --- /dev/null +++ b/cloud-mart-server/src/main/resources/mapper/EtlMapper.xml @@ -0,0 +1,20 @@ + + + + + select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict + + + select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict + + + + where id = #{id} + + + diff --git a/cloud-mart-server/src/main/resources/mapper/SourceMapper.xml b/cloud-mart-server/src/main/resources/mapper/SourceMapper.xml new file mode 100644 index 0000000..04a3947 --- /dev/null +++ b/cloud-mart-server/src/main/resources/mapper/SourceMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + select id, data_resource_name,username,password, data_sources_system_name, host, port, database_type, database_name, init_link_num, max_link_num, max_wait_time, max_wait_times,connection_params, remark from source + + + + + + + + +