diff --git a/cloud-common/cloud-common-swagger/pom.xml b/cloud-common/cloud-common-swagger/pom.xml index 8d832cc..6aa037d 100644 --- a/cloud-common/cloud-common-swagger/pom.xml +++ b/cloud-common/cloud-common-swagger/pom.xml @@ -1,26 +1,23 @@ - - 4.0.0 com.muyu - cloud-server + cloud-common 3.6.3 - ../../pom.xml - com.muyu + 4.0.0 + cloud-common-swagger + cloud-common-swagger swagger2文档聚合 - - 17 - 17 - UTF-8 - + + org.springframework.boot diff --git a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java index 42846b0..046a082 100644 --- a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java +++ b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java @@ -22,9 +22,9 @@ import java.util.function.Predicate; /** * @author 袁子龙 - * @package：com.muyu.common.swagger.config - * @name：SwaggerAutoConfiguration - * @date：2024/9/29 10:07 + * @package com.muyu.common.swagger.config + * @name SwaggerAutoConfiguration + * @date 2024/9/29 10:07 */ @Configuration @EnableSwagger2 diff --git a/cloud-modules/cloud-modules-wechat/pom.xml b/cloud-modules/cloud-modules-wechat/pom.xml index 2b4888b..cb09980 100644 --- a/cloud-modules/cloud-modules-wechat/pom.xml +++ b/cloud-modules/cloud-modules-wechat/pom.xml @@ -12,7 +12,7 @@ cloud-modules-wechat - cloud-modules-wechat 微信公众号 + cloud-modules-wechat 微信公众号模块 diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index a384525..f27c21f 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -29,6 +29,7 @@ cloud-modules pom + cloud-modules业务模块 diff --git a/cloud-modules/saas/pom.xml b/cloud-modules/saas/pom.xml index 0b9b259..1085279 100644 --- a/cloud-modules/saas/pom.xml +++ b/cloud-modules/saas/pom.xml @@ -33,6 +33,11 @@ org.springframework.kafka spring-kafka + + + org.apache.kafka + kafka-clients + diff --git a/cloud-modules/saas/saas-common/pom.xml b/cloud-modules/saas/saas-common/pom.xml index cb74eaa..bda0d95 100644 --- a/cloud-modules/saas/saas-common/pom.xml +++ b/cloud-modules/saas/saas-common/pom.xml @@ -32,12 +32,6 @@ swagger-annotations 2.2.8 - - com.muyu.server - saas-server - 3.6.3 - compile - diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java index 52ea7a0..ccaa7ca 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java @@ -6,6 +6,14 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +/** + * 车辆类型对象 + * @Author：liuxinyue + * @Package：com.sheep.message.domain + * @Project：cloud-server-c + * @name：MessageTemplateType + * @Date：2024/9/18 21:01 + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java index b70a583..7fb9ea2 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.io.Serializable; /** + * 数据类型对象 * @Author：liuxinyue * @Package：com.sheep.message.domain * @Project：cloud-server-c diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java index b14c894..8f21d62 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java @@ -9,6 +9,7 @@ import lombok.experimental.SuperBuilder; import java.sql.Date; /** + * 新能源车模版 * @Author：liuxinyue * @Package：com.template.domain * @Project：cloud-server diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java index 6d84684..3cdd2a5 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java @@ -11,6 +11,7 @@ import lombok.experimental.SuperBuilder; import java.io.Serializable; /** + * 模版对应的配置 * @Author：liuxinyue * @Package：com.sheep.message.domain * @Project：cloud-server-c @@ -25,6 +26,7 @@ import java.io.Serializable; @TableName(value = "message_template_type",autoResultMap = true) public class MessageTemplateType implements Serializable { + /** * 主键 */ diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java index c2e5e47..85d7e28 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java @@ -9,12 +9,21 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +/** + * 车辆对象 + * @Author：liuxinyue + * @Package：com.sheep.message.domain + * @Project：cloud-server-c + * @name：MessageTemplateType + * @Date：2024/9/18 21:01 + */ @Data @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "sys_car",autoResultMap = true) public class SysCar extends BaseEntity { + @TableId(value = "id",type = IdType.AUTO) private Long id; private String carVin; diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java index 3cc0014..b6bf5a6 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java @@ -9,7 +9,7 @@ import lombok.*; /** * 企业信息 sys_car_enterprise - * @author YuanZiLong + * @author 袁子龙 * @package com.muyu.breakdown.domain * @name: SysCarEnterprise * @date: 2024/9/26 19:54 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java index af996e5..5fb7709 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java @@ -12,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 车辆故障管理对象 sys_car_fault - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.domain * @name: SysCarFault * @date: 2024/9/20 10:56 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java index ad4ccc0..ca1c029 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java @@ -12,7 +12,7 @@ import java.util.Date; /** * 故障记录对象 sys_car_fault_log - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.domain * @name: SysCarFaultLog * @date: 2024/9/22 20:17 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java index fff86b4..c4057cb 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java @@ -11,7 +11,7 @@ import java.util.Date; /** * 站内信息对象 sys_car_fault_message - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.domain * @name: SysCarFaultMessage * @date: 2024/9/22 11:57 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java index 4d13240..1f1833d 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java @@ -10,6 +10,14 @@ import lombok.NoArgsConstructor; import java.util.Date; +/** + * 车辆记录对象 + * @Author：liuxinyue + * @Package：com.sheep.message.domain + * @Project：cloud-server-c + * @name：MessageTemplateType + * @Date：2024/9/18 21:01 + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java index 58f9c2d..70dbf2c 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java @@ -12,6 +12,7 @@ import lombok.experimental.SuperBuilder; import java.util.Date; /** + * 报文模版对象 * @Author：liuxinyue * @Package：com.template.domain * @Project：cloud-server-c diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/util/KafkaCommonProperties.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/util/KafkaCommonProperties.java new file mode 100644 index 0000000..a713ae1 --- /dev/null +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/util/KafkaCommonProperties.java @@ -0,0 +1,239 @@ +package com.muyu.common.util; + +import java.util.Collection; +import java.util.Collections; + +/** + * kafka通用配置 + * @author liuxinyue + * @Package：com.muyu.common.util + * @name：KafkaCommonProperties + * @Date：2024/9/29 12:26 + */ +public class KafkaCommonProperties{ + + /** + * Kafka主机 + */ + private String kafkaHost = "47.101.53.251:9092"; + + /** + * 生产者：要求leader请求结束前收到的确认次数，来控制发送数据的持久化 + * 消息确认： + * 0：生产者不等待服务器确认，此时retry参数不生效 + * 1：leader写入记录到log，不会等待follower的确认即向生产者发送通知 + * all：leader等待所有副本通知，然后向生产者发送通知，保证所有数据落盘到所有副本，功能同设置为-1 + */ + private String ack = "all"; + + /** + * 生产者重试次数 + */ + private Integer retryTimes = 1; + + /** + * 生产者：向同一分区发送打包发送的数据量，单位：bytes，默认16384bytes=16K + */ + private Integer batchSize = 16384; + + /** + * 生产者：批量发送消息的间隔时间（延迟时间），单位：毫秒 + */ + private Integer lingerMs = 1; + + /** + * 生产者：可以使用的最大缓存空间，单位：bytes，默认33554432bytes=32M. + */ + private Integer bufferMemory = 33554432; + + /** + * 生产者：键编码器 + */ + private String keyEncoder = "org.apache.kafka.common.serialization.StringSerializer"; + + /** + * 生产者：值编码器 + */ + private String valueEncoder = "org.apache.kafka.common.serialization.StringSerializer"; + + /** + * 消费者：消费topic的组ID + */ + private String groupId = "my-group-id"; + + /** + * 消费者：后台定期提交offset + */ + private String autoCommit = "true"; + + /** + * 消费者提交offset的时间间隔：单位：毫秒，当enable.auto.commit为true时生效 + */ + private String autoCommitIntervalMs = "1000"; + + /** + * 消费者：键解码器 + */ + private String keyDecoder = "org.apache.kafka.common.serialization.StringDeserializer"; + + /** + * 消费者：值解码器 + */ + private String valueDecoder = "org.apache.kafka.common.serialization.StringDeserializer"; + + /** + * 消费者：重启后配置offset + * earliest：消费者恢复到当前topic最早的offset + * latest：消费者从最新的offset开始消费 + * none：如果消费者组没找到之前的offset抛出异常 + * 其他任何值都会抛出异常 + */ + private String autoOffsetReset = "latest"; + + /** + * TOPIC + */ + private Collection topic = Collections.singleton("my-topic"); + + public KafkaCommonProperties() { + + } + + public KafkaCommonProperties(String kafkaHost, String ack, Integer retryTimes, Integer batchSize, Integer lingerMs, Integer bufferMemory, String keyEncoder, String valueEncoder, String groupId, String autoCommit, String autoCommitIntervalMs, String keyDecoder, String valueDecoder, String autoOffsetReset, Collection topic) { + this.kafkaHost = kafkaHost; + this.ack = ack; + this.retryTimes = retryTimes; + this.batchSize = batchSize; + this.lingerMs = lingerMs; + this.bufferMemory = bufferMemory; + this.keyEncoder = keyEncoder; + this.valueEncoder = valueEncoder; + this.groupId = groupId; + this.autoCommit = autoCommit; + this.autoCommitIntervalMs = autoCommitIntervalMs; + this.keyDecoder = keyDecoder; + this.valueDecoder = valueDecoder; + this.autoOffsetReset = autoOffsetReset; + this.topic = topic; + } + + public String getKafkaHost() { + return kafkaHost; + } + + public void setKafkaHost(String kafkaHost) { + this.kafkaHost = kafkaHost; + } + + public String getAck() { + return ack; + } + + public void setAck(String ack) { + this.ack = ack; + } + + public Integer getRetryTimes() { + return retryTimes; + } + + public void setRetryTimes(Integer retryTimes) { + this.retryTimes = retryTimes; + } + + public Integer getBatchSize() { + return batchSize; + } + + public void setBatchSize(Integer batchSize) { + this.batchSize = batchSize; + } + + public Integer getLingerMs() { + return lingerMs; + } + + public void setLingerMs(Integer lingerMs) { + this.lingerMs = lingerMs; + } + + public Integer getBufferMemory() { + return bufferMemory; + } + + public void setBufferMemory(Integer bufferMemory) { + this.bufferMemory = bufferMemory; + } + + public String getKeyEncoder() { + return keyEncoder; + } + + public void setKeyEncoder(String keyEncoder) { + this.keyEncoder = keyEncoder; + } + + public String getValueEncoder() { + return valueEncoder; + } + + public void setValueEncoder(String valueEncoder) { + this.valueEncoder = valueEncoder; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getAutoCommit() { + return autoCommit; + } + + public void setAutoCommit(String autoCommit) { + this.autoCommit = autoCommit; + } + + public String getAutoCommitIntervalMs() { + return autoCommitIntervalMs; + } + + public void setAutoCommitIntervalMs(String autoCommitIntervalMs) { + this.autoCommitIntervalMs = autoCommitIntervalMs; + } + + public String getKeyDecoder() { + return keyDecoder; + } + + public void setKeyDecoder(String keyDecoder) { + this.keyDecoder = keyDecoder; + } + + public String getValueDecoder() { + return valueDecoder; + } + + public void setValueDecoder(String valueDecoder) { + this.valueDecoder = valueDecoder; + } + + public String getAutoOffsetReset() { + return autoOffsetReset; + } + + public void setAutoOffsetReset(String autoOffsetReset) { + this.autoOffsetReset = autoOffsetReset; + } + + public Collection getTopic() { + return topic; + } + + public void setTopic(Collection topic) { + this.topic = topic; + } +} diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/util/KafkaProducerTest.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/util/KafkaProducerTest.java new file mode 100644 index 0000000..004dff9 --- /dev/null +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/util/KafkaProducerTest.java @@ -0,0 +1,64 @@ +package com.muyu.common.util; + +import org.apache.kafka.clients.producer.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Objects; +import java.util.Properties; +/** + * kafka生产 + * @author liuxinyue + * @Package：com.muyu.common.util + * @name：KafkaProducerTest + * @Date：2024/9/29 12:27 + */ +public class KafkaProducerTest { + private static final Logger logger = LoggerFactory.getLogger(KafkaProducerTest.class); + + public static KafkaProducer getDefaultKafkaProducer(KafkaCommonProperties kafkaCommonProperties) { + Properties properties = new Properties(); + properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaCommonProperties.getKafkaHost()); + properties.put(ProducerConfig.ACKS_CONFIG, kafkaCommonProperties.getAck()); + properties.put(ProducerConfig.RETRIES_CONFIG, kafkaCommonProperties.getRetryTimes()); + properties.put(ProducerConfig.BATCH_SIZE_CONFIG, kafkaCommonProperties.getBatchSize()); + properties.put(ProducerConfig.LINGER_MS_CONFIG, kafkaCommonProperties.getLingerMs()); + properties.put(ProducerConfig.BUFFER_MEMORY_CONFIG, kafkaCommonProperties.getBufferMemory()); + properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, kafkaCommonProperties.getKeyEncoder()); + properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, kafkaCommonProperties.getValueEncoder()); + return new KafkaProducer<>(properties); + } + + static class MyProducerCallback implements Callback { + + @Override + public void onCompletion(RecordMetadata metadata, Exception exception) { + if (Objects.nonNull(exception)) { + logger.error(">>>>>>>>>>Producer生产消息异常：", exception); + } + if (Objects.nonNull(metadata)) { + logger.info(">>>>>>>>>>Producer生产消息：metadata：{}，partition:{}, offset：{}", metadata, metadata.partition(), metadata.offset()); + } + } + } + + public static void main(String[] args) { + KafkaCommonProperties kafkaCommonProperties = new KafkaCommonProperties(); + KafkaProducer producer = getDefaultKafkaProducer(kafkaCommonProperties); + String message = "hello world "; + try { + for (int i = 0; i < 10; i++) { + // 异步写入数据 + String topic = kafkaCommonProperties.getTopic().toArray()[0].toString(); + ProducerRecord producerRecord = new ProducerRecord<>(topic, message + i); + producer.send(producerRecord, new MyProducerCallback()); + } + } catch (Exception ex) { + logger.error(">>>>>>>>生产数据异常：", ex); + throw new RuntimeException(ex); + } finally { + producer.close(); + } + } + +} diff --git a/cloud-modules/saas/saas-server/pom.xml b/cloud-modules/saas/saas-server/pom.xml index 56f77f3..43fa0e2 100644 --- a/cloud-modules/saas/saas-server/pom.xml +++ b/cloud-modules/saas/saas-server/pom.xml @@ -95,6 +95,7 @@ 1.3.2 + diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/KafkaConsumerConfig.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/KafkaConsumerConfig.java new file mode 100644 index 0000000..7184006 --- /dev/null +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/KafkaConsumerConfig.java @@ -0,0 +1,54 @@ +package com.muyu.server.config; + +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.common.serialization.Deserializer; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author liuxinyue + * @Package：com.muyu.mqtt.configure + * @Project：cloud-server + * @name：KafkaConsumerConfig + * @Date：2024/9/28 23:42 + */ +@Configuration +public class KafkaConsumerConfig { + @Bean + public KafkaConsumer kafkaConsumer() { + Map configs = new HashMap<>(); + //kafka服务端的IP和端口,格式:(ip:port) + configs.put("bootstrap.servers", "47.101.53.251:9092"); + //开启consumer的偏移量(offset)自动提交到Kafka + configs.put("enable.auto.commit", true); + //consumer的偏移量(offset) 自动提交的时间间隔,单位毫秒 + configs.put("auto.commit.interval", 5000); + //在Kafka中没有初始化偏移量或者当前偏移量不存在情况 + //earliest, 在偏移量无效的情况下, 自动重置为最早的偏移量 + //latest, 在偏移量无效的情况下, 自动重置为最新的偏移量 + //none, 在偏移量无效的情况下, 抛出异常. + configs.put("auto.offset.reset", "latest"); + //请求阻塞的最大时间(毫秒) + configs.put("fetch.max.wait", 500); + //请求应答的最小字节数 + configs.put("fetch.min.size", 1); + //心跳间隔时间(毫秒) + configs.put("heartbeat-interval", 3000); + //一次调用poll返回的最大记录条数 + configs.put("max.poll.records", 500); + //指定消费组 + configs.put("group.id", "kafka_grop"); + //指定key使用的反序列化类 + Deserializer keyDeserializer = new StringDeserializer(); + //指定value使用的反序列化类 + Deserializer valueDeserializer = new StringDeserializer(); + //创建Kafka消费者 + KafkaConsumer kafkaConsumer = new KafkaConsumer(configs, keyDeserializer, valueDeserializer); + return kafkaConsumer; + } +} diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/KafkaProviderConfig.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/KafkaProviderConfig.java new file mode 100644 index 0000000..15ac1ef --- /dev/null +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/KafkaProviderConfig.java @@ -0,0 +1,49 @@ +package com.muyu.server.config; + +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.serialization.StringSerializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author liuxinyue + * @Package：com.muyu.mqtt.configure + * @Project：cloud-server + * @name：KafkaProviderConfig + * @Date：2024/9/28 23:50 + */ +@Configuration +public class KafkaProviderConfig { + + @Bean + public KafkaProducer kafkaProducer() { + Map configs = new HashMap<>(); + //#kafka服务端的IP和端口,格式:(ip:port) + configs.put("bootstrap.servers", "47.116.173.119:9092"); + //客户端发送服务端失败的重试次数 + configs.put("retries", 2); + //多个记录被发送到同一个分区时,生产者将尝试将记录一起批处理成更少的请求. + //此设置有助于提高客户端和服务器的性能,配置控制默认批量大小(以字节为单位) + configs.put("batch.size", 16384); + //生产者可用于缓冲等待发送到服务器的记录的总内存字节数(以字节为单位) + configs.put("buffer-memory", 33554432); + //生产者producer要求leader节点在考虑完成请求之前收到的确认数,用于控制发送记录在服务端的持久化 + //acks=0,设置为0,则生产者producer将不会等待来自服务器的任何确认.该记录将立即添加到套接字(socket)缓冲区并视为已发送.在这种情况下,无法保证服务器已收到记录,并且重试配置(retries)将不会生效(因为客户端通常不会知道任何故障),每条记录返回的偏移量始终设置为-1. + //acks=1,设置为1,leader节点会把记录写入本地日志,不需要等待所有follower节点完全确认就会立即应答producer.在这种情况下,在follower节点复制前,leader节点确认记录后立即失败的话,记录将会丢失. + //acks=all,acks=-1,leader节点将等待所有同步复制副本完成再确认记录,这保证了只要至少有一个同步复制副本存活,记录就不会丢失. + configs.put("acks", "-1"); + //指定key使用的序列化类 + Serializer keySerializer = new StringSerializer(); + //指定value使用的序列化类 + Serializer valueSerializer = new StringSerializer(); + //创建Kafka生产者 + KafkaProducer kafkaProducer = new KafkaProducer(configs, keySerializer, valueSerializer); + return kafkaProducer; + } + +} diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/config/MqttConfigure.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java similarity index 96% rename from cloud-modules/saas/saas-common/src/main/java/com/muyu/common/config/MqttConfigure.java rename to cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java index 12d4867..1b2be06 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/config/MqttConfigure.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java @@ -1,4 +1,4 @@ -package com.muyu.common.config; +package com.muyu.server.config; import cn.hutool.json.JSONObject; import com.muyu.server.service.TemplateService; @@ -10,7 +10,8 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; /** - * @Author：liuxinyue + * + * @author liuxinyue * @Package：com.muyu.mqtt.configure * @Project：cloud-server * @name：MqttConfigure @@ -29,7 +30,7 @@ public class MqttConfigure { String topic = "vehicle"; int qos = 2; String broker = "tcp://47.101.53.251:1883"; - String clientId = "hhhhhh"; + String clientId = "测试mqtt"; try { MqttClient sampleClient = new MqttClient(broker, clientId); MqttConnectOptions connOpts = new MqttConnectOptions(); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/CarTypeController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/CarTypeController.java index 53c3655..8e434db 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/CarTypeController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/CarTypeController.java @@ -10,7 +10,14 @@ import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; +/** + * 车辆类型管理 + * @author liuxingue + * @package com.muyu.server.controller + * @name CarTypeController + * @Date 2024/9/29 12:06 + */ + @RestController diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/DataTypeController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/DataTypeController.java index 220d0b9..4941a22 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/DataTypeController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/DataTypeController.java @@ -16,7 +16,8 @@ import java.util.List; /** - * @Author：liuxinyue + * 数据类型管理 + * @author liuxinyue * @Package：com.sheep.controller * @Project：cloud-server-c * @name：DataTypeController diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceController.java index d607d8e..af61b7e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceController.java @@ -18,14 +18,15 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author：yuping + * 电子围栏 + * @author yuping * @Package：com.muyu.fence.controller * @Project：cloud-server * @name：FenceEtlController * @Date：2024/9/17 16:28 */ @Log4j2 -@Tag(name = "电子围栏") +@Tag(name = "电子围栏",description = "电子围栏") @RestController @RequestMapping("/fence") @RequiredArgsConstructor @@ -36,21 +37,21 @@ public class ElectronicFenceController { @PostMapping("/fenceArray") - @Operation(description = "查询所有可用的围栏") + @Operation(summary = "查询所有可用的电子围栏",description = "查询所有可用的围栏") public Result> fenceArray() { System.out.println("=====>" + "hgfvhgjy"); return Result.success(electronicFenceService.fenceArray()); } @PostMapping("/fenceselectList") - @Operation(description = "列表") + @Operation(summary = "列表",description = "列表") public Result> fenceselectList(@RequestBody ElectroicFenceListReq electroicFenceListReq) { System.out.println("=====>" + "hgfvhgjy"); return Result.success(electronicFenceService.fenceselectList(electroicFenceListReq)); } @PostMapping("/add") - @Operation(description = "添加") + @Operation(summary = "添加电子围栏",description = "添加电子围栏") public Result AddFence(@RequestBody ElectroicFenceAddReq electroicFenceAddReq) { electronicFenceService.unquireFence(electroicFenceAddReq.getName()); @@ -60,7 +61,7 @@ public class ElectronicFenceController { } @PostMapping("/upd/{id}") - @Operation(description = "修改") + @Operation(summary = "修改电子围栏",description = "修改电子围栏") public Result UpdFence(@PathVariable("id") Long id, @RequestBody ElectroicFenceUpdReq electroicFenceUpdReq) { electronicFenceService.updateById(ElectronicFence.buildByElectronicUpd(electroicFenceUpdReq, () -> id)); @@ -69,7 +70,7 @@ public class ElectronicFenceController { } @PostMapping("/findElectronicByid/{id}") - @Operation(description = "通过id回显围栏信息") + @Operation(summary = "通过Id回显电子围栏信息",description = "通过Id回显电子围栏") public Result findElectronicByid(@PathVariable("id") Long id) { ElectronicFence electronicFence= electronicFenceService.findElectronicByid(id); @@ -101,7 +102,7 @@ public class ElectronicFenceController { } @PostMapping("/open/{id}") - @Operation(description = "开启围栏") + @Operation(summary = "开启电子围栏",description = "开启电子围栏") public Result openFence(@PathVariable("id") Long id) { electronicFenceService.openFence(id); @@ -110,7 +111,7 @@ public class ElectronicFenceController { } @PostMapping("/close/{id}") - @Operation(description = "关闭围栏") + @Operation(summary = "关闭电子围栏",description = "关闭电子围栏") public Result closeFence(@PathVariable("id") Long id) { electronicFenceService.closeFence(id); @@ -119,7 +120,7 @@ public class ElectronicFenceController { } @PostMapping("/setFenceWay") - @Operation(description = "设置电子围栏的位置") + @Operation(summary = "设置电子围栏的位置",description = "设置电子围栏的位置") public Result setFenceWay(@RequestBody FenceWayReq fenceWayReq) { Long id = fenceWayReq.getId(); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceGroupController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceGroupController.java index 297050a..25108a9 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceGroupController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/ElectronicFenceGroupController.java @@ -20,7 +20,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author：yuping + * 围栏组 + * @author yuping * @Package：com.muyu.fence.controller * @Project：cloud-server * @name：FenceGroupController @@ -30,7 +31,7 @@ import java.util.List; @Log4j2 @RestController @RequestMapping("/group") -@Tag(name = "围栏组") +@Tag(name = "围栏组",description = "围栏组管理") public class ElectronicFenceGroupController { @Autowired @@ -41,6 +42,7 @@ public class ElectronicFenceGroupController { @PostMapping("/selectGroupList") + @Operation(summary = "围栏组列表",description = "围栏组列表") public Result> selectGroupList(@RequestBody ElectronicFenceGroupListReq req) { //查询所有的围栏组 List fenceListList = electronicFenceGroupService.selectGroupList(req); @@ -52,6 +54,7 @@ public class ElectronicFenceGroupController { @Transactional @PostMapping("/addGroup") + @Operation(summary = "添加围栏组",description = "添加围栏组") public Result addGroup(@RequestBody ElectronicFenceGroupAddReq addReq) { ElectronicFenceGroup electronicFenceGroup = ElectronicFenceGroup.buildByAdd(addReq); @@ -66,7 +69,7 @@ public class ElectronicFenceGroupController { } @PostMapping("/findGroupByid/{id}") - @Operation(description = "通过id回显围栏组信息") + @Operation(summary = "通过id回显围栏组信息",description = "通过id回显围栏组信息") public Result findGroupByid(@PathVariable("id") Long id) { ElectronicFenceGroupResp fenceGroupResp = electronicFenceGroupService.findGroupByid(id); @@ -77,7 +80,7 @@ public class ElectronicFenceGroupController { @Transactional @PostMapping("/updGroup/{id}") - @Operation(description = "修改") + @Operation(summary = "修改围栏组",description = "修改") public Result UpdFence(@PathVariable("id") Long id, @RequestBody ElectronicFenceGroupUpdReq req) { electronicFenceGroupService.updateById(ElectronicFenceGroup.buildByUpd(req, () -> id)); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java index 5a417e1..39a5e55 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java @@ -9,7 +9,10 @@ import com.muyu.server.controller.form.InsertEnterprise; import com.muyu.server.controller.form.SearchEnterpriseName; import com.muyu.server.controller.form.UpdateEnterprise; import com.muyu.server.service.EnterpriseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,12 +20,16 @@ import java.util.HashMap; import java.util.Map; /** - * @Author YuPing + * 企业运营控制层 + * @author yuping * @Description 企业运营控制层 * @Version 1.0 * @Data 2024-09-26 20:24:05 */ @RestController +@RequestMapping("/enterprise") +@Log4j2 +@Tag(name = "企业运营管理",description = "企业运营管理") public class EnterpriseController { @Autowired @@ -35,6 +42,7 @@ public class EnterpriseController { * @return */ @PostMapping("/selectEnterprise") + @Operation(summary = "查询分页企业信息",description = "查询分页企业信息") public Result selectEnterprise(@RequestBody @Valid SearchEnterpriseName form) { Integer page = form.getPage(); Integer length = form.getLength(); @@ -55,6 +63,7 @@ public class EnterpriseController { * @return */ @PostMapping("/insert") + @Operation(summary = "新增企业信息",description = "新增企业信息") public Result insert(@RequestBody @Valid InsertEnterprise form){ Enterprise enterprise = new Enterprise(); @@ -73,6 +82,7 @@ public class EnterpriseController { * @return */ @GetMapping("/searchById") + @Operation(summary = "根据编号查询企业信息",description = "根据编号查询企业信息") public Result searchById(@RequestParam("enterpriseId") Integer enterpriseId){ HashMap map = enterpriseService.searchById(enterpriseId); return Result.success(map); @@ -85,6 +95,7 @@ public class EnterpriseController { * @return */ @PostMapping("/updateEnterEnterprise") + @Operation(summary = "修改企业信息",description = "修改企业信息") public Result updateEnterprise(@RequestBody @Valid UpdateEnterprise form){ Enterprise enterprise = new Enterprise(); @@ -104,6 +115,7 @@ public class EnterpriseController { * @return */ @PostMapping("/deleteByIds") + @Operation(summary = "删除企业信息",description = "删除企业信息") public Result deleteByIds(@RequestBody @Valid DeleteEnterpriseByIds form){ int rows = enterpriseService.deleteByIds(form.getIds()); return Result.success(rows); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/MessageTemplateTypeController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/MessageTemplateTypeController.java index 6afc5bf..ace2182 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/MessageTemplateTypeController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/MessageTemplateTypeController.java @@ -13,7 +13,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author：liuxinyue + * 报文模版管理 + * @author liuxinyue * @Package：com.sheep.message.controller * @Project：cloud-server-c * @name：MessageTemplateTypeController 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 70b3659..698be1d 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 @@ -14,6 +14,13 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * 车辆管理 + * @author sx + * @Package：com.template.controller + * @name：SysCarController + * @Date：2024/9/20 12:12 + */ @RestController @RequestMapping("/sysCar") @AllArgsConstructor @@ -84,9 +91,10 @@ public class SysCarController { * @return */ @PostMapping("/findCarByVin") - @Operation(summary = "根据VIN码查询车信息",description = "根据VIN码查询车信息") +// @Operation(summary = "根据VIN码查询车信息",description = "根据VIN码查询车信息") public Result findCarByVin(@RequestParam("carVin") String carVin){ return Result.success(sysCarService.findCarByVin(carVin)); } + } 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 fcc437c..0b06241 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 @@ -9,8 +9,11 @@ import com.muyu.common.domain.SysCarFault; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.server.service.SysCarFaultService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.log4j.Log4j2; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -18,24 +21,27 @@ import java.util.Arrays; import java.util.List; /** - * 故障码 接口控制层 - * @author YuanZiLong + * 车辆故障码 接口控制层 + * @author 袁子龙 * @package: com.muyu.breakdown.controller * @name: SysCarFaultController * @date: 2024/9/20 11:00 */ @RestController @RequestMapping("/breakdown") +@Tag(name = "车辆故障码",description = "车辆故障码管理") +@Log4j2 public class SysCarFaultController extends BaseController { @Resource private SysCarFaultService sysCarFaultService; /** - * 查询车辆故障管理列表 + * 查询车辆故障码管理列表 */ @RequiresPermissions("breakdown:breakdown:list") @GetMapping("/list") + @Operation(summary = "查询车辆故障码管理列表",description ="查询车辆故障码管理列表") public Result> list(SysCarFault sysCarFault) { startPage(); @@ -46,10 +52,11 @@ public class SysCarFaultController extends BaseController /** - * 导出车辆故障管理列表 + * 导出车辆故障码管理列表 */ @RequiresPermissions("breakdown:breakdown:export") @PostMapping("/export") + @Operation(summary = "导出车辆故障码管理列表",description = "导出车辆故障码管理列表") public void export(HttpServletResponse response, SysCarFault sysCarFault) { List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); @@ -58,20 +65,22 @@ public class SysCarFaultController extends BaseController } /** - * 获取车辆故障管理详细信息 + * 获取车辆故障码管理详细信息 */ @RequiresPermissions("breakdown:breakdown:query") @GetMapping(value = "/{id}") + @Operation(summary = "获取车辆故障码管理详细信息") public Result> getInfo(@PathVariable("id") Long id) { return success(sysCarFaultService.selectSysCarFaultById(id)); } /** - * 新增车辆故障管理 + * 新增车辆故障码管理 */ @RequiresPermissions("breakdown:breakdown:add") @PostMapping + @Operation(summary = "新增车辆故障码管理") public Result add( @Validated @RequestBody SysCarFault sysCarFault) { @@ -80,18 +89,17 @@ public class SysCarFaultController extends BaseController if (selectFaultByFaultCode!=null){ return error("新增车辆故障 ,故障码已存在"); } - - sysCarFault.setCreateBy(SecurityUtils.getUsername()); return toAjax(sysCarFaultService.save(sysCarFault)); } /** - * 修改车辆故障管理 + * 修改车辆故障码管理 */ @RequiresPermissions("breakdown:breakdown:edit") @PutMapping + @Operation(summary = "修改车辆故障码管理") public Result edit( @Validated @RequestBody SysCarFault sysCarFault) { @@ -101,10 +109,11 @@ public class SysCarFaultController extends BaseController } /** - * 删除车辆故障管理 + * 删除车辆故障码管理 */ @RequiresPermissions("breakdown:breakdown:remove") @DeleteMapping("/{ids}") + @Operation(summary = "删除车辆故障码管理") public Result remove(@PathVariable("ids") Long[] ids) { sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); @@ -112,21 +121,23 @@ public class SysCarFaultController extends BaseController } /** - * 启用告警 + * 启用故障码警告 * @param id */ @PutMapping("/enableWarningsById/{id}") + @Operation(summary = "启用故障码警告") public void enableWarningsById(@PathVariable("id")Long id){ UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id",id); wrapper.set("warn_status",0); - sysCarFaultService.update(wrapper); + sysCarFaultService.update(wrapper); } /** - * 禁用告警 + * 禁用故障码告警 * @param id */ @PutMapping("/disableWarningsById/{id}") + @Operation(summary = "禁用故障码告警") public void disableWarningsById(@PathVariable("id")Long id){ UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id",id); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java index 3c4063d..9a4f001 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java @@ -7,7 +7,10 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.domain.SysCarFaultLog; import com.muyu.server.service.SysCarFaultLogService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,25 +19,39 @@ import java.util.List; /** * 车辆故障记录 接口控制层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.controller * @name: SysCarFaultLogController * @date: 2024/9/22 21:08 */ @RestController @RequestMapping("/log") +@Tag(name = "车辆故障记录",description = "车辆故障记录管理") +@Log4j2 public class SysCarFaultLogController extends BaseController { @Autowired private SysCarFaultLogService service; + /** + * 查询故障记录列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/list") + @Operation(summary = "查询故障记录列表",description = "查询故障记录列表") public Result> list(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.selectSysCarFaultLogList(sysCarFaultLog); return getDataTable(list); } + /** + * 查询故障记录状态为忽略的数据列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/listStatusIgnore") + @Operation(summary = "查询故障记录状态为忽略的数据列表",description = "查询故障记录状态为忽略的数据列表") public Result>listStatusIgnore(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusIgnore(sysCarFaultLog); @@ -42,29 +59,51 @@ public class SysCarFaultLogController extends BaseController { } - - + /** + * 查询故障记录状态为已解决的数据列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/listStatusSolve") + @Operation(summary = "查询故障记录状态为已解决的数据列表",description = "查询故障记录状态为已解决的数据列表") public Result>listStatusSolve(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusSolve(sysCarFaultLog); return getDataTable(list); } + /** + * 查询故障记录状态为处理中的数据列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/listStatusProcess") + @Operation(summary = "查询故障记录状态为处理中的数据列表",description = "查询故障记录状态为处理中的数据列表") public Result>listStatusProcess(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusProcess(sysCarFaultLog); return getDataTable(list); } + /** + * 新增故障记录 + * @param sysCarFaultLog + * @return + */ @PostMapping("/add") + @Operation(summary = "新增故障记录",description = "新增故障记录") public Result add(@RequestBody SysCarFaultLog sysCarFaultLog){ return toAjax(service.save(sysCarFaultLog)); } + /** + * 导出故障记录 + * @param response + * @param sysCarFaultLog + */ @PostMapping("/export") + @Operation(summary = "导出故障记录",description = "导出故障记录") public void export(HttpServletResponse response, SysCarFaultLog sysCarFaultLog){ List list = service.selectSysCarFaultLogList(sysCarFaultLog); ExcelUtil util = new ExcelUtil(SysCarFaultLog.class); @@ -72,11 +111,12 @@ public class SysCarFaultLogController extends BaseController { } /** - * 修改为忽略 + * 把处理中的数据修改为忽略 * @param idsStr * @return */ @PutMapping("/updateStatusById/{ids}") + @Operation(summary = "把处理中的数据修改为忽略",description = "把处理中的数据修改为忽略") public Result updateStatusById(@PathVariable("ids")String idsStr){ Long[] ids = Arrays.stream(idsStr.split(",")) .map(Long::valueOf) diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java index 6446fb1..c621dd6 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java @@ -6,6 +6,9 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.domain.SysCarFaultMessage; import com.muyu.server.service.SysCarFaultMessageService; +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.web.bind.annotation.*; @@ -14,22 +17,25 @@ import java.util.List; /** * 站内信 接口控制层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.controller * @name: SysCarFaultMessageController * @date: 2024/9/22 14:39 */ @RestController @RequestMapping("/message") +@Log4j2 +@Tag(name = "站内信",description = "站内信管理") public class SysCarFaultMessageController extends BaseController { @Autowired private SysCarFaultMessageService service; /** - * 查询所有故障信息 + * 查询所有站内信信息 * @return */ @GetMapping("/list") + @Operation(summary = "查询所有站内信信息",description = "查询所有站内信信息") public Result> list(){ startPage(); List list = service.list(); @@ -37,11 +43,12 @@ public class SysCarFaultMessageController extends BaseController { } /** - * 查询状态为1的故障信息 + * 查询状态为已读的信息 * @return */ @GetMapping("/listStatusOne") + @Operation(summary ="查询状态为以解决的故障信息",description = "查询状态为已解决的故障信息") public Result>listStatusOne(){ startPage(); List list = service.listStatusOnt(); @@ -49,10 +56,11 @@ public class SysCarFaultMessageController extends BaseController { } /** - * 查询状态为2的故障信息 + * 查询状态为未读的信息 * @return */ @GetMapping("/listStatusTwo") + @Operation(summary = "查询状态为未读的信息",description = "查询状态为未读的信息") public Result>listStatusTwo(){ startPage(); List list = service.listStatusTwo(); @@ -64,6 +72,7 @@ public class SysCarFaultMessageController extends BaseController { * @return */ @PutMapping("/updateStatusById/{id}") + @Operation(summary = "修改未读站内信息为已读",description = "修改未读站内信息为已读") public Result updateStatusById(@PathVariable("id")Long id){ UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id",id); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java index 465dd39..817a2ae 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java @@ -12,7 +12,13 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; +/** + * 车辆日志管理 接口控制层 + * @author liuxinyue + * @package: com.muyu.breakdown.controller + * @name: SysCarLogController + * @date: 2024/9/22 14:39 + */ @RestController @RequestMapping("/sysCarLog") diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java index 36f5980..c087753 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java @@ -6,6 +6,7 @@ import com.muyu.server.service.TemplateService; 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.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +20,8 @@ import java.util.List; import java.util.concurrent.ExecutionException; /** - * @Author：liuxinyue + * 报文模版管理 + * @author liuxinyue * @Package：com.template.controller * @Project：cloud-server-c * @name：TemplateController @@ -29,6 +31,7 @@ import java.util.concurrent.ExecutionException; @RequestMapping("/template") @AllArgsConstructor @Tag(name = "报文模版管理",description = "报文模版管理") +@Log4j2 public class TemplateController { @Autowired diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateNeedController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateNeedController.java index 98cbee6..635f2b7 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateNeedController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateNeedController.java @@ -3,20 +3,34 @@ package com.muyu.server.controller; import com.muyu.common.core.domain.Result; import com.muyu.server.service.TemplateNeedService; +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.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 查询报文模版 + * @author sx + * @Package：com.template.controller + * @name：templateNeed + * @Date：2024/9/20 12:12 + */ + @RestController @RequestMapping("/templateNeed") +@Tag(name = "查询报文模版",description = "查询报文模版") +@Log4j2 public class TemplateNeedController { @Autowired private TemplateNeedService templateNeedService; @GetMapping("/selectByTemplateId/{templateId}") + @Operation(summary = "根据模板ID查询报文模版",description = "根据模板ID查询报文模版") public Result selectByTemplateId(@PathVariable("templateId") Long templateId){ return Result.success(templateNeedService.selectByTemplateId(templateId)); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnLogsController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnLogsController.java index db9e4cf..ecf0e6a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnLogsController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnLogsController.java @@ -2,6 +2,9 @@ package com.muyu.server.controller; import com.muyu.common.domain.WarnLogs; import com.muyu.server.service.WarnLogsService; +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.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -20,6 +23,8 @@ import com.muyu.common.core.domain.Result; */ @RestController @RequestMapping("/logs") +@Tag(name = "预警日志",description = "预警日志管理") +@Log4j2 public class WarnLogsController extends BaseController { @Autowired @@ -29,6 +34,7 @@ public class WarnLogsController extends BaseController * 查询预警日志列表 */ @GetMapping("/selectWarnLogsList") + @Operation(summary = "预警日志列表",description = "预警日志列表") public Result selectWarnLogsList(){ return Result.success(warnLogsService.selectWarnLogsList()); } @@ -38,6 +44,7 @@ public class WarnLogsController extends BaseController * 获取预警日志详细信息 */ @GetMapping(value = "selectWarnLogsById/{id}") + @Operation(summary = "根据ID查询预警日志信息",description = "根据ID查询预警日志信息") public Result selectWarnLogsById(@PathVariable("id") Long id) { return success(warnLogsService.selectWarnLogsById(id)); @@ -47,6 +54,7 @@ public class WarnLogsController extends BaseController * 新增预警日志 */ @PostMapping("/addWarnLogs") + @Operation(summary = "新增预警日志",description = "新增预警日志") public Result addWarnLogs(@RequestBody WarnLogs warnLogs) { int i = warnLogsService.addWarnLogs(warnLogs); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnRuleController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnRuleController.java index 8400742..f529ed9 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnRuleController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnRuleController.java @@ -6,6 +6,9 @@ import javax.annotation.Resource; import com.muyu.common.domain.WarnRule; import com.muyu.server.service.WarnRuleService; +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; @@ -24,6 +27,8 @@ import com.muyu.common.core.domain.Result; */ @RestController @RequestMapping("/rule") +@Tag(name = "预警规则管理",description = "预警规则管理") +@Log4j2 public class WarnRuleController extends BaseController { @Resource @@ -33,6 +38,7 @@ public class WarnRuleController extends BaseController * 查询预警规则列表 */ @GetMapping("/selectWarnRuleRespList") + @Operation(summary = "预警规则列表",description = "预警规则列表") public Result selectWarnRuleRespList() { return Result.success(warnRuleService.selectWarnRuleRespList()); @@ -43,6 +49,7 @@ public class WarnRuleController extends BaseController */ @GetMapping(value = "selectById/{id}") + @Operation(summary = "根据ID查询预警规则信息",description = "根据ID查询预警规则信息") public Result> selectById(@PathVariable("id") Long id) { return success(warnRuleService.selectWarnRuleById(id)); @@ -53,6 +60,7 @@ public class WarnRuleController extends BaseController */ @PostMapping("/addWarnRule") + @Operation(summary = "新增预警规则",description = "新增预警规则") public Result addWarnRule(@RequestBody WarnRule warnRule) { int i = warnRuleService.addWarnRule(warnRule); @@ -64,6 +72,7 @@ public class WarnRuleController extends BaseController */ @PostMapping("/updWarnRule") + @Operation(summary = "修改预警规则",description = "修改预警规则") public Result updWarnRule(@RequestBody WarnRule warnRule) { int i = warnRuleService.updWarnRule(warnRule); @@ -74,6 +83,7 @@ public class WarnRuleController extends BaseController * 删除预警规则 */ @DeleteMapping("/{ids}") + @Operation(summary = "删除预警规则",description = "删除预警规则") public Result remove(@PathVariable("ids") Long[] ids) { warnRuleService.removeBatchByIds(Arrays.asList(ids)); @@ -84,6 +94,7 @@ public class WarnRuleController extends BaseController //根据策略ID查规则 @GetMapping("/selectListByStrategyId/{strategyId}") + @Operation(summary = "根据策略ID查询预警规则列表",description = "根据策略ID查询预警规则列表") public Result selectListByStrategyId(@PathVariable("strategyId") Long strategyId){ return Result.success(warnRuleService.selectListByStrategyId(strategyId)); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/DeleteEnterpriseByIds.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/DeleteEnterpriseByIds.java index 761cb1c..bddb495 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/DeleteEnterpriseByIds.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/DeleteEnterpriseByIds.java @@ -4,7 +4,8 @@ import jakarta.validation.constraints.NotEmpty; import lombok.Data; /** - * @Author YuPing + * 删除企业信息 + * @author yuping * @Description 删除企业信息 * @Version 1.0 * @Data 2024-09-26 22:05:47 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java index cb5e206..ef2c82e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java @@ -5,10 +5,11 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; /** - * @Author YuPing - * @Description 新增企业信息表单 - * @Version 1.0 - * @Data 2024-09-26 21:16:06 + * 新增企业信息表单 + * @author yuping + * @package com.muyu.server.controller.form + * @name InsertEnterprise + * @Date 2024/9/29 12:06 */ @Data public class InsertEnterprise { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/SearchEnterpriseName.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/SearchEnterpriseName.java index b859940..d58eb70 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/SearchEnterpriseName.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/SearchEnterpriseName.java @@ -6,10 +6,11 @@ import lombok.Data; import org.hibernate.validator.constraints.Range; /** - * @Author YuPing - * @Description 企业名称查询表单 - * @Version 1.0 - * @Data 2024-09-26 20:48:33 + * 企业名称查询表单 + * @author yuping + * @package com.muyu.server.controller.form + * @name SearchEnterpriseName + * @Date 2024/9/29 12:06 */ @Data public class SearchEnterpriseName { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java index 823b08c..2b62125 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java @@ -7,10 +7,11 @@ import jakarta.validation.constraints.Pattern; import lombok.Data; /** - * @Author YuPing - * @Description 修改企业信息 - * @Version 1.0 - * @Data 2024-09-26 21:22:05 + * 修改企业信息 + * @author yuping + * @package com.muyu.server.controller.form + * @name UpdateEnterprise + * @Date 2024/9/29 12:06 */ @Data public class UpdateEnterprise { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java index 829a018..9d51011 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java @@ -9,6 +9,13 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +/** + * 车辆类型Mapper接口 + * @author sx + * @package com.muyu.server.mapper + * @name CarTypeMapper + * @Date 2024/9/29 12:06 + */ @Mapper public interface CarTypeMapper extends BaseMapper { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java index 3f41996..18aa66a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java @@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 故障记录日志 管理层 - * @author YuanZiLong + * 故障记录日志 Mapper接口 + * @author 袁子龙 * @package com.muyu.breakdown.mapper * @name: SysCarFaultLogMapper * @date: 2024/9/22 21:06 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 5cebf68..2ef819c 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 @@ -9,7 +9,7 @@ import java.util.List; /** * 车辆故障码 管理层 - * @author YuanZiLong + * @author 袁子龙 * @Package: com.muyu.breakdown.mapper * @Name: SysCarFaultMapper * @Date: 2024/9/20 10:57 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 e02c29b..5d4622a 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 @@ -9,7 +9,7 @@ import java.util.List; /** * 站内信 管理层 - * @author YuanZiLong + * @author 袁子龙 * @packer: com.muyu.breakdown.mapper * @name: SysCarFaultMessageMapper * @date: 2024/9/22 11:59 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 df697b2..d57d045 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 @@ -19,4 +19,8 @@ public interface SysCarMapper extends BaseMapper { List findFenceByCarVin(@Param("carVin") String carVin); + 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/WarnLogsMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnLogsMapper.java index 0b9f30e..0e646bd 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnLogsMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnLogsMapper.java @@ -9,10 +9,11 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 预警日志Mapper接口 - * - * @author muyu - * @date 2024-09-20 + * 车辆预警日志 Mapper 接口 + * @author sx + * @package com.muyu.server.mapper + * @name WarnLogsMapper + * @date 2024-09-29 12:21:09 */ @Mapper public interface WarnLogsMapper extends BaseMapper { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java index 2d26ae4..dea891a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java @@ -11,8 +11,9 @@ import java.util.List; /** * 预警规则Mapper接口 - * - * @author muyu + * @author sx + * @package com.muyu.server.mapper + * @name WarnRuleMapper * @date 2024-09-20 */ @Mapper 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 0a92ac2..156ae7c 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,8 +12,9 @@ import java.util.List; /** * 预警策略Mapper接口 - * * @author muyu + * @package com.muyu.server.mapper + * @name WarnStrategyMapper * @date 2024-09-20 */ @Mapper diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java index 633bf3f..0770a9a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java @@ -7,7 +7,7 @@ import java.util.List; /** * 车辆故障记录 服务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service * @name: SysCarFaultLogService * @date: 2024/9/22 21:07 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java index 76ce658..41a76c0 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java @@ -7,7 +7,7 @@ import java.util.List; /** * 站内信 服务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service * @name: SysCarFaultMessageService * @date: 2024/9/22 14:35 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 4ef0f74..37cad97 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 @@ -7,7 +7,7 @@ import java.util.List; /** * 车辆故障码 服务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service * @name : SysCarFaultService * @date: 2024/9/20 10:57 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java index 1e5fc57..f9c0228 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java @@ -22,4 +22,5 @@ public interface SysCarService { SysCar findCarByVin(String carVin); + } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java index 94378dd..a58bc5a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java @@ -11,7 +11,7 @@ import java.util.List; /** * 车辆故障记录 业务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service.impl * @name: sysCarFaultLogServiceImpl * @date: 2024/9/22 21:07 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 244caaa..17551e0 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 @@ -12,7 +12,7 @@ import java.util.List; /** * 站内信 业务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service.impl * @name: SysCarFaultMessageServiceImpl * @date: 2024/9/22 14:36 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 ef2ac45..b931a71 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 @@ -14,7 +14,7 @@ import java.util.List; /** * 车辆故障码 业务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service.impl * @name: SysCarFaultServiceImpl * @date: 2024/9/20 10:58 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 d95d684..206099b 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 @@ -1,5 +1,6 @@ package com.muyu.server.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.domain.SysCar; @@ -13,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; +@DS("lizzDB") @Service public class SysCarServiceImpl extends ServiceImpl implements SysCarService { @Autowired @@ -51,7 +53,8 @@ public class SysCarServiceImpl extends ServiceImpl impleme public SysCar findCarByVin(String carVin) { QueryWrapper sysCarQueryWrapper = new QueryWrapper<>(); sysCarQueryWrapper.eq("car_vin", carVin); - SysCar sysCar = sysCarMapper.selectOne(sysCarQueryWrapper); - return sysCar; + List sysCars = sysCarMapper.selectList(sysCarQueryWrapper); + return sysCars.isEmpty() ? null : sysCars.get(0); } + } 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 31b3b5a..34b0814 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 @@ -66,6 +66,7 @@ public class TemplateServiceImpl extends ServiceImpl i log.info("carVin码为:" + carVin); //根据VIN码获取车辆信息 SysCar carByVin = sysCarService.findCarByVin(carVin); + log.info("车辆信息为:" + carByVin); //对应车辆所对应的报文模版 Integer templateId = carByVin.getTemplateId(); @@ -102,6 +103,7 @@ public class TemplateServiceImpl extends ServiceImpl i jsonObject.put(messageTemplateType.getMessageField(), result.substring(startIndex, endIndex)); } + System.out.println("哈哈哈红红火火恍恍惚惚"); log.info("解析后的报文是:" + jsonObject); diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml index 437579a..792d531 100644 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml +++ b/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml @@ -74,4 +74,10 @@ WHERE sys_car_fault_log.vin = #{carVin}; + + diff --git a/pom.xml b/pom.xml index addb590..45354ea 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,11 @@ cloud-common-saas ${muyu.version} + + com.muyu + cloud-common-swagger + ${muyu.version} +