From e2fc097b14bd563f3ad8a19d3ef10cc305b8eccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Fri, 4 Oct 2024 20:59:21 +0800 Subject: [PATCH 01/10] =?UTF-8?q?test():=E4=BC=81=E4=B8=9A=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E6=97=B6=E5=88=9B=E5=BA=93=E5=88=9B=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/many/datasource/JDBCDemo.java | 44 +++++++++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 3 -- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java delete mode 100644 cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java new file mode 100644 index 0000000..b297441 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java @@ -0,0 +1,44 @@ +package com.muyu.cloud.common.many.datasource; + +import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; +import lombok.extern.log4j.Log4j2; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; + +/** + * 测试添加数据源 + * @author 袁子龙 + * @package com.muyu.cloud.common.many.datasource + * @name JDBCDemo + * @date 2024/9/30 18:14 + */ +@Log4j2 +public class JDBCDemo { + public static void main(String[] args) { + String databaseName = "my_database"; + + String connectUrl = DatasourceContent.getDatasourceUrl("mysql"); + + String createDatabaseUrl = "jdbc:mysql://" + DatasourceContent.IP + ":" + DatasourceContent.PORT + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + databaseName + ";"; + + try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD); + Statement stmt = adminConn.createStatement()) { + + boolean success = stmt.execute(createDatabaseSql); + if (success) { + log.info("数据库 {} 创建成功", databaseName); + + } else { + log.warn("数据库 {} 创建失败，可能已存在或权限不足", databaseName); + } + + } catch (SQLException e) { + e.printStackTrace(); + log.error("连接数据库时发生错误或创建数据库失败", e); + } + } +} diff --git a/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 70148cf..0000000 --- a/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -com.muyu.cloud.common.saas.interceptor.WebMvcSaaSConfig -com.muyu.cloud.common.many.datasource.ManyDataSource -com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory From c5f0d52aa61079a4b930fb3c8205f7c0c06dcc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 09:11:41 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:()=E4=BF=AE=E5=A4=8D=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=BC=95=E5=85=A5=E4=BD=86=E6=9C=AA=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/template/config/MqttConfigure.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java index b72a7fa..7c77cad 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java @@ -5,6 +5,8 @@ import com.muyu.common.domain.MessageTemplateType; import com.muyu.common.domain.SysCar; import com.muyu.common.kafka.config.KafkaProducerConfig; import com.muyu.common.redis.service.RedisService; +import com.muyu.server.service.MessageTemplateTypeService; +import com.muyu.server.service.SysCarService; import lombok.extern.log4j.Log4j2; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; From a63bde6c84d18ce991b510ed7dd1039de16e3a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 10:09:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix:()kafka=E8=AF=BB=E5=8F=96=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-kafka/pom.xml | 13 ++-- .../kafka/config/KafkaConsumerConfig.java | 10 +-- .../muyu/template/config/MqttConfigure.java | 4 -- .../server/controller/SysCarController.java | 18 ++--- .../src/main/resources/bootstrap.yml | 70 +++++++++++++++++++ 5 files changed, 89 insertions(+), 26 deletions(-) diff --git a/cloud-common/cloud-common-kafka/pom.xml b/cloud-common/cloud-common-kafka/pom.xml index 7f5126e..61a34c1 100644 --- a/cloud-common/cloud-common-kafka/pom.xml +++ b/cloud-common/cloud-common-kafka/pom.xml @@ -19,21 +19,22 @@ UTF-8 + + + + + + org.apache.kafka kafka-clients - 3.0.0 com.muyu cloud-common-core - - org.apache.kafka - kafka-clients - 2.8.0 - + diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java index 3eba063..212d27c 100644 --- a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java @@ -13,11 +13,11 @@ import java.util.HashMap; import java.util.Map; /** -* kafka消费者配置类 -* @program: cloud-server -* @author: cuiyongxing -* @create: 2024-09-28 14:28 -**/ + * kafka消费者配置类 + * @program: cloud-server + * @author: cuiyongxing + * @create: 2024-09-28 14:28 + **/ @Configuration public class KafkaConsumerConfig { diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java index 7c77cad..a3a6474 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java @@ -3,7 +3,6 @@ import cn.hutool.json.JSONObject; import com.alibaba.fastjson2.JSON; import com.muyu.common.domain.MessageTemplateType; import com.muyu.common.domain.SysCar; -import com.muyu.common.kafka.config.KafkaProducerConfig; import com.muyu.common.redis.service.RedisService; import com.muyu.server.service.MessageTemplateTypeService; import com.muyu.server.service.SysCarService; @@ -14,11 +13,8 @@ import org.eclipse.paho.client.mqttv3.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.PostConstruct; -import javax.annotation.Resource; import java.util.List; /** * diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java index 9fa4ddf..7246208 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java @@ -1,19 +1,17 @@ package com.muyu.server.controller; -import com.alibaba.fastjson2.JSONObject; +import com.muyu.cache.SysCarCacheService; import com.muyu.common.core.domain.Result; import com.muyu.common.domain.SysCar; import com.muyu.common.domain.req.SysCarReq; import com.muyu.common.domain.resp.SysCarFaultLogVo; -import com.muyu.common.kafka.config.KafkaProducerConfig; -import com.muyu.common.redis.service.RedisService; +import com.muyu.common.domain.resp.SysCarVo; + import com.muyu.server.service.SysCarService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,12 +31,10 @@ public class SysCarController { @Autowired private SysCarService sysCarService; - @Autowired - private RabbitTemplate rabbitTemplate; - @Autowired - private KafkaProducer kafkaProducer; + private SysCarCacheService sysCarCacheService; + /** @@ -104,10 +100,10 @@ public class SysCarController { @PostMapping("/findCarByVin") @Operation(summary = "根据VIN码查询车信息",description = "根据VIN码查询车信息") public Result findCarByVin(@RequestParam("carVin") String carVin){ - + List carList = sysCarCacheService.get("carList"); + log.info("从redis取出的数据为:"+carList); return Result.success(sysCarService.findCarByVin(carVin)); } - } diff --git a/cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml b/cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml index faf0576..25cea25 100644 --- a/cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml @@ -11,6 +11,76 @@ nacos: # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: + kafka: + producer: + # Kafka服务器 + bootstrap-servers: 150.158.33.234:9092 + # 开启事务，必须在开启了事务的方法中发送，否则报错 + transaction-id-prefix: kafkaTx- + # 发生错误后，消息重发的次数，开启事务必须设置大于0。 + retries: 3 + # acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。 + # acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。 + # acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。 + acks: all + # 开启事务时，必须设置为all + # 当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。 + batch-size: 16384 + # 生产者内存缓冲区的大小。 + buffer-memory: 1024000 + # 键的序列化方式 + key-serializer: org.apache.kafka.common.serialization.StringSerializer + # 值的序列化方式（建议使用Json，这种序列化方式可以无需额外配置传输实体类） + value-serializer: org.apache.kafka.common.serialization.StringSerializer + consumer: + # Kafka服务器 + group-id: my-kafka + # 自动提交的时间间隔 在spring boot 2.X 版本中这里采用的是值的类型为Duration 需要符合特定的格式，如1S,1M,2H,5D + #auto-commit-interval: 2s + # 该属性指定了消费者在读取一个没有偏移量的分区或者偏移量无效的情况下该作何处理： + # earliest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费分区的记录 + # latest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，消费新产生的该分区下的数据（在消费者启动之后生成的记录） + # none：当各分区都存在已提交的offset时，从提交的offset开始消费；只要有一个分区不存在已提交的offset，则抛出异常 + auto-offset-reset: latest + # 是否自动提交偏移量，默认值是true，为了避免出现重复数据和数据丢失，可以把它设置为false，然后手动提交偏移量 + enable-auto-commit: true + # 键的反序列化方式 + #key-deserializer: org.apache.kafka.common.serialization.StringDeserializer + key-deserializer: org.apache.kafka.common.serialization.StringSerializer + # 值的反序列化方式（建议使用Json，这种序列化方式可以无需额外配置传输实体类） + value-deserializer: org.apache.kafka.common.serialization.StringSerializer + # 这个参数定义了poll方法最多可以拉取多少条消息，默认值为500。如果在拉取消息的时候新消息不足500条，那有多少返回多少；如果超过500条，每次只返回500。 + # 这个默认值在有些场景下太大，有些场景很难保证能够在5min内处理完500条消息， + # 如果消费者无法在5分钟内处理完500条消息的话就会触发reBalance, + # 然后这批消息会被分配到另一个消费者中，还是会处理不完，这样这批消息就永远也处理不完。 + # 要避免出现上述问题，提前评估好处理一条消息最长需要多少时间，然后覆盖默认的max.poll.records参数 + # 注：需要开启BatchListener批量监听才会生效，如果不开启BatchListener则不会出现reBalance情况 + max-poll-records: 500 + bootstrap-servers: 150.158.33.234:9092 + auto-commit-interval: 5000 + fetch-max-wait: 500 + fetch-min-size: 1 + heartbeat-interval: 3000 + properties: + # 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance + max: + poll: + interval: + ms: 600000 + # 当broker多久没有收到consumer的心跳请求后就触发reBalance，默认值是10s + session: + timeout: + ms: 10000 + listener: + # 在侦听器容器中运行的线程数，一般设置为 机器数*分区数 + concurrency: 4 + # 自动提交关闭，需要设置手动消息确认 + ack-mode: manual_immediate + # 消费监听接口监听的主题不存在时，默认会报错，所以设置为false忽略错误 + missing-topics-fatal: false + # 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance + poll-timeout: 600000 + mvc: pathmatch: matching-strategy: ant_path_matcher From b9c4334cb5cee6c4d34fb017b6f96c19de449468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 14:35:47 +0800 Subject: [PATCH 04/10] =?UTF-8?q?style:()=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 2 +- .../common/many/datasource/JDBCDemo.java | 44 ------------------- .../many/datasource/ManyDataSource.java | 3 +- .../constents/DatasourceContent.java | 3 +- .../domain/model/DataSourceInfo.java | 3 +- .../factory/DruidDataSourceFactory.java | 3 +- .../holder/DynamicDataSourceHolder.java | 2 +- .../common/saas/contents/SaaSConstant.java | 3 +- .../common/saas/domain/model/EntInfo.java | 2 +- .../common/saas/exception/SaaSException.java | 3 +- .../saas/interceptor/SaaSInterceptor.java | 3 +- ...terpriseDao.java => EnterpriseMapper.java} | 6 +-- .../service/impl/EnterpriseServiceImpl.java | 4 +- .../service/impl/SysCarServiceImpl.java | 9 +++- .../service/impl/TemplateServiceImpl.java | 7 ++- .../resources/mapper/EnterpriseMapper.xml | 4 +- 16 files changed, 35 insertions(+), 66 deletions(-) delete mode 100644 cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java rename cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/{EnterpriseDao.java => EnterpriseMapper.java} (90%) diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index 7305c98..75a04e5 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -1,6 +1,6 @@ package com.muyu.auth.service; -import com.muyu.auth.form.EnterpriseSettlement; + import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.SecurityConstants; diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java deleted file mode 100644 index b297441..0000000 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.cloud.common.many.datasource; - -import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; -import lombok.extern.log4j.Log4j2; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * 测试添加数据源 - * @author 袁子龙 - * @package com.muyu.cloud.common.many.datasource - * @name JDBCDemo - * @date 2024/9/30 18:14 - */ -@Log4j2 -public class JDBCDemo { - public static void main(String[] args) { - String databaseName = "my_database"; - - String connectUrl = DatasourceContent.getDatasourceUrl("mysql"); - - String createDatabaseUrl = "jdbc:mysql://" + DatasourceContent.IP + ":" + DatasourceContent.PORT + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; - String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + databaseName + ";"; - - try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD); - Statement stmt = adminConn.createStatement()) { - - boolean success = stmt.execute(createDatabaseSql); - if (success) { - log.info("数据库 {} 创建成功", databaseName); - - } else { - log.warn("数据库 {} 创建失败，可能已存在或权限不足", databaseName); - } - - } catch (SQLException e) { - e.printStackTrace(); - log.error("连接数据库时发生错误或创建数据库失败", e); - } - } -} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 04bf3b3..7245b4d 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -29,7 +29,8 @@ import java.util.List; import java.util.Map; /** - * @Author: DongZeLiang + * 多数据源 + * @author liuwu * @date: 2024/6/3 * @Description: 多数据源 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java index 6152cad..bb27584 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java @@ -1,7 +1,8 @@ package com.muyu.cloud.common.many.datasource.constents; /** - * @author DongZl + * 数据源常量 + * @author liuwu * @description: 数据源常量 * @Date 2023-8-1 上午 11:02 */ diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java index 73cc26e..6406cfc 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java @@ -8,7 +8,8 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @author DongZl + * 数据源实体类 + * @author liuwu * @description: 数据源实体类 * @Date 2023-8-1 上午 11:15 */ diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java index 7ceb782..30eee74 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Component; import java.sql.SQLException; /** - * @Author: DongZeLiang + * Druid工厂 + * @author liuwu * @date: 2024/6/3 * @Description: Druid工厂 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java index e53229a..5cafaa0 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java @@ -6,7 +6,7 @@ import org.springframework.util.Assert; /** * 数据源切换处理 * - * @author Dongzl + * @author liuwu */ @Slf4j public class DynamicDataSourceHolder { diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java index 241ce32..042fe95 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java @@ -1,7 +1,8 @@ package com.muyu.cloud.common.saas.contents; /** - * @Author: DongZeLiang + * SAAS常量 + * @author liuwu * @date: 2024/6/3 * @Description: SAAS常量 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java index 5c1985a..db7e230 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author: DongZeLiang + * @Author: liuwu * @date: 2024/6/3 * @Description: 企业信息 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java index b2b4cc7..60e5054 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java @@ -4,7 +4,8 @@ package com.muyu.cloud.common.saas.exception; import com.muyu.common.core.exception.ServiceException; /** - * @Author: DongZeLiang + * SaaS异常类 + * @author liuwu * @date: 2024/6/3 * @Description: SaaS异常类 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java index 0efef00..997fe6b 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java @@ -14,7 +14,8 @@ import org.springframework.web.servlet.AsyncHandlerInterceptor; /** - * @Author: DongZeLiang + * SAAS拦截器 + * @author liuwu * @date: 2024/6/3 * @Description: SAAS拦截器 * @Version: 1.0 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseMapper.java similarity index 90% rename from cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java rename to cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseMapper.java index 786b50f..27779c3 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseMapper.java @@ -9,14 +9,14 @@ import java.util.HashMap; import java.util.Map; /** - * 企业信息 Mapper接口 + * 企业信息Mapper接口 * @author yupnig * @package com.muyu.server.mapper - * @name EnterpriseDao + * @name EnterpriseMapper * @date 2024-09-29 14:31:06 */ @Mapper -public interface EnterpriseDao { +public interface EnterpriseMapper { // 查询分页信息 public ArrayList selectEnterprise(Map param); //查询企业记录总数 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java index 5f98fb8..f46569d 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.map.MapUtil; import com.muyu.cache.EnterpriseCacheService; import com.muyu.common.domain.Enterprise; import com.muyu.common.util.PageUtils; -import com.muyu.server.mapper.EnterpriseDao; +import com.muyu.server.mapper.EnterpriseMapper; import com.muyu.server.service.EnterpriseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ import java.util.*; public class EnterpriseServiceImpl implements EnterpriseService { @Autowired - private EnterpriseDao enterpriseDao; + private EnterpriseMapper enterpriseDao; @Autowired private EnterpriseCacheService enterpriseCacheService; diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java index 46bc9f4..9082f18 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java @@ -13,9 +13,16 @@ import com.muyu.server.service.SysCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; + import java.util.List; +/** + * 车辆管理 服务层处理 + * @author sx + * @package com.muyu.server.service.impl + * @name SysCarServiceImpl + * @date 2024-09-29 14:31:06 + */ @DS("lizzDB") @Service public class SysCarServiceImpl extends ServiceImpl implements SysCarService { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java index 091631d..25585de 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java @@ -3,7 +3,6 @@ package com.muyu.server.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cache.SysCarCacheService; import com.muyu.common.domain.MessageTemplateType; import com.muyu.common.domain.SysCar; import com.muyu.common.domain.Template; @@ -21,7 +20,8 @@ import java.sql.*; import java.util.List; import java.util.concurrent.ExecutionException; /** - * @Author：liuxinyue + * 报文模版 服务层处理 + * @author liuxinyue * @Package：com.template.service.impl * @Project：cloud-server-c * @name：TemplateServiceImp @@ -31,8 +31,7 @@ import java.util.concurrent.ExecutionException; @Service public class TemplateServiceImpl extends ServiceImpl implements TemplateService { - @Autowired - private static TemplateMapper templateMapper; + @Autowired private SysCarService sysCarService; diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml index 511435b..cc25010 100644 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml +++ b/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml @@ -6,7 +6,7 @@ 1.在mybats的开发中namespace有特殊的意思，一定要是对应接口的全限定名 通过namespace可以简历mapper.xml和接口之间的关系(名字不重要，位置不重要) --> - + - + insert into tb_enterprise set enterprise_name = #{enterpriseName}, enterprise_car_count = #{enterpriseCarCount}, From 875391757f490924e7360340eefb5e8a76c377aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 16:17:34 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:()=E8=A1=A5=E5=85=A8swagger=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/WarnStrategyController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java index 8c0a9ee..ba1136c 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java @@ -5,6 +5,9 @@ import javax.annotation.Resource; import com.muyu.common.domain.WarnStrategy; import com.muyu.common.domain.req.WarnStrategyReq; import com.muyu.server.service.WarnStrategyService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.DeleteMapping; @@ -23,6 +26,8 @@ import com.muyu.common.core.domain.Result; */ @RestController @RequestMapping("/strategy") +@Log4j2 +@Tag(name = "预警策略管理",description = "预警策略管理") public class WarnStrategyController extends BaseController { @Resource @@ -32,6 +37,7 @@ public class WarnStrategyController extends BaseController * 查询预警策略列表 */ @PostMapping("/selectWarnStrategyList") + @Operation(summary = "预警策略列表",description = "预警策略列表") public Result selectWarnStrategyList(@RequestBody WarnStrategyReq warnStrategyReq) { return Result.success(warnStrategyService.selectWarnStrategyList(warnStrategyReq)); @@ -42,6 +48,7 @@ public class WarnStrategyController extends BaseController * 获取预警策略详细信息 */ @GetMapping( "selectById/{id}") + @Operation(summary = "预警策略详细信息",description = "预警策略详细信息") public Result selectById(@PathVariable("id") Long id) { return success(warnStrategyService.selectWarnStrategyById(id)); @@ -51,6 +58,7 @@ public class WarnStrategyController extends BaseController * 新增预警策略 */ @PostMapping("/addWarnStrategy") + @Operation(summary = "预警策略添加",description = "预警策略添加") public Result addWarnStrategy(@RequestBody WarnStrategy warnStrategy) { Integer i = warnStrategyService.addWarnStrategy(warnStrategy); @@ -61,6 +69,7 @@ public class WarnStrategyController extends BaseController * 修改预警策略 */ @PostMapping("/updWarnStrategy") + @Operation(summary = "预警策略修改",description = "预警策略修改") public Result updWarnStrategy(@RequestBody WarnStrategy warnStrategy) { Integer i = warnStrategyService.updWarnStrategy(warnStrategy); @@ -71,6 +80,7 @@ public class WarnStrategyController extends BaseController * 删除预警策略 */ @DeleteMapping("deleteWarnStrategy/{id}") + @Operation(summary = "预警策略删除",description = "预警策略删除") public Result deleteWarnStrategy(@PathVariable("id") Long id) { Integer i = warnStrategyService.deleteWarnStrategy(id); @@ -83,6 +93,7 @@ public class WarnStrategyController extends BaseController * 根据车辆类型ID查询策略 */ @GetMapping("/selectListByCarType/{carTypeId}") + @Operation(summary = "根据车辆类型ID查询策略",description = "根据车辆类型ID查询策略") public Result selectListByCarType(@PathVariable("carTypeId") Long carTypeId) { return Result.success(warnStrategyService.selectListByCarType(carTypeId)); } From dd319599b6b209dc992f55b6471dc9b1be172dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 16:20:17 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:()=E8=A1=A5=E5=85=A8swagger=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/auth/controller/TokenController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index 3b5b745..0b2f6f5 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -14,6 +14,8 @@ import com.muyu.common.security.auth.AuthUtil; import com.muyu.common.security.service.TokenService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; @@ -38,6 +40,7 @@ import java.sql.Statement; */ @Log4j2 @RestController +@Tag(name = "auth",description = "auth") public class TokenController { @Autowired private TokenService tokenService; @@ -49,6 +52,7 @@ public class TokenController { private SysFirmService sysFirmService; @PostMapping("login") + @Operation(summary = "登录", description = "登录") public Result login (@RequestBody LoginBody form) { //查询企业是否存在 Firm firm = sysFirmService.findFirmByName(form.getFirmName()); @@ -62,6 +66,7 @@ public class TokenController { } @DeleteMapping("logout") + @Operation(summary = "退出", description = "退出") public Result logout (HttpServletRequest request) { String token = SecurityUtils.getToken(request); if (StringUtils.isNotEmpty(token)) { @@ -75,6 +80,7 @@ public class TokenController { } @PostMapping("refresh") + @Operation(summary = "刷新token", description = "刷新token") public Result refresh (HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); if (StringUtils.isNotNull(loginUser)) { @@ -86,6 +92,7 @@ public class TokenController { } @PostMapping("register") + @Operation(summary = "注册用户", description = "注册用户") public Result register (@RequestBody RegisterBody registerBody) { // 用户注册 sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); @@ -98,6 +105,7 @@ public class TokenController { * @return */ @PostMapping("/enterprise") + @Operation(summary = "企业入驻", description = "企业入驻") public Result enterprise( @RequestBody EnterpriseSettlement settlement){ String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; From bd0214ccd9fc95ab3974e97673daa1d76a47d05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 20:32:33 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:()=E4=BF=AE=E6=94=B9=E4=B8=BAMybatis-?= =?UTF-8?q?Plus=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCarFaultController.java | 2 +- .../muyu/server/mapper/SysCarFaultMapper.java | 10 -- .../server/mapper/TemplateNeedMapper.java | 5 +- .../server/mapper/WarnStrategyMapper.java | 2 +- .../server/service/SysCarFaultService.java | 2 +- .../server/service/TemplateNeedService.java | 3 +- .../impl/SysCarFaultMessageServiceImpl.java | 5 +- .../service/impl/SysCarFaultServiceImpl.java | 7 +- .../service/impl/TemplateNeedServiceImpl.java | 19 ++- .../main/resources/mapper/CarTypeMapper.xml | 9 -- .../resources/mapper/TemplateNeedMapper.xml | 10 -- .../mapper/breakdown/SysCarFaultMapper.xml | 140 ------------------ .../mapper/message/DataTypeMapper.xml | 7 - .../message/MessageTemplateTypeMapper.xml | 7 - 14 files changed, 30 insertions(+), 198 deletions(-) delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java index 0b06241..5949f2e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java @@ -85,7 +85,7 @@ public class SysCarFaultController extends BaseController @Validated @RequestBody SysCarFault sysCarFault) { //判断故障码是否重复 - SysCarFault selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode()); + List selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode()); if (selectFaultByFaultCode!=null){ return error("新增车辆故障 ,故障码已存在"); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java index 2ef819c..a500004 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java @@ -17,16 +17,6 @@ import java.util.List; @Mapper public interface SysCarFaultMapper extends BaseMapper { - //根据添加的故障码进行查询 - @Select("select fault_code from sys_car_fault where fault_code=#{faultCode}") - SysCarFault selectFaultByFaultCode(String faultCode); - - /** - * 查询故障码信息 - * @param ids 故障码信息主键 - * @return 故障码信息 - */ - public List selectSysCarFaultIds(String[] ids); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java index a74491f..a1b7c44 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java @@ -1,5 +1,6 @@ package com.muyu.server.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.domain.MessageTemplateType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,6 +15,6 @@ import java.util.List; * @date 2024-09-29 14:44:57 */ @Mapper -public interface TemplateNeedMapper { - List selectByTemplateId(@Param("templateId")Long templateId); +public interface TemplateNeedMapper extends BaseMapper { + } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java index 156ae7c..9785fe1 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java @@ -12,7 +12,7 @@ import java.util.List; /** * 预警策略Mapper接口 - * @author muyu + * @author sx * @package com.muyu.server.mapper * @name WarnStrategyMapper * @date 2024-09-20 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java index 37cad97..865812a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java @@ -36,7 +36,7 @@ public interface SysCarFaultService extends IService { * @return 结果 */ - SysCarFault selectFaultByFaultCode(String faultCode); + List selectFaultByFaultCode(String faultCode); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java index 35148fe..afe9550 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java @@ -1,5 +1,6 @@ package com.muyu.server.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.domain.MessageTemplateType; import java.util.List; @@ -12,6 +13,6 @@ import java.util.List; * @date 2024-09-29 15:31:55 */ -public interface TemplateNeedService { +public interface TemplateNeedService extends IService { List selectByTemplateId(Long templateId); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java index 9915f77..863e906 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java @@ -50,8 +50,9 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl listStatusOnt( ) { - List list = baseMapper.listStatusOnt(); - return list; + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultMessage::getStatus,1); + return this.list(wrapper); } /** diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java index 7c56486..9c8f28e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java @@ -91,9 +91,12 @@ public class SysCarFaultServiceImpl */ @Override - public SysCarFault selectFaultByFaultCode(String faultCode) { - return mapper.selectFaultByFaultCode(faultCode); + public List selectFaultByFaultCode(String faultCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFault::getFaultCode, faultCode); + return this.list(wrapper); } + } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java index c155338..6a1871e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java @@ -1,5 +1,7 @@ package com.muyu.server.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.cache.MessageTemplateTypeCacheService; import com.muyu.common.domain.MessageTemplateType; import com.muyu.server.mapper.TemplateNeedMapper; @@ -17,14 +19,21 @@ import java.util.List; * @date 2024/9/22 14:36 */ @Service -public class TemplateNeedServiceImpl implements TemplateNeedService { +public class TemplateNeedServiceImpl extends ServiceImpl implements TemplateNeedService { + - @Autowired - private TemplateNeedMapper templateNeedMapper; @Override public List selectByTemplateId(Long templateId) { - List messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId); - return messageTemplateTypes; + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + + wrapper.eq(MessageTemplateType::getTemplateId, templateId); + + return this.list(wrapper); } + + + } diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml deleted file mode 100644 index 63274cf..0000000 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml deleted file mode 100644 index 5ea4090..0000000 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml deleted file mode 100644 index 44abe85..0000000 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time,car_type_id from sys_car_fault - - - - - - - - - insert into sys_car_fault - - fault_code, - fault_name, - type_id, - fault_label, - fault_bit, - fault_value, - fault_rank, - fault_desc, - fault_min_threshold, - fault_max_threshold, - status, - warn_status, - remark, - create_by, - create_time, - update_by, - update_time, - car_type_id - - - #{faultCode}, - #{faultName}, - #{typeId}, - #{faultLabel}, - #{faultBit}, - #{faultValue}, - #{faultRank}, - #{faultDesc}, - #{faultMinThreshold}, - #{faultMaxThreshold}, - #{status}, - #{warnStatus}, - #{remark}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{catTypeId} - - - - - update sys_car_fault - - fault_code = #{faultCode}, - fault_name = #{faultName}, - type_id = #{typeId}, - fault_label = #{faultLabel}, - fault_bit = #{faultBit}, - fault_value = #{faultValue}, - fault_rank = #{faultRank}, - fault_desc = #{faultDesc}, - fault_min_threshold = #{faultMinThreshold}, - fault_max_threshold = #{faultMaxThreshold}, - status = #{status}, - warn_status = #{warnStatus}, - remark = #{remark}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - car_type_id=#{catTypeId} - - where id = #{id} - - - - delete from sys_car_fault where id = #{id} - - - - delete from sys_car_fault where id in - - #{id} - - - - - update sys_car_fault set warn_status = 0 where id = #{id} - - - update sys_car_fault set warn_status = 1 where id = #{id} - - diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml deleted file mode 100644 index 52d673c..0000000 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml deleted file mode 100644 index 9385d6c..0000000 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - From fe3ce0e2912851e3ea934bf479890eb8006d24db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 20:34:13 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix:()=E4=BF=AE=E6=94=B9=E4=B8=BAMybatis-?= =?UTF-8?q?Plus=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/server/mapper/SysCarFaultMessageMapper.java | 8 ++------ .../service/impl/SysCarFaultMessageServiceImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java index 5d4622a..9253762 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java @@ -17,12 +17,8 @@ import java.util.List; @Mapper public interface SysCarFaultMessageMapper extends BaseMapper { - // 查询状态等于1的记录 - @Select("select * from sys_car_fault_message where status=1") - public ListlistStatusOnt( ); - //查询状态等于2的记录 - @Select("select * from sys_car_fault_message where status=2") - public ListlistStatusTwo( ); + + diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java index 863e906..c2b2e98 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java @@ -61,7 +61,9 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl listStatusTwo( ) { - List list = baseMapper.listStatusTwo(); - return list; + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultMessage::getStatus,2); + return this.list(wrapper); } } From ae7294da6f30cc3fa1110f2916a8f1f17ace0648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 20:39:40 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix:()=E4=BF=AE=E6=94=B9=E4=B8=BAMybatis-?= =?UTF-8?q?Plus=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/server/mapper/SysCarMapper.java | 2 +- .../muyu/server/mapper/TemplateMapper.java | 2 +- .../main/resources/mapper/SysCarMapper.xml | 4 +--- .../mapper/message/TemplateMapper.xml | 23 ------------------- 4 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/message/TemplateMapper.xml diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java index be0dcbd..70a990c 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java @@ -28,6 +28,6 @@ public interface SysCarMapper extends BaseMapper { SysCar findCarByVin(@Param("carVin") String carVin); - SysCar selectByCarVin(@Param("carVin") String carVin); + } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java index f780e9f..85b6277 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java @@ -19,6 +19,6 @@ import java.util.List; @Mapper public interface TemplateMapper extends BaseMapper