From 9ee77e92fc79241e7b0f0299ae20149472408414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Tue, 17 Sep 2024 17:49:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud-breakdown-client/pom.xml | 27 ++++++ .../cloud-breakdown-common/pom.xml | 36 ++++++++ .../com/muyu/breakdown/domain/BreakDown.java | 16 ++++ .../cloud-breakdown-remote/pom.xml | 27 ++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../cloud-breakdown-server/pom.xml | 92 +++++++++++++++++++ .../java/com/muyu/BreakDownApplication.java | 23 +++++ .../breakdown/config/MybatisPlusConfig.java | 37 ++++++++ .../controller/BreakDownController.java | 25 +++++ .../breakdown/mapper/BreakDownMapper.java | 18 ++++ .../breakdown/service/BreakDownService.java | 15 +++ .../service/impl/BreakDownServiceImpl.java | 19 ++++ .../src/main/resources/bootstrap.yml | 60 ++++++++++++ .../src/main/resources/logback/dev.xml | 74 +++++++++++++++ .../src/main/resources/logback/prod.xml | 81 ++++++++++++++++ .../src/main/resources/logback/test.xml | 81 ++++++++++++++++ cloud-modules/cloud-breakdown/pom.xml | 27 ++++++ cloud-modules/pom.xml | 1 + 18 files changed, 660 insertions(+) create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml create mode 100644 cloud-modules/cloud-breakdown/pom.xml diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml new file mode 100644 index 0000000..603eba0 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + cloud-breakdown + 3.6.3 + + + cloud-breakdown-client + + + 17 + 17 + UTF-8 + + + + + com.muyu + cloud-breakdown-common + 3.6.3 + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml new file mode 100644 index 0000000..95438df --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + com.muyu + cloud-breakdown + 3.6.3 + + + cloud-breakdown-common + + + 17 + 17 + UTF-8 + + + + com.muyu + cloud-common-core + + + com.baomidou + mybatis-plus-boot-starter + 3.5.7 + + + com.github.yulichang + mybatis-plus-join-boot-starter + 1.4.11 + + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java new file mode 100644 index 0000000..4233b5e --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java @@ -0,0 +1,16 @@ +package com.muyu.breakdown.domain; + +import lombok.Data; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:10 + * @ Version：1.0 + * @ Description：故障实体类 + * @author Lenovo + */ +@Data +public class BreakDown { + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml new file mode 100644 index 0000000..c3b50cc --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + cloud-breakdown + 3.6.3 + + + cloud-breakdown-remote + + + 17 + 17 + UTF-8 + + + + + com.muyu + cloud-breakdown-common + 3.6.3 + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml new file mode 100644 index 0000000..a208436 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + + com.muyu + cloud-breakdown + 3.6.3 + + + cloud-breakdown-server + + + 17 + 17 + UTF-8 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + + com.muyu + cloud-common-xxl + + + + com.muyu + cloud-common-rabbit + + + + com.muyu + cloud-breakdown-common + 3.6.3 + + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java new file mode 100644 index 0000000..3d4869c --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java @@ -0,0 +1,23 @@ +package com.muyu; + +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; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:00 + * @ Version：1.0 + * @ Description：故障启动类 + * @author Lenovo + */ +@EnableCustomConfig +@EnableMyFeignClients +@SpringBootApplication +public class BreakDownApplication { + public static void main(String[] args) { + SpringApplication.run(BreakDownApplication.class, args); + } +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java new file mode 100644 index 0000000..d5d88c8 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java @@ -0,0 +1,37 @@ +package com.muyu.breakdown.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:41 + * @ Version：1.0 + * @ Description：mybatisplus配置类 + * @author Lenovo + */ +@Configuration +public class MybatisPlusConfig { + /** + * 添加分页插件 + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 如果配置多个插件, 切记分页最后添加 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; + } + @Bean + public MybatisConfiguration mybatisConfiguration(){ + MybatisConfiguration configuration = new MybatisConfiguration(); + return configuration; + } + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java new file mode 100644 index 0000000..243fbaa --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java @@ -0,0 +1,25 @@ +package com.muyu.breakdown.controller; + +import com.muyu.breakdown.service.BreakDownService; +import com.muyu.common.core.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:13 + * @ Version：1.0 + * @ Description：故障管理实体类 + * @author Lenovo + */ +@RestController +@RequestMapping("/breakdown") +public class BreakDownController extends BaseController { + + @Autowired + private BreakDownService breakDownService; + + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java new file mode 100644 index 0000000..8f93626 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java @@ -0,0 +1,18 @@ +package com.muyu.breakdown.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import com.muyu.breakdown.domain.BreakDown; +import org.apache.ibatis.annotations.Mapper; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:14 + * @ Version：1.0 + * @ Description：故障管理持久层 + * @author Lenovo + */ +@Mapper +public interface BreakDownMapper extends MPJBaseMapper { + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java new file mode 100644 index 0000000..aa16104 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java @@ -0,0 +1,15 @@ +package com.muyu.breakdown.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.breakdown.domain.BreakDown; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:31 + * @ Version：1.0 + * @ Description：故障管理业务层 + * @author Lenovo + */ +public interface BreakDownService extends IService { +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java new file mode 100644 index 0000000..769d52f --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java @@ -0,0 +1,19 @@ +package com.muyu.breakdown.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.breakdown.domain.BreakDown; +import com.muyu.breakdown.mapper.BreakDownMapper; +import com.muyu.breakdown.service.BreakDownService; +import org.springframework.stereotype.Service; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:31 + * @ Version：1.0 + * @ Description：故障管理业务实现层 + * @author Lenovo + */ +@Service +public class BreakDownServiceImpl extends ServiceImpl implements BreakDownService { +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..30c3e9a --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml @@ -0,0 +1,60 @@ +# Tomcat +server: + port: 9701 + +# nacos线上地址 +nacos: + addr: 47.116.173.119:8848 + user-name: nacos + password: nacos + namespace: one +# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all +# Spring +spring: + amqp: + deserialization: + trust: + all: true + main: + allow-bean-definition-overriding: true + application: + # 应用名称 + name: cloud-breakdown + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - 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} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..d1b5629 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..76a0d8f --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml new file mode 100644 index 0000000..2cd69e4 --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-breakdown/pom.xml b/cloud-modules/cloud-breakdown/pom.xml new file mode 100644 index 0000000..03dc09d --- /dev/null +++ b/cloud-modules/cloud-breakdown/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + cloud-modules + 3.6.3 + + + cloud-breakdown + pom + + cloud-breakdown-common + cloud-breakdown-server + cloud-breakdown-remote + cloud-breakdown-client + + + + 17 + 17 + UTF-8 + + + diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index ba0d555..bb54ff8 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -12,6 +12,7 @@ cloud-modules-system cloud-modules-gen cloud-modules-file + cloud-breakdown cloud-modules From 6dfb5663a1808ecdda631c5c7ef735b7b63e8af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Tue, 17 Sep 2024 19:11:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E7=9A=84=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-core/pom.xml | 11 ++++++++++- .../src/main/resources/banner.txt | 2 ++ .../src/main/resources/logback/dev.xml | 2 +- .../src/main/resources/logback/prod.xml | 2 +- .../src/main/resources/logback/test.xml | 4 ++-- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 57cf128..6d1a5dd 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -164,6 +164,15 @@ cn.hutool hutool-all + + com.baomidou + mybatis-plus-boot-starter + 3.5.7 + + + com.github.yulichang + mybatis-plus-join-boot-starter + 1.4.11 + - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml index d1b5629..34cd186 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml index 76a0d8f..1193d09 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml index 2cd69e4..1193d09 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml @@ -1,7 +1,7 @@ - + @@ -43,7 +43,7 @@ 60 - + ERROR From 21c796a9d93a9a642c8babd0b70fbac2214b97f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Tue, 17 Sep 2024 19:58:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/breakdown/domain/BreakDown.java | 71 ++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java index 4233b5e..e8c7820 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java @@ -1,16 +1,83 @@ package com.muyu.breakdown.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; /** + * @author Lenovo * @ Tool：IntelliJ IDEA * @ Author：CHX * @ Date：2024-09-17-15:10 * @ Version：1.0 * @ Description：故障实体类 - * @author Lenovo */ +@EqualsAndHashCode(callSuper = true) @Data -public class BreakDown { +@TableName("sys_car_fault") +public class BreakDown extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + + @TableId(value = "id", type = IdType.AUTO) + @Excel(name = "主键") + private Long id; + /** + * 故障码 + */ + @Excel(name = "故障码") + private String faultCode; + /** + * 故障类型 + */ + @Excel(name = "故障类型") + private String faultType; + /** + * 车辆VIN + */ + @Excel(name = "车辆VIN") + private String carVin; + /** + * 故障标签 + */ + @Excel(name = "故障标签") + private String faultLabel; + /** + * 故障位 + */ + @Excel(name = "故障位") + private String faultBit; + /** + * 故障值 + */ + @Excel(name = "故障值") + private String faultValue; + /** + * 故障级别 + */ + @Excel(name = "故障级别") + private String faultWarn; + /** + * 报警状态（Y.是，N.否） + */ + @Excel(name = "报警状态") + private String faultStatus; + /** + * 故障描述信息 + */ + @Excel(name = "故障描述信息") + private String faultDesc; + /** + * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) + */ + @Excel(name = "启用状态") + private String state; }