Compare commits

..

No commits in common. "6dde202353361f21c0f7249c34f169c518d35a33" and "226c4272555ac6e6492d3464a21a8777f7295074" have entirely different histories.

127 changed files with 969 additions and 2714 deletions

View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: wx
namespace: xyr
# Spring
spring:
application:

View File

@ -27,11 +27,6 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-redis</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
</dependencies>
</project>

View File

@ -1,46 +0,0 @@
package com.muyu.common.domain;
import com.muyu.common.system.domain.SysDept;
import com.muyu.domain.SysCar;
import com.muyu.domain.WarnLogs;
import com.muyu.domain.resp.FaultConditionTotalListResp;
import com.muyu.domain.resp.FenceGroupResp;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.List;
/**
* @Author WangXin
* @Data 2024/9/30
* @Description
* @Version 1.0.0
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class InformationData {
/**
*
*/
private SysCar sysCar;
/**
*
*/
private SysDept sysDept;
/**
*
*/
private FenceGroupResp fenceGroupResp;
/**
*
*/
private FaultConditionTotalListResp faultConditionTotalListResp;
/**
*
*/
private List<WarnLogs> warnLogsList;
}

View File

@ -22,16 +22,10 @@
</properties>
<dependencies>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-redis</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,44 +0,0 @@
package com.muyu.common.caffeine.bean;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.muyu.common.caffeine.enums.CacheNameEnums;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.CacheManager;
import org.springframework.cache.caffeine.CaffeineCache;
import org.springframework.cache.support.SimpleCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Caffeine
* @Author: WangXin
* @Name: CaffeineCacheConfig
* @Description: Caffeine
*/
@Slf4j
@Component
public class CaffeineManager {
/**
*
* @return
*/
@Bean
public CacheManager cacheManager() {
SimpleCacheManager cacheManager = new SimpleCacheManager();
List<String> cacheNames = CacheNameEnums.getCodes();
cacheManager.setCaches(cacheNames.stream()
.map(name -> new CaffeineCache(
name,
Caffeine.newBuilder()
.recordStats()
.build()))
.toList());
log.info("缓存管理器初始化完成,缓存分区:{}", cacheNames);
return cacheManager;
}
}

View File

@ -1,15 +0,0 @@
package com.muyu.common.caffeine.constents;
/**
* Caffeine
* @Author: WangXin
* @Name: CaffeineContent
* @Description: Caffeine
*/
public class CaffeineContent {
public static final String CAR_VIN_KEY = "car:vin";
public static final String VIN = "vin";
}

View File

@ -1,66 +0,0 @@
package com.muyu.common.caffeine.enums;
import lombok.Getter;
import java.util.Arrays;
import java.util.List;
/**
*
*
* @Author: WangXin
* @Name: CacheNameEnums
* @Description:
*/
@Getter
public enum CacheNameEnums {
STORAGE("storage", "持久化"),
FAULT("fault", "故障"),
FENCE("fence", "围栏"),
WARMING("warming", "预警"),
REALTIME("realTime", "实时信息");
private final String code;
private final String info;
CacheNameEnums(String code, String info) {
this.code = code;
this.info = info;
}
/**
*
*
* @param code
* @return turn, false
*/
public static boolean isCode(String code) {
return Arrays.stream(values())
.map(CacheNameEnums::getCode)
.anyMatch(c -> c.equals(code));
}
/**
* Value
* @param code
* @return Value
*/
public static String getInfo(String code) {
return Arrays.stream(values())
.filter(c -> c.getCode().equals(code))
.map(CacheNameEnums::getInfo)
.findFirst()
.orElse("");
}
/**
* code
* @return code
*/
public static List<String> getCodes() {
return Arrays.stream(values())
.map(CacheNameEnums::getCode)
.toList();
}
}

View File

@ -1,89 +0,0 @@
package com.muyu.common.caffeine.utils;
import com.muyu.common.caffeine.enums.CacheNameEnums;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cache.CacheManager;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
/**
* Caffeine
* @Author: WangXin
* @Name: CaffeineUtils
* @Description:
* @CreatedDate: 2024/9/26 2:53
* @FilePath: com.muyu.common.caffeine
*/
@Slf4j
@Component
public class CaffeineCacheUtils {
@Resource
private CacheManager cacheManager;
@Resource
private RedisTemplate<String, String> redisTemplate;
/**
* 线 -
*/
public void addCarCache(String vin) {
// 从Redis中获取缓存信息
for (String name : CacheNameEnums.getCodes()) {
String value = redisTemplate.opsForValue().get(name+":"+vin);
cacheManager.getCache(name).put(vin, value);
log.info("存储缓存, 缓存分区:[{}], 车辆编码:[{}], 存储值:[{}]", name, vin, value);
}
log.info("车辆编码:{},本地缓存完成...",vin);
}
/**
* 线 -
*/
public void deleteCarCache(String cacheName) {
if (!hasCarVinCache(cacheName,null)) {
log.warn("车辆编码:{},本地缓存不存在该车辆信息...", cacheName);
return;
}
cacheManager.getCache(cacheName).invalidate();
log.info("车辆编码:{},本地缓存删除完成...", cacheName);
}
/**
*
*/
public Object getCarCache(String cacheName, String key) {
if (!hasCarVinCache(cacheName, key)){
log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName);
return null;
}
return cacheManager.getCache(cacheName).get(key).get();
}
/**
*
*/
public <T> T getCarCache(String cacheName, String key, Class<T> type) {
if (!hasCarVinCache(cacheName,key)){
log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName);
return null;
}
return cacheManager.getCache(cacheName).get(key, type);
}
/**
*
*/
public Boolean hasCarVinCache(String cacheName,String key) {
boolean notEmpty = ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName));
if (notEmpty && StringUtils.isNotEmpty(key)){
return ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName).get(key).get());
}
return notEmpty;
}
}

View File

@ -1,2 +0,0 @@
com.muyu.common.caffeine.utils.CaffeineCacheUtils
com.muyu.common.caffeine.bean.CaffeineManager

View File

@ -3,9 +3,9 @@ package com.muyu.common.core.domain;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.constant.HttpStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serializable;
@ -15,7 +15,7 @@ import java.io.Serializable;
* @author muyu
*/
@Data
@SuperBuilder
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class Result<T> implements Serializable {
@ -33,7 +33,6 @@ public class Result<T> implements Serializable {
public static final int WARN = HttpStatus.WARN;
private static final long serialVersionUID = 1L;
private int code;
private String msg;
@ -97,8 +96,8 @@ public class Result<T> implements Serializable {
private static <T> Result<T> restResult (T data, int code, String msg) {
return Result.<T>builder()
.code(code)
.msg(msg)
.data(data)
.msg(msg)
.build();
}

View File

@ -5,7 +5,7 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
public class ServiceException extends RuntimeException {
public final class ServiceException extends RuntimeException {
private static final long serialVersionUID = 1L;
/**

View File

@ -1,7 +1,6 @@
package com.muyu.common.core.web.controller;
import com.github.pagehelper.PageInfo;
import com.muyu.common.core.utils.DateUtils;
import com.muyu.common.core.utils.PageUtils;
import com.muyu.common.core.domain.Result;

View File

@ -12,7 +12,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.Field;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
@ -21,9 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.muyu.common.iotdb.constant.IotdbConstant.ROOT_DATA_DATAJSON;
import static com.muyu.common.iotdb.constant.IotdbConstant.SELECT_ROOT_DATA_DATAJSON_DATASOURCE;
/**
* @Author WangXin
* @Data 2024/9/30
@ -68,29 +64,18 @@ public class IotDBSessionConfig {
* @param deviceId
* @param time
* @param measurements
* @param value
* @param values
*/
public void insertRecord(SessionPool sessionPool,String deviceId,
long time, List<String> measurements,List<TSDataType> dataTypeList, JSONObject value) {
public void insertRecord(SessionPool sessionPool,String deviceId, long time, List<String> measurements, List<String> values) {
try {
log.info("iotdb数据入库device_id:[{}], measurements:[{}], values:[{}]", deviceId, measurements, value);
sessionPool.insertRecord(deviceId, time, measurements,dataTypeList,new Object[]{value.toJSONString()});
log.info("iotdb数据入库device_id:[{}], measurements:[{}], values:[{}]", deviceId, measurements, values);
sessionPool.insertRecord(deviceId, time, measurements, values);
} catch (Exception e) {
log.error("IotDBSession insertRecord失败: deviceId={}, time={}, measurements={}, values={}, error={}",
deviceId, time, measurements, value, e.getMessage());
deviceId, time, measurements, values, e.getMessage());
}
}
public void JSONObject(JSONObject value){
}
/**
* sql
* @param sessionPool
* @param sql
* @return
*/
public SessionDataSet selectRecord(SessionPool sessionPool,String sql) {
log.info("iotdb数据查询sql:[{}]",sql);
SessionDataSetWrapper sessionDataSetWrapper = null;
@ -105,29 +90,11 @@ public class IotDBSessionConfig {
}
public JSONObject getJsonFindByTime(SessionPool sessionPool,String fieldName,String deviceId,Long timestamp) {
String sql = String.format("SELECT %s FROM %s WHERE time = %d", fieldName, deviceId, timestamp);
SessionDataSet sessionDataSet = selectRecord(sessionPool, sql);
try {
while (sessionDataSet.hasNext()){
RowRecord next = sessionDataSet.next();
for (Field field : next.getFields()) {
String stringValue = field.getStringValue();
}
}
} catch (StatementExecutionException e) {
throw new RuntimeException(e);
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
}
return null;
}
public static void main(String[] args) {
SessionPool sessionPool = new SessionPool("127.0.0.1", 6667, "root", "root", 10);
String ROOT_DATA_DATAJSON = "root.car.data.datajson";
String SELECT_ROOT_DATA_DATAJSON_DATASOURCE = "select * from root.car.data.datajson";
String jsonValue = """
{
@ -143,13 +110,14 @@ public class IotDBSessionConfig {
}
}
""";
JSONObject value = JSONObject.parseObject(jsonValue);
IotDBSessionConfig iotDBSessionConfig = new IotDBSessionConfig();
List<String> measurements = List.of("datasource");
List<TSDataType> datatypeList = List.of(TSDataType.TEXT);
iotDBSessionConfig.insertRecord(sessionPool,ROOT_DATA_DATAJSON,System.currentTimeMillis(),measurements,datatypeList,value);
List<String> values = new ArrayList<>();
values.add(jsonValue);
ArrayList<String> objects = new ArrayList<>();
objects.add("datasource");
iotDBSessionConfig.insertRecord(sessionPool,ROOT_DATA_DATAJSON,System.currentTimeMillis(),objects,values);
SessionDataSet sessionDataSet = iotDBSessionConfig.selectRecord(sessionPool,SELECT_ROOT_DATA_DATAJSON_DATASOURCE);
@ -172,6 +140,7 @@ public class IotDBSessionConfig {
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
}
log.info("数据为:{}", JSONObject.toJSONString(longMapHashMap));
}

View File

@ -1,14 +0,0 @@
package com.muyu.common.iotdb.constant;
/**
* @Author WangXin
* @Data 2024/9/30
* @Description iotdb
* @Version 1.0.0
*/
public interface IotdbConstant {
String ROOT_DATA_DATAJSON = "root.car.data.datajson";
String SELECT_ROOT_DATA_DATAJSON_DATASOURCE = "select * from root.car.data.datajson";
}

View File

@ -1,27 +1,29 @@
package com.muyu.domain;
package com.muyu.common.iotdb.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.List;
/**
* @Author WangXin
* @Data 2024/9/30
* @Description
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class CarFirmMiddle {
public class EventActuate {
/**
* ID
* json
*/
private Long CarId;
private String jsonData;
/**
* ID
* key
*/
private Long firmId;
private List<String> eventKeys;
}

View File

@ -0,0 +1,20 @@
package com.muyu.common.iotdb.domain;
import com.muyu.common.iotdb.domain.dto.IotDbRecordAble;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class ResultEntity extends IotDbRecordAble {
private Float temperature;
private String hardware;
private Boolean status;
private String time;
}

View File

@ -0,0 +1,18 @@
package com.muyu.common.iotdb.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class TestDataType {
private Float temperature;
private String hardware;
private Boolean status;
private Double testDouble;
private Long testLong;
}

View File

@ -1 +1 @@
com.muyu.common.iotdb.config.IotDBSessionConfig
com.muyu.data.iotdb.config.IotDBSessionConfig

View File

@ -1,14 +0,0 @@
package com.muyu.common.kafka.constant;
/**
* @Author: WangXin
* @date: 2024/7/10
* @Description: kafka
* @Version 1.0.0
*/
public class KafkaConstants {
public final static String KafkaTopic = "kafka_topic";
public final static String KafkaGrop = "kafka_grop";
}

View File

@ -1,48 +0,0 @@
package com.muyu.common.rabbit.config;
import lombok.extern.log4j.Log4j2;
import org.springframework.amqp.rabbit.connection.CorrelationData;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
/**
*
*
*/
@Component
@Log4j2
public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback {
@Autowired
private RabbitTemplate rabbitTemplate;
/**
* @PostContructspringspring
*/
@PostConstruct
public void init() {
rabbitTemplate.setConfirmCallback(this);
}
/**
*
*
* @param correlationData
* @param ack
* @param cause
*/
@Override
public void confirm(CorrelationData correlationData, boolean ack, String cause) {
if (!ack) {
String exchange = correlationData.getReturned().getExchange();
String message = correlationData.getReturned().getMessage().getBody().toString();
// 发送异常
log.error("消息:{},发送到交换机:{}失败,原因是:{}", message, exchange, cause);
// TODO 可以把异常信息 以及 消息的内容直接添加到 MYSQL
}
}
}

View File

@ -0,0 +1,83 @@
package com.muyu.common.rabbit.config;
import com.muyu.common.rabbit.constants.RabbitmqConstants;
import org.springframework.amqp.core.*;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import javax.annotation.Resource;
import java.util.HashMap;
/**
* @ClassName: DelayedQueueConfig
* @Description:
*/
@Configuration
public class DelayedQueueConfig {
@Resource
private RabbitAdmin rabbitAdmin;
/**
*
* @return
*/
@Bean
public Queue delayedQueue() {
Queue queue = new Queue(RabbitmqConstants.DELAYED_QUEUE_NAME);
rabbitAdmin.declareQueue(queue);
return queue;
}
/**
*
* @return
*/
@Bean
public Exchange delayedExchange() {
HashMap<String, Object> arguments = new HashMap<>(3);
arguments.put("x-delayed-type", "direct");
/**
*
*
*
*
*
*
*/
CustomExchange customExchange = new CustomExchange(
RabbitmqConstants.DELAYED_EXCHANGE_NAME,
"x-delayed-message",
true,
false,
arguments);
rabbitAdmin.declareExchange(customExchange);
return customExchange;
}
/**
*
* @param delayedQueue
* @param delayedExchange
*/
@Bean
public Binding delayedQueueBindingDelayedExchange(
@Qualifier("delayedQueue") Queue delayedQueue,
@Qualifier("delayedExchange") Exchange delayedExchange) {
Binding noargs = BindingBuilder.bind(delayedQueue)
.to(delayedExchange)
.with(RabbitmqConstants.DELAYED_ROUTING_KEY)
.noargs();
rabbitAdmin.declareBinding(noargs);
return noargs;
}
}

View File

@ -0,0 +1,47 @@
package com.muyu.common.rabbit.config;
import lombok.AllArgsConstructor;
import org.springframework.amqp.rabbit.connection.CorrelationData;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
/**
* @ClassName:
* @Description:
*/
@Component
@AllArgsConstructor
public class MyConfirmCallback implements RabbitTemplate.ConfirmCallback {
private RabbitTemplate rabbitTemplate;
// public MyConfirmCallback(RabbitTemplate rabbitTemplate) {
// this.rabbitTemplate = rabbitTemplate;
// // 设置 消息发送到交换机成功 的回调
// this.rabbitTemplate.setConfirmCallback(this);
// }
@PostConstruct
public void init() {
this.rabbitTemplate.setConfirmCallback(this);
}
/**
*
*
* @param correlationData correlation data for the callback.
* @param ack true for ack, false for nack
* @param cause An optional cause, for nack, when available, otherwise null.
*/
@Override
public void confirm(CorrelationData correlationData, boolean ack, String cause) {
if (ack) {
System.out.println("消息发送到交换机成功~");
} else {
System.out.println("消息发送到交换机失败,失败的原因:" + cause);
}
}
}

View File

@ -0,0 +1,49 @@
package com.muyu.common.rabbit.config;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @ClassName: RabbitAdminConfig
* @Description: RabbitAdmin
*/
@Configuration
public class RabbitAdminConfig {
@Value("${spring.rabbitmq.host}")
private String host;
@Value("${spring.rabbitmq.username}")
private String username;
@Value("${spring.rabbitmq.password}")
private String password;
@Value("${spring.rabbitmq.virtualhost}")
private String virtualHost;
@Bean
public ConnectionFactory connectionFactory() {
CachingConnectionFactory cachingConnectionFactory = new CachingConnectionFactory();
cachingConnectionFactory.setHost(host);
cachingConnectionFactory.setUsername(username);
cachingConnectionFactory.setPassword(password);
cachingConnectionFactory.setVirtualHost(virtualHost);
return cachingConnectionFactory;
}
@Bean
public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) {
RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
rabbitAdmin.setAutoStartup(true);
return rabbitAdmin;
}
}

View File

@ -1,42 +0,0 @@
package com.muyu.common.rabbit.config;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.converter.MappingJackson2MessageConverter;
import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
import javax.annotation.Resource;
@Configuration
public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer {
static {
System.setProperty("spring.amqp.deserialization.trust.all", "true");
}
//以下配置RabbitMQ消息服务
@Resource
public ConnectionFactory connectionFactory;
/**
*
* @return
*/
@Bean
public DefaultMessageHandlerMethodFactory handlerMethodFactory() {
DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory();
// 这里的转换器设置实现了 通过 @Payload 注解 自动反序列化message body
factory.setMessageConverter(new MappingJackson2MessageConverter());
return factory;
}
@Override
public void configureRabbitListeners(RabbitListenerEndpointRegistrar rabbitListenerEndpointRegistrar) {
rabbitListenerEndpointRegistrar.setMessageHandlerMethodFactory(handlerMethodFactory());
}
}

View File

@ -0,0 +1,20 @@
package com.muyu.common.rabbit.config;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* JSON json
*/
@Configuration
public class RabbitmqConfig {
// 消息转换配置
@Bean
public MessageConverter jsonMessageConverter() {
return new Jackson2JsonMessageConverter();
}
}

View File

@ -1,41 +1,37 @@
package com.muyu.common.rabbit.config;
import lombok.extern.log4j.Log4j2;
import lombok.AllArgsConstructor;
import org.springframework.amqp.core.ReturnedMessage;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
/**
*
*
*/
@Component
@Log4j2
@AllArgsConstructor
public class ReturnCallbackConfig implements RabbitTemplate.ReturnsCallback {
@Autowired
private RabbitTemplate rabbitTemplate;
/**
* @PostContructspringspring
*/
@PostConstruct
private final RabbitTemplate rabbitTemplate;
@PostConstruct // @PostContruct是spring框架的注解在⽅法上加该注解会在项⽬启动的时候执⾏该⽅法也可以理解为在spring容器初始化的时候执
public void init() {
rabbitTemplate.setReturnsCallback(this);
}
/**
*
*
*
* @param returnedMessage the returned message and metadata.
*/
@Override
public void returnedMessage(ReturnedMessage returnedMessage) {
log.error("消息:{},被交换机:{} 回退!退回原因为:{}",
returnedMessage.getMessage().toString(), returnedMessage.getExchange(), returnedMessage.getReplyText());
// TODO 回退了所有的信息,可做补偿机制
System.out.println("消息" + returnedMessage.getMessage().toString() +
"被交换机" + returnedMessage.getExchange() + "回退!"
+ "退回原因为:" + returnedMessage.getReplyText());
// 回退了所有的信息,可做补偿机制 记录发送的日志
}
}

View File

@ -1,15 +0,0 @@
package com.muyu.common.rabbit.constants;
/**
* rabbit
* @Author: WangXin
* @date: 2024/7/10
* @Description: rabbit
* @Version 1.0.0
*/
public class RabbitConstants {
public final static String GO_ONLINE_QUEUE= "GoOnline";
public final static String DOWNLINE_QUEUE= "Downline";
}

View File

@ -0,0 +1,22 @@
package com.muyu.common.rabbit.constants;
/**
* @Author: WangXin
* @date: 2024/7/10
* @Description: rabbitmq
* @Version 1.0.0
*/
public class RabbitmqConstants {
//普通队列
public static final String BASIC_QUEUE_NAME = "BASIC_QUEUE_NAME";
public static final String lOG_QUEUE_NAME = "LOG_QUEUE_NAME";
//延迟队列
//队列名称
public static final String DELAYED_QUEUE_NAME = "delayed_queue";
//交换机名称
public static final String DELAYED_EXCHANGE_NAME = "DELAYED_EXCHANGE";
//交换机
public static final String DELAYED_ROUTING_KEY = "delayed";
}

View File

@ -0,0 +1,81 @@
package com.muyu.common.rabbit.consumer;
import com.alibaba.fastjson2.JSONObject;
import com.muyu.common.redis.service.RedisService;
import com.rabbitmq.client.Channel;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.amqp.core.Message;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.Date;
/**
* @ClassName: RabbitMQConsumerUtil
* @Description: rabbitmq
*/
@Component
@Log4j2
@AllArgsConstructor
public class RabbitMQConsumerUtil {
private final RedisService redisService;
/**
*
* @param data
* @param message
* @param channel
*/
public void rabbitMQBasicConsumer(Object data ,Message message , Channel channel) {
log.info("当前时间:{} RabbitMQConsumerUtil : {}", new Date(), message);
try {
// 获取到消息 开始消费
log.info("消息消费者接收到消息,消息内容:{}", JSONObject.toJSONString(data));
Long add = redisService.redisTemplate.opsForSet().add(data, message.getMessageProperties().getMessageId());
if (add != 1) {
return;
}
/**
* ---------------------------------------------------------------
*/
/**
* ------------------------------------------------------------------------------
*/
// 消费消息成功之后需要确认
// long deliveryTag 消息投递序号 自增的数字 在整个队列中唯一 拿到这个序号就相当于拿到这条消息
// boolean multiple 是否批量确认 true 批量 确认小于等于当前投递序号的消息 false 单个确认
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
log.info("xxx消费者接收到消息消息内容{},消费成功...", message);
} catch (Exception e) {
log.error("xxx消费者接收到消息消息内容{},消费消息异常,异常信息:{}", message, e);
// 消息回退 拒绝消费消息
// long deliveryTag 消息投递序号 自增的数字 在整个队列中唯一 拿到这个序号就相当于拿到这条消息
// boolean requeue 是否回到原来的队列
try {
channel.basicReject(message.getMessageProperties().getDeliveryTag(), true);
// channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, true);
} catch (IOException ex) {
log.error("xxx消费者接收到消息消息内容{},回退消息异常,异常信息:{}", message, ex);
}
}finally {
try {
channel.close();
} catch (Exception e) {
log.error("xxx消费者关闭Channel异常消息内容{},异常信息:{}", message, e);
}
}
}
}

View File

@ -0,0 +1,174 @@
package com.muyu.common.rabbit.producer;
import com.muyu.common.core.domain.Result;
import com.muyu.common.rabbit.constants.RabbitmqConstants;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.amqp.core.MessageProperties;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
import java.util.UUID;
/**
* @ClassName: RabbitMQProducer
* @Description: rabbitmq
*/
@Component
@AllArgsConstructor
@Log4j2
public class RabbitMQProducerUtil {
//redis工具类对象
//rabbit
private final RabbitTemplate rabbitTemplate;
/**
*
*
* @param param
* @return
*
*/
public Result<?> basicSendMessage(String queueName, Object param, String msg) {
log.info("【简单模型mq】 : method: 【 basicSendMessage 】 - ages: 【 String : {}, Object : {}, String : {} 】 ---> 【 消息发送中。。。 】", RabbitmqConstants.BASIC_QUEUE_NAME, param, msg);
// 发送简单模型消息
// 第一个参数: 绑定规则 相当于 队列名称
// 第二个参数:消息内容
rabbitTemplate.convertAndSend(queueName, param, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
return message;
} );
log.info("【简单模型mq】 : method: 【 basicSendMessage 】- queue: 【 {} 】 ---> 【 消息发送成功 】", RabbitmqConstants.BASIC_QUEUE_NAME);
return Result.success(msg!=null?msg:"消息发送成功");
}
/**
* Work queue
*
* @param obj
* @return
*
*/
public Result<?> workSendMessage(String queueName, Object obj, String msg) {
log.info("【工作模型mq】 : method: 【 workSendMessage 】 - ages: 【 String : {}, Object : {}, String : {} 】 ---> 【 消息发送中。。。 】", queueName, obj, msg);
// 发送简单模型消息
// 第一个参数: 绑定规则 相当于 队列名称
// 第二个参数:消息内容
rabbitTemplate.convertAndSend(queueName, obj, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
return message;
} );
log.info("【工作模型mq】 : method: 【 workSendMessage 】- queue: 【 {} 】 ---> 【 消息发送成功 】", queueName);
return Result.success("消息发送成功");
}
/**
* Publish/Subscribe
* fanout
*
* @param exchange
* @param obj Object
* @param msg
* @return
*/
public Result<?> publishSubscribeSendMessage(String exchange, Object obj, String msg) {
log.info("【订阅模型mq】 : method: 【 workSendMessage 】 - ages: 【 String : {}, Object : {}, String : {} 】 ---> 【 消息发送中。。。 】", exchange, obj, msg);
// 发送简单模型消息
// 第一个参数: exchange 交换机的名称
// 第二个参数: 绑定规则 发布订阅者模型 不写 默认 "" 只要绑定就行 不需要规则
// 第三个参数:消息内容
rabbitTemplate.convertAndSend(exchange, "", obj, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
return message;
} );
log.info("【订阅模型mq】 : method: 【 workSendMessage 】- exchange: 【 {} 】 ---> 【 消息发送成功 】", exchange);
return Result.success("消息发送成功");
}
/**
* Routing
* 使 Direct Queue()
*
* @param exchange
* @param rule
* @param obj Object
* @param msg
* @return
*/
public Result<?> routingSendMessage(String exchange, String rule, Object obj, String msg) {
log.info("【路由模型mq】 : method: 【 workSendMessage 】 - ages: 【 String : {}, Object : {}, String : {} 】 ---> 【 消息发送中。。。 】", exchange, obj, msg);
// 发送简单模型消息
// 第一个参数: 绑定规则 相当于 队列名称
// 第二个参数:消息内容
rabbitTemplate.convertAndSend(exchange, rule, obj, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
return message;
} );
log.info("【路由模型mq】 : method: 【 workSendMessage 】- exchange: 【 {} 】 ---> 【 消息发送成功 】", exchange);
return Result.success("消息发送成功");
}
/**
* Topic
* 使 topic
*
* @param exchange
* @param rule . 使 #( ) *( ) name.msg, *.msg, age.#
* @param obj Object
* @param msg
* @return
*/
public Result<?> topicSendMessage(String exchange, String rule, Object obj, String msg) {
log.info("【主题模型mq】 : method: 【 workSendMessage 】 - ages: 【 String : {}, Object : {}, String : {} 】 ---> 【 消息发送中。。。 】", exchange, obj, msg);
// 发送简单模型消息
// 第一个参数: 绑定规则 相当于 队列名称
// 第二个参数:消息内容
rabbitTemplate.convertAndSend(exchange, rule, obj, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
return message;
} );
log.info("【主题模型mq】 : method: 【 workSendMessage 】- exchange: 【 {} 】 ---> 【 消息发送成功 】", exchange);
return Result.success(obj,"消息发送成功");
}
/**
*
* @param param
* @param delayTime
* @return
*/
public Result<?> delayedSendMessage(Long delayTime, Object param) {
log.info("【延迟队列模型】 : method: 【 delayedSendMessage 】 消息内容:{}---> 【 消息发送中。。。 】",param);
rabbitTemplate.convertAndSend(RabbitmqConstants.DELAYED_EXCHANGE_NAME, RabbitmqConstants.DELAYED_ROUTING_KEY,param, message -> {
MessageProperties messageProperties = message.getMessageProperties();
messageProperties.setMessageId(UUID.randomUUID().toString());
messageProperties.setDelayLong(delayTime);
return message;
});
log.info("【延迟队列模型】 : method: 【 delayedSendMessage 】 消息内容:{}---> 【 消息发送成功 】",param);
return Result.success(param,"消息发送成功");
}
}

View File

@ -1,3 +1,7 @@
com.muyu.common.rabbit.config.RabbitListenerConfigurer
com.muyu.common.rabbit.config.ConfirmCallbackConfig
com.muyu.common.rabbit.config.ReturnCallbackConfig
com.muyu.rabbitmq.producer.RabbitMQProducerUtil
com.muyu.rabbitmq.consumer.RabbitMQConsumerUtil
com.muyu.rabbitmq.config.RabbitmqConfig
com.muyu.rabbitmq.config.MyConfirmCallback
com.muyu.rabbitmq.config.DelayedQueueConfig
com.muyu.rabbitmq.config.RabbitAdminConfig
com.muyu.rabbitmq.config.ReturnCallbackConfig

View File

@ -1,111 +0,0 @@
package com.muyu.cloud.common.many.datasource;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
import com.muyu.cloud.common.saas.domain.model.EntInfo;
import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory;
import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo;
import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
import com.muyu.cloud.common.saas.exception.SaaSException;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.UserConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.SpringUtils;
import com.muyu.common.system.domain.SysDept;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.remote.RemoteUserService;
import lombok.extern.log4j.Log4j2;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Author: DongZeLiang
* @date: 2024/6/3
* @Description:
* @Version: 1.0
*/
@Log4j2
@Configuration
@AutoConfiguration(before = MybatisPlusAutoConfiguration.class)
public class ManyDataSource implements ApplicationRunner {
private List<EntInfo> dataSourceInfoList(){
RemoteUserService RemoteUserService = SpringUtils.getBean(RemoteUserService.class);
Result<List<String>> listResult = RemoteUserService.selectFirmDatabaseList(SecurityConstants.INNER);
if (listResult==null){
throw new SaaSException("saas远调数据源错误");
}
List<String> data = listResult.getData();
if (listResult.getCode() ==Result.SUCCESS && data !=null){
List<EntInfo> list = new ArrayList<>();
for (String row : data) {
list.add(
EntInfo.builder()
.entCode(row)
.ip(DatasourceContent.IP)
.port(DatasourceContent.PORT)
.build()
);
}
return list;
}else {
log.error("远调数据源错误,远调数据为:{}", JSON.toJSONString(data));
throw new RuntimeException("远调数据源错误,远调--》 companyList ");
}
}
// private List<EntInfo> dataPrimarySourceInfoList(){
// List<EntInfo> list = new ArrayList<>();
// list.add(
// EntInfo.builder()
// .entCode()
// .ip(DatasourceContent.IP)
// .port(DatasourceContent.PORT)
// .build()
// );
// return list;
// }
@Bean
public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) {
// 企业列表 企业CODE端口IP
Map<Object, Object> dataSourceMap = new HashMap<>();
dataSourceInfoList()
.stream()
.map(entInfo -> DataSourceInfo.hostAndPortBuild(entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort()))
.forEach(dataSourceInfo -> {
dataSourceMap.put(dataSourceInfo.getKey(), druidDataSourceFactory.create(dataSourceInfo));
});
//设置动态数据源
DynamicDataSource dynamicDataSource = new DynamicDataSource();
// dynamicDataSource.setDefaultTargetDataSource(masterDataSource());
dynamicDataSource.setTargetDataSources(dataSourceMap);
//将数据源信息备份在defineTargetDataSources中
dynamicDataSource.setDefineTargetDataSources(dataSourceMap);
return dynamicDataSource;
}
@Override
public void run(ApplicationArguments args) throws Exception {
DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class);
DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);
for (EntInfo entInfo : dataSourceInfoList()) {
DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(
entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort()
);
DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo);
dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource);
log.info("存储数据连接池为key:{}",dataSourceInfo.getKey());
}
}
}

View File

@ -1,19 +0,0 @@
package com.muyu.cloud.common.many.datasource.constents;
/**
* @author DongZl
* @description:
* @Date 2023-8-1 11:02
*/
public class DatasourceContent {
public final static String DATASOURCE_URL = "jdbc:mysql://{}:{}/{}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
public final static String USER_NAME = "root";
public final static String PASSWORD = "wx0713101x";
public final static String IP = "127.0.0.1";
public final static Integer PORT = 3307;
}

View File

@ -1,50 +0,0 @@
package com.muyu.cloud.common.many.datasource.domain.model;
import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
import com.muyu.common.core.utils.StringUtils;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author DongZl
* @description:
* @Date 2023-8-1 11:15
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DataSourceInfo {
/**
*
*/
private String key;
/**
*
*/
private String url;
/**
*
*/
private String userName;
/**
*
*/
private String password;
public static DataSourceInfo hostAndPortBuild(String key, String host, Integer port) {
return DataSourceInfo.builder()
.key(key)
.url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host, port, key))
.password(DatasourceContent.PASSWORD)
.userName(DatasourceContent.USER_NAME)
.build();
}
}

View File

@ -1,39 +0,0 @@
package com.muyu.cloud.common.many.datasource.factory;
import com.alibaba.druid.pool.DruidDataSource;
import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Component;
import java.sql.SQLException;
/**
* @Author: DongZeLiang
* @date: 2024/6/3
* @Description: Druid
* @Version: 1.0
*/
@Log4j2
@Component
public class DruidDataSourceFactory {
/**
* @Description:
*/
public DruidDataSource create(DataSourceInfo dataSourceInfo) {
DruidDataSource druidDataSource = new DruidDataSource();
druidDataSource.setUrl(dataSourceInfo.getUrl());
druidDataSource.setUsername(dataSourceInfo.getUserName());
druidDataSource.setPassword(dataSourceInfo.getPassword());
druidDataSource.setBreakAfterAcquireFailure(true);
druidDataSource.setConnectionErrorRetryAttempts(0);
try {
druidDataSource.getConnection(2000);
log.info("{} -> 数据源连接成功", dataSourceInfo.getKey());
return druidDataSource;
} catch (SQLException throwables) {
log.error("数据源 {} 连接失败,用户名:{},密码 {}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword());
return null;
}
}
}

View File

@ -1,42 +0,0 @@
package com.muyu.cloud.common.many.datasource.holder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
/**
*
*
* @author Dongzl
*/
@Slf4j
public class DynamicDataSourceHolder {
/**
*
*/
private static final ThreadLocal<String> DYNAMIC_DATASOURCE_KEY = new ThreadLocal<>();
/**
* /线使
*/
public static void setDynamicDataSourceKey(String key){
log.info("数据源切换为:{}",key);
DYNAMIC_DATASOURCE_KEY.set(key);
}
/**
* 使mater
*/
public static String getDynamicDataSourceKey(){
String key = DYNAMIC_DATASOURCE_KEY.get();
Assert.notNull(key, "请携带数据标识");
return key;
}
/**
*
*/
public static void removeDynamicDataSourceKey(){
log.info("移除数据源:{}",DYNAMIC_DATASOURCE_KEY.get());
DYNAMIC_DATASOURCE_KEY.remove();
}
}

View File

@ -1,55 +0,0 @@
package com.muyu.cloud.common.many.datasource.role;
import com.alibaba.druid.pool.DruidDataSource;
import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import java.util.Map;
/**
*
* AddDefineDataSourceaddDefineDynamicDataSourcetargetdatasourcesmapmaptargetdatasourcesmap
* 使@DataSource(value = "数据源名称")DynamicDataSourceContextHolder.setContextKey("数据源名称")
* @author Dongzl
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
public class DynamicDataSource extends AbstractRoutingDataSource {
/**
*
*/
private Map<Object, Object> defineTargetDataSources;
/**
*
* @param key
* @return true false
*/
public boolean hashKey(String key){
return defineTargetDataSources.containsKey(key);
}
/**
*
* @param key
* @param value
*/
public void put(String key, DruidDataSource value) {
defineTargetDataSources.put(key, value);
this.afterPropertiesSet();
}
/**
* 线使
*/
@Override
protected Object determineCurrentLookupKey() {
return DynamicDataSourceHolder.getDynamicDataSourceKey();
}
}

View File

@ -1,12 +0,0 @@
package com.muyu.cloud.common.saas.contents;
/**
* @Author: DongZeLiang
* @date: 2024/6/3
* @Description: SAAS
* @Version: 1.0
*/
public class SaaSConstant {
public final static String SAAS_KEY = "ent-code";
}

View File

@ -1,25 +0,0 @@
package com.muyu.cloud.common.saas.domain.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: DongZeLiang
* @date: 2024/6/3
* @Description:
* @Version: 1.0
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EntInfo {
private String entCode;
private String ip;
private Integer port;
}

View File

@ -1,28 +0,0 @@
package com.muyu.cloud.common.saas.exception;
import com.muyu.common.core.exception.ServiceException;
/**
* @Author: DongZeLiang
* @date: 2024/6/3
* @Description: SaaS
* @Version: 1.0
*/
public class SaaSException extends ServiceException {
public SaaSException (String message, Integer code) {
super(message, code);
}
public SaaSException (String message) {
super(message);
}
/**
*
*/
public SaaSException () {
super();
}
}

View File

@ -1,66 +0,0 @@
package com.muyu.cloud.common.saas.interceptor;
import com.alibaba.fastjson2.JSONObject;
import com.muyu.cloud.common.saas.contents.SaaSConstant;
import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
import com.muyu.cloud.common.saas.exception.SaaSException;
import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
import com.muyu.common.core.utils.ServletUtils;
import com.muyu.common.core.utils.SpringUtils;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.log4j.Log4j2;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
/**
* @Author: DongZeLiang
* @date: 2024/6/3
* @Description: SAAS
* @Version: 1.0
*/
@Log4j2
public class SaaSInterceptor implements AsyncHandlerInterceptor {
private Boolean flag = false;
/**
*
*/
@Override
public boolean preHandle (HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (!(handler instanceof HandlerMethod)) {
return true;
}
String SaaSKey = ServletUtils.getHeader(request, SaaSConstant.SAAS_KEY);
if (SaaSKey == null) {
throw new SaaSException("SaaS非法访问");
}
if (SaaSKey.equals("-")){
log.info("使用 [ nacos ] 配置数据库 ");
flag = true;
return true;
}
DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);
if (!dynamicDataSource.hashKey(SaaSKey)){
throw new SaaSException("SaaS非法访问");
}
DynamicDataSourceHolder.setDynamicDataSourceKey(SaaSKey);
return true;
}
/**
*
*/
@Override
public void afterConcurrentHandlingStarted (HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (flag){
DynamicDataSourceHolder.removeDynamicDataSourceKey();
flag = false;
}
}
}

View File

@ -1,31 +0,0 @@
package com.muyu.cloud.common.saas.interceptor;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
*
*
* @author muyu
*/
public class WebMvcSaaSConfig implements WebMvcConfigurer {
/**
*
*/
public static final String[] excludeUrls = {"/login", "/logout", "/refresh"};
@Override
public void addInterceptors (InterceptorRegistry registry) {
registry.addInterceptor(getHeaderInterceptor())
.addPathPatterns("/**")
.excludePathPatterns(excludeUrls)
.order(-10);
}
/**
*
*/
public SaaSInterceptor getHeaderInterceptor () {
return new SaaSInterceptor();
}
}

View File

@ -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

View File

@ -25,9 +25,5 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations-jakarta</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,64 +0,0 @@
package com.muyu.common.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* @Author WangXin
* @Data 2024/10/2
* @Description
* @Version 1.0.0
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@Tag(name = "数据源信息")
@TableName("sys_firm_datasource")
public class SysFirmDatasource {
/**
* Id
*/
@Schema(name = "数据源Id")
@TableId(type = IdType.AUTO)
private Long id;
/**
* url
*/
@Schema(name = "数据源url")
private String datasourceUrl;
/**
*
*/
@Schema(name = "数据源用户名")
private String username;
/**
*
*/
@Schema(name = "数据源密码")
private String password;
/**
* IP
*/
@Schema(name = "数据源IP")
private String ip;
/**
*
*/
@Schema(name = "数据源端口号")
private Integer port;
/**
*
*/
@Schema(name = "数据源库名")
private String databaseName;
}

View File

@ -9,8 +9,6 @@ import com.muyu.common.system.domain.LoginUser;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
*
@ -39,7 +37,4 @@ public interface RemoteUserService {
*/
@PostMapping("/user/register")
public Result<Boolean> registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@GetMapping("/")
Result<List<String>> selectFirmDatabaseList(@RequestHeader(SecurityConstants.FROM_SOURCE) String inner);
}

View File

@ -9,8 +9,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import java.util.List;
/**
*
*
@ -33,11 +31,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
public Result<Boolean> registerUserInfo (SysUser sysUser, String source) {
return Result.error("注册用户失败:" + throwable.getMessage());
}
@Override
public Result<List<String>> selectFirmDatabaseList(String inner) {
return Result.error("注册用户失败:" + throwable.getMessage());
}
};
}
}

View File

@ -24,7 +24,6 @@
<module>cloud-common-kafka</module>
<module>cloud-common-iotdb</module>
<module>cloud-common-caffeine</module>
<module>cloud-common-saas</module>
</modules>
<artifactId>cloud-common</artifactId>

View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: wx
namespace: xyr
# Spring
spring:

View File

@ -34,14 +34,11 @@
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<!-- 企业实体类-->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
</dependencies>

View File

@ -1,16 +0,0 @@
package com.muyu.data.basics;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
public interface ConditionsBasics<T> {
/**
*
* @param t
* @return true/false
*/
boolean isExecute(T t);
}

View File

@ -0,0 +1,25 @@
package com.muyu.data.basics;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
public class EventHandler {
private static final ThreadLocal<EventQueueConfig> EVENT_THREAD = new ThreadLocal<>();
public static void set(final EventQueueConfig handler) {
EVENT_THREAD.set(handler);
}
public static EventQueueConfig get() {
return EVENT_THREAD.get();
}
public static void remove(){
EVENT_THREAD.remove();
}
}

View File

@ -0,0 +1,32 @@
package com.muyu.data.basics;
import org.springframework.context.ApplicationEvent;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
public abstract class EventProcessBasics {
/**
*
*/
protected EventProcessBasics nextEvent;
/**
*
* @param nextHandler
*/
public void setNextHandler(EventProcessBasics nextHandler) {
this.nextEvent = nextHandler;
}
/**
*
* @param eventKey key
*/
public abstract void handleEvent(String eventKey);
}

View File

@ -0,0 +1,35 @@
package com.muyu.data.basics;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.concurrent.LinkedBlockingDeque;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class EventQueueConfig {
private LinkedBlockingDeque<EventProcessBasics> taskNodeQueue = new LinkedBlockingDeque<>();
public void addEvent(EventProcessBasics obj){
this.taskNodeQueue.add(obj);
}
public boolean hashEventNext(){
return !taskNodeQueue.isEmpty();
}
private EventProcessBasics nextTaskNode(){
return taskNodeQueue.poll();
}
}

View File

@ -1,25 +0,0 @@
package com.muyu.data.basics;
import com.muyu.data.core.EndStrategy;
/**
*
* @param <P>
* @param <R>
* @author WangXin
* @date 2024/10/4
* @version 1.0.0
*/
public interface EventStrategyHandler<P,R> {
@SuppressWarnings("rawtypes")
EventStrategyHandler DEFAULT = t -> new EndStrategy();
/**
*
* @param param
* @return
*/
R apply(P param);
}

View File

@ -1,76 +0,0 @@
package com.muyu.data.basics;
/**
*
* @Author WangXin
* @Data 2024/10/4
* @Version 1.0.0
*
* {@code StrategyHandler} {@code AbstractStrategyRouter}
* {@code AbstractStrategyRouter}
* {@code StrategyHandler}
* AB Root A1A2B1B2
* {@code StrategyHandler} {@code AbstractStrategyRouter}
*
* <pre>
* +---------+
* | Root | ----------- 1
* +---------+
* / \ ------------- P1
* / \
* +------+ +------+
* | A | | B | ------- 2
* +------+ +------+
* / \ / \ --------- P2
* / \ / \
* +---+ +---+ +---+ +---+
* |A1 | |A2 | |B1 | |B2 | ----- 3
* +---+ +---+ +---+ +---+
*
* </pre>
*
*/
public abstract class EventStrategyRouter<T, R> {
/**
* ,
* @param <T>
* @param <R>
*/
public interface StrategyMapper<T,R>{
// 通过入参获取对应策略处理方法,使用Map实现
EventStrategyHandler<T,R> getHandler(T param);
}
/**
*
* @return
*/
protected abstract StrategyMapper<T,R> registerStrategy();
/**
*
*/
@SuppressWarnings("unchecked")
private EventStrategyHandler<T,R> defaultStrategyHandler = EventStrategyHandler.DEFAULT;
/**
*
* @param param
* @return
*/
public R applyStrategy(T param) {
StrategyMapper<T, R> trStrategyMapper = registerStrategy();
if (trStrategyMapper == null) {
return defaultStrategyHandler.apply(param);
}
final EventStrategyHandler<T,R> strategyHandler = trStrategyMapper.getHandler(param);
if (strategyHandler != null) {
return strategyHandler.apply(param);
}
// 使用默认策略处理者
return defaultStrategyHandler.apply(param);
}
}

View File

@ -0,0 +1,26 @@
package com.muyu.data.basics;
import com.muyu.data.domain.EventActuate;
import org.springframework.context.ApplicationEvent;
import java.util.List;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
public class StartEvent extends ApplicationEvent {
private EventActuate eventActuate;
public StartEvent(EventActuate source) {
super(source);
this.eventActuate = source;
}
public EventActuate getEventActuate() {
return eventActuate;
}
}

View File

@ -1,46 +0,0 @@
package com.muyu.data.constant;
import com.muyu.data.basics.ConditionsBasics;
import com.muyu.data.domain.Information;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
public enum EventConditions implements ConditionsBasics<Information> {
/**
*
*/
FAULT_STRATEGY {
@Override
public boolean isExecute(Information information) {
// 实现逻辑
return false;
}
},
/**
*
*/
FENCE_STRATEGY {
@Override
public boolean isExecute(Information information) {
// 实现逻辑
return false;
}
},
/**
*
*/
WARN_STRATEGY {
@Override
public boolean isExecute(Information information) {
// 实现逻辑
return false;
}
};
}

View File

@ -0,0 +1,12 @@
package com.muyu.data.constant;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
public interface EventConstant {
String STORAGE_EVENT = "storageEvent";
}

View File

@ -1,54 +0,0 @@
package com.muyu.data.constant;
import com.muyu.data.core.IotdbStrategy;
import com.muyu.data.core.event.FaultStrategy;
import com.muyu.data.core.event.FenceStrategy;
import com.muyu.data.core.event.WarnStrategy;
/**
*
* @Author WangXin
* @Data 2024/10/6
* @Version 1.0.0
*/
public enum EventEnum {
/** 电子围栏事件 */
FENCE_EVENT("电子围栏事件", FenceStrategy.class),
/** 车辆报警事件 */
WARN_EVENT("车辆报警事件", WarnStrategy.class),
/** 电子围栏事件 */
FAULT_EVENT("车辆预警事件", FaultStrategy.class),
/** 存储事件 */
IOTDB_EVENT("存储事件", IotdbStrategy.class);
/**
*
*/
private String eventName;
/**
*
*/
private Class<?> aClass;
EventEnum(String eventName, Class<?> aClass) {
this.eventName = eventName;
this.aClass = aClass;
}
public String getEventName() {
return eventName;
}
public void setEventName(String eventName) {
this.eventName = eventName;
}
public Class<?> getaClass() {
return aClass;
}
public void setaClass(Class<?> aClass) {
this.aClass = aClass;
}
}

View File

@ -1,26 +0,0 @@
package com.muyu.data.core;
import com.muyu.data.basics.EventStrategyHandler;
import com.muyu.data.domain.Information;
import lombok.extern.slf4j.Slf4j;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
@Slf4j
public class EndStrategy implements EventStrategyHandler<Information,Information> {
/**
*
* @param param
* @return null
*/
@Override
public Information apply(Information param) {
log.info("[线路结束] --- >");
return null;
}
}

View File

@ -1,87 +0,0 @@
package com.muyu.data.core;
import com.muyu.data.basics.EventStrategyHandler;
import com.muyu.data.basics.EventStrategyRouter;
import com.muyu.data.constant.EventConditions;
import com.muyu.data.constant.EventEnum;
import com.muyu.data.core.event.FenceStrategy;
import com.muyu.data.domain.Information;
import lombok.extern.log4j.Log4j2;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
@Log4j2
public class IotdbStrategy
extends EventStrategyRouter<Information, Information>
implements EventStrategyHandler<Information, Information> {
private static ConcurrentHashMap<EventEnum,EventStrategyRouter<Information,Information>> map = new ConcurrentHashMap<>();
@Override
public Information apply(Information param) {
return applyStrategy(param);
}
@Override
protected StrategyMapper<Information, Information> registerStrategy() {
return param -> {
initExecuteStrategy(param);
if (isEventMapSize()){
log.info("[没有事件执行]");
}else {
ExecutorService executor = Executors.newFixedThreadPool(map.size());
for (EventEnum eventEnum : map.keySet()) {
executor.submit(() -> {
log.info("开始执行 [{}] ",eventEnum.getEventName());
return map.get(eventEnum);
});
}
// 关闭线程池
executor.shutdown();
try {
// 等待所有任务完成
if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
executor.shutdownNow();
}
} catch (InterruptedException e) {
executor.shutdownNow();
}
}
return new EndStrategy();
};
}
/**
* map
* @param param
*/
private static void initExecuteStrategy(Information param){
if (EventConditions.FENCE_STRATEGY.isExecute(param)){
map.put(EventEnum.FENCE_EVENT,new FenceStrategy());
}
if (EventConditions.FAULT_STRATEGY.isExecute(param)){
map.put(EventEnum.FAULT_EVENT,new FenceStrategy());
}
if (EventConditions.WARN_STRATEGY.isExecute(param)){
map.put(EventEnum.WARN_EVENT,new FenceStrategy());
}
}
/**
* map
* @return
*/
private static boolean isEventMapSize(){
return map.size() > 0;
}
}

View File

@ -1,23 +0,0 @@
package com.muyu.data.core;
import com.muyu.data.basics.EventStrategyRouter;
import com.muyu.data.domain.Information;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
*
* @Author WangXin
* @Data 2024/10/6
* @Version 1.0.0
*/
@Slf4j
@Component
public class StartStrategy extends EventStrategyRouter<Information,Information> {
@Override
protected StrategyMapper<Information, Information> registerStrategy() {
return param -> new IotdbStrategy();
}
}

View File

@ -1,26 +0,0 @@
package com.muyu.data.core.event;
import com.muyu.data.basics.EventStrategyHandler;
import com.muyu.data.basics.EventStrategyRouter;
import com.muyu.data.domain.Information;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
public class FaultStrategy
extends EventStrategyRouter<Information, Information>
implements EventStrategyHandler<Information, Information> {
@Override
public Information apply(Information param) {
return applyStrategy(param);
}
@Override
protected StrategyMapper<Information, Information> registerStrategy() {
return null;
}
}

View File

@ -1,25 +0,0 @@
package com.muyu.data.core.event;
import com.muyu.data.basics.EventStrategyHandler;
import com.muyu.data.basics.EventStrategyRouter;
import com.muyu.data.domain.Information;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
public class FenceStrategy
extends EventStrategyRouter<Information,Information>
implements EventStrategyHandler<Information,Information> {
@Override
public Information apply(Information param) {
return applyStrategy(param);
}
@Override
protected StrategyMapper<Information, Information> registerStrategy() {
return null;
}
}

View File

@ -1,26 +0,0 @@
package com.muyu.data.core.event;
import com.muyu.data.basics.EventStrategyHandler;
import com.muyu.data.basics.EventStrategyRouter;
import com.muyu.data.domain.Information;
/**
*
* @Author WangXin
* @Data 2024/10/5
* @Version 1.0.0
*/
public class WarnStrategy
extends EventStrategyRouter<Information, Information>
implements EventStrategyHandler<Information, Information> {
@Override
public Information apply(Information param) {
return applyStrategy(param);
}
@Override
protected StrategyMapper<Information, Information> registerStrategy() {
return null;
}
}

View File

@ -0,0 +1,33 @@
package com.muyu.data.domain;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* @Author WangXin
* @Data 2024/9/30
* @Description JSON
* @Version 1.0.0
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@Tag(name = "ionDB数据源对象")
public class DataJSON {
/**
*
*/
@Schema(name = "时间戳")
private Long timestamp;
/**
* JSON
*/
@Schema(name = "车辆JSON数据")
private String datasource;
}

View File

@ -1,6 +1,5 @@
package com.muyu.data.domain;
import com.alibaba.fastjson2.JSONObject;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -9,9 +8,9 @@ import lombok.experimental.SuperBuilder;
import java.util.List;
/**
*
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
@Data
@ -22,7 +21,7 @@ public class EventActuate {
/**
* json
*/
private JSONObject jsonData;
private String jsonData;
/**
* key
*/

View File

@ -1,41 +0,0 @@
package com.muyu.data.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.domain.SysCar;
import com.muyu.domain.SysCarFault;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.springframework.boot.autoconfigure.web.WebProperties;
import java.util.Date;
/**
* @author Bai
* @date 2024/9/20 10:29
* @description Information:
* @version: 1.0
*/
/**
*
*/
@Data
@SuperBuilder
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "car_information",autoResultMap = true)
public class Information {
private SysCar sysCar;
private SysCarFault carFault;
}

View File

@ -0,0 +1,23 @@
package com.muyu.data.event;
import com.muyu.data.basics.StartEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
@Component
public class AutoStartupEventListener implements ApplicationListener<StartEvent> {
@Override
public void onApplicationEvent(StartEvent event) {
}
}

View File

@ -0,0 +1,37 @@
package com.muyu.data.event;
import com.muyu.data.basics.EventProcessBasics;
import com.muyu.data.constant.EventConstant;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.extern.log4j.Log4j2;
/**
* @Author WangXin
* @Data 2024/9/29
* @Description
* @Version 1.0.0
*/
@EqualsAndHashCode(callSuper = true)
@Log4j2
@Data
@AllArgsConstructor
public class StorageEvent extends EventProcessBasics {
/**
*
*/
private String eventName;
@Override
public void handleEvent(String eventKey) {
if (eventKey.equals(eventName)){
log.info("开始执行 [{}] 事件", eventKey);
}else if (nextEvent != null){
nextEvent.handleEvent(eventKey);
}else {
log.info("处理结束,最后处理的事件为 [{}]", eventKey);
}
}
}

View File

@ -22,43 +22,6 @@
</description>
<dependencies>
<!-- mqtt监控者 -->
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-cache</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-caffeine</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-data-process-common</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-iotdb</artifactId>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
<!-- kafka 公共包 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-kafka</artifactId>
</dependency>
<!-- rabbit 公共包 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-rabbit</artifactId>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>

View File

@ -2,15 +2,13 @@ package com.muyu.data;
import com.muyu.common.security.annotation.EnableCustomConfig;
import com.muyu.common.security.annotation.EnableMyFeignClients;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@EnableCustomConfig
@EnableMyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@SpringBootApplication
public class DataProcessApplication {
public static void main(String[] args) {
SpringApplication.run(DataProcessApplication.class, args);
System.out.println("Hello world!");
}
}

View File

@ -1,127 +0,0 @@
package com.muyu.data.config;
import com.muyu.data.domain.CarInformation;
import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.Field;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
import java.util.List;
/**
* iotdb
* @author WangXIn
* @packagecom.muyu.event.config
* @nameIOTDBConfig
* @date2024/9/28 19:35
*/
@Configuration
public class IoTDBConfig {
public static final String HOST="127.0.0.1";
public static final Integer PORT=6667;
public static final String USERNAME="root";
public static final String PASSWORD="root";
public static final String TABLENAME="root.four.car_information";
/**
*
* @return
*/
public Session initIoTDB(){
// 初始化与连接
Session session = new Session.Builder()
.host(HOST)
.port(PORT)
.username(USERNAME)
.password(PASSWORD)
.version(Version.V_1_0)
.build();
return session;
};
/**
*
* @param list
*/
public void insertIoTDB(List<String> list){
Session session = initIoTDB();
// 开启session Rpc不压缩
try {
session.open(false);
//添加字段名称
ArrayList<String> measurements = new ArrayList<>();
//添加字段类型
ArrayList<TSDataType> types = new ArrayList<>();
measurements.add("car_vin");
measurements.add("information");
session.insertRecord(TABLENAME,System.currentTimeMillis(),measurements,list);
//关闭连接
session.close();
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
} catch (StatementExecutionException e) {
throw new RuntimeException(e);
}
}
public CarInformation queryIoTDB(String carVin) {
Session session = initIoTDB();
try {
session.open(false);
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
}
Long timeMillis = System.currentTimeMillis();
CarInformation carInformation = new CarInformation();
try(SessionDataSet dataSet= session.executeQueryStatement("select * from root.four.car_information where car_vin='"+carVin+"'")){
System.out.println(dataSet.getColumnNames());
dataSet.setFetchSize(1024);
while (dataSet.hasNext()){
// List<Field> fields = dataSet.next().getFields();
// carInformation.setCarVin(String.valueOf(fields.get(0)));
// carInformation.setInformation(String.valueOf(fields.get(1)));
String[] fields = dataSet.next().toString().split("\t");
carInformation.setTime(Long.valueOf(fields[0]));
carInformation.setCarVin(fields[1]);
carInformation.setInformation(fields[2]);
}
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
} catch (StatementExecutionException e) {
throw new RuntimeException(e);
}
//关闭连接
try {
session.close();
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
}
return carInformation;
};
}

View File

@ -1,61 +0,0 @@
package com.muyu.data.consumer;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
import com.muyu.common.kafka.constant.KafkaConstants;
import com.muyu.data.core.StartStrategy;
import com.muyu.data.domain.Information;
import jakarta.annotation.Resource;
import lombok.extern.log4j.Log4j2;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component;
import java.time.Duration;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
/**
* kafka
* @author WangXIn
*/
@Component
@Log4j2
public class MessageConsumer implements InitializingBean {
@Resource
private KafkaConsumer kafkaConsumer;
@Resource
private StartStrategy startStrategy;
@Override
public void afterPropertiesSet() throws Exception {
Thread thread = new Thread(() -> {
log.info("启动线程监听Topic: {}", KafkaConstants.KafkaTopic);
ThreadUtil.sleep(1000);
Collection<String> topics = Lists.newArrayList(KafkaConstants.KafkaTopic);
kafkaConsumer.subscribe(topics);
while (true) {
System.out.println("开始消费数据,等待中...");
ConsumerRecords<String, String> consumerRecords = kafkaConsumer.poll(Duration.ofMillis(1000));
for (ConsumerRecord consumerRecord : consumerRecords) {
//1.从ConsumerRecord中获取消费数据
String originalMsg = (String) consumerRecord.value();
log.info("从Kafka中消费的原始数据: " + originalMsg);
//2.把消费数据转换为DTO对象
JSONObject jsonObject = JSONObject.parseObject(originalMsg);
Information information = jsonObject.getObject("key", Information.class);
log.info("从Kafka中消费的实体数据: " + information);
// 执行策略
startStrategy.applyStrategy(information);
}
}
});
thread.start();
}
}

View File

@ -1,133 +0,0 @@
package com.muyu.data.controller;
import com.alibaba.fastjson2.JSONObject;
import com.muyu.common.caffeine.enums.CacheNameEnums;
import com.muyu.common.core.utils.uuid.UUID;
import com.muyu.common.iotdb.config.IotDBSessionConfig;
import com.muyu.common.kafka.constant.KafkaConstants;
import com.muyu.common.rabbit.constants.RabbitConstants;
import com.muyu.data.domain.Information;
import jakarta.annotation.Resource;
import lombok.extern.log4j.Log4j2;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
*
* @program: cloud-server
* @author: WangXin
* @create: 2024-09-28 14:55
**/
@RestController
@RequestMapping
@Log4j2
public class TestController {
@Resource
private KafkaProducer<String,JSONObject> kafkaProducer;
@Resource
private RabbitTemplate rabbitTemplate;
@Resource
private IotDBSessionConfig iotDBConfig;
@Resource
private RedisTemplate<String,String> redisTemplate;
// @Resource
// private CaffeineCacheUtils cacheUtils;
@Resource
private CacheManager cacheManager;
@GetMapping("/testKafka")
public void sendMsg() {
try {
// 测试数据
Information information = new Information();
JSONObject from = JSONObject.from(information);
ProducerRecord<String, JSONObject> producerRecord = new ProducerRecord<>(KafkaConstants.KafkaTopic, from);
kafkaProducer.send(producerRecord);
System.out.println("同步消息发送成功: " + from);
} catch (Exception e) {
e.printStackTrace();
System.out.println("同步消息发送失败");
}
}
@GetMapping("/testRabbit/GoOnline")
public void testRabbitGoOnline(@RequestParam("msg") String msg) {
rabbitTemplate.convertAndSend(RabbitConstants.GO_ONLINE_QUEUE, msg, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-",""));
return message;
});
}
@GetMapping("/testRabbit/Downline")
public void testRabbitDownline(@RequestParam("msg") String msg) {
rabbitTemplate.convertAndSend(RabbitConstants.DOWNLINE_QUEUE, msg, message -> {
message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-",""));
return message;
});
}
@GetMapping("/insertData")
public void insertData(@RequestParam("deviceId") String deviceId, @RequestParam("time") long time, @RequestParam("value") double value) throws Exception {
String sql = String.format("insert into root.one.%s(timestamp, temperature) values (%d, %f)", deviceId, time, value);
iotDBConfig.getSessionPool().executeNonQueryStatement(sql);
}
@GetMapping("/testSetRedis")
public void testSetRedis(@RequestParam("key") String key,@RequestParam("value") String value) {
redisTemplate.opsForValue().set(key,value);
}
@GetMapping("/testGetCache")
public void testGetCache(@RequestParam("cacheName") String cacheName,@RequestParam("key") String key) {
Cache cache = cacheManager.getCache(cacheName);
if (cache != null) {
String v = cache.get(key,String.class);
log.info("缓存值为: {}",v);
}else {
log.info("无缓存");
}
}
@GetMapping("/textSetCache")
public void textSetCache(
@RequestParam("cacheName") String cacheName,
@RequestParam("key") String key,
@RequestParam("value") String value) {
Cache cache = cacheManager.getCache(cacheName);
if (cache != null){
cache.put(key, value);
log.info("设置缓存成功");
}else {
log.info("无缓存");
}
}
@GetMapping("/testDelCache")
public void testDelCache(@RequestParam("cacheName") String cacheName) {
if (!CacheNameEnums.isCode(cacheName)){
log.info("缓存分区不存在");
return;
}
Cache cache = cacheManager.getCache(cacheName);
if (cache != null) {
cache.invalidate();
log.info("删除缓存成功");
}else{
log.info("无缓存");
}
}
}

View File

@ -1,45 +0,0 @@
package com.muyu.data.domain;
import com.alibaba.fastjson.JSON;
import com.muyu.common.core.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author WangXIn
* @packagecom.muyu.event.domian
* @nameCarInformation
* @date2024/9/28 19:25
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CarInformation {
/**
*
*/
@Excel(name = "时间戳")
private Long Time;
/**
* vin
*/
@Excel(name = "车辆vin码")
private String carVin;
/**
*
*/
@Excel(name = "车辆实时信息")
private String information;
}

View File

@ -1,69 +0,0 @@
package com.muyu.data.rabbit;
import com.muyu.common.rabbit.constants.RabbitConstants;
import com.rabbitmq.client.Channel;
import jakarta.annotation.Resource;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.Queue;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.io.IOException;
/**
* 线
* @Author: WangXin
* @Description: 线
*/
@Slf4j
@Component
@Setter
public class DownlineRabbitConsumer {
@Resource
private RedisTemplate<String,String> redisTemplate;
@Resource
private CacheManager cacheManager;
@RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.DOWNLINE_QUEUE)})
public void downline(String vin, Message message, Channel channel) {
log.info("车辆 {} 下线, 配置信息准备中。。。",vin);
try {
// 重复性校验
Long add = redisTemplate.opsForSet().add(RabbitConstants.DOWNLINE_QUEUE, message.getMessageProperties().getMessageId());
if (add>0) {
deleteCarCache(vin);
log.info("车辆 {} 下线, 消息已确认。。。",vin);
} else {
log.info("车辆 {} 下线, 消息重复消费,已确认。。。",vin);
}
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
log.info("车辆 {} 下线, 配置信息已准备完毕。。。",vin);
} catch (IOException e) {
try {
log.warn("车辆 {} 下线, 配置信息准备失败,返回队列,原因:{}", vin, e.getMessage());
channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
} catch (IOException ex) {
log.warn("车辆 {} 下线, 消息返回队列失败,原因:{}", vin, ex.getMessage());
}
}
}
/**
* 线 -
*/
public void deleteCarCache(String vin) {
Cache cache = cacheManager.getCache(vin);
if (ObjectUtils.isNotEmpty(cache)){
cache.invalidate();
}
log.info("车辆编码:{},本地缓存删除完成...", vin);
}
}

View File

@ -1,67 +0,0 @@
package com.muyu.data.rabbit;
import com.muyu.common.caffeine.enums.CacheNameEnums;
import com.muyu.common.rabbit.constants.RabbitConstants;
import com.rabbitmq.client.Channel;
import jakarta.annotation.Resource;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.Queue;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.cache.CacheManager;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.io.IOException;
/**
* 线
* @Author: WangXin
* @Name: GoOnlineRabbitConsumer
*/
@Slf4j
@Component
@Setter
public class GoOnlineRabbitConsumer {
@Resource
private RedisTemplate<String,String> redisTemplate;
@Resource
private CacheManager cacheManager;
@RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.GO_ONLINE_QUEUE)})
public void goOnline(String vin, Message message, Channel channel){
log.info("车辆 {} 上线, 配置信息准备中。。。",vin);
try {
// 重复性校验
Long add = redisTemplate.opsForSet().add(RabbitConstants.GO_ONLINE_QUEUE, message.getMessageProperties().getMessageId());
if (add>0) {
addCarCache(vin);
log.info("车辆 {} 上线, 消息已确认。。。",vin);
} else {
log.info("车辆 {} 上线, 消息重复消费,已确认。。。",vin);
}
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
log.info("车辆 {} 上线, 配置信息已准备完毕。。。",vin);
} catch (IOException e) {
try {
log.warn("车辆 {} 上线, 配置信息准备失败,返回队列,原因:{}", vin, e.getMessage());
channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
} catch (IOException ex) {
log.warn("车辆 {} 上线, 消息返回队列失败,原因:{}", vin, ex.getMessage());
}
}
}
/**
* 线 -
*/
public void addCarCache(String vin) {
// 从Redis中获取缓存信息
for (String name : CacheNameEnums.getCodes()) {
String value = redisTemplate.opsForValue().get(name+":"+vin);
cacheManager.getCache(name).put(vin, value);
log.info("存储缓存, 缓存分区:[{}], 车辆编码:[{}], 存储值:[{}]", name, vin, value);
}
log.info("车辆编码:{},本地缓存完成...",vin);
}
}

View File

@ -1,10 +0,0 @@
package com.muyu.data.service;
/**
*
* @Author WangXin
* @Data 2024/10/3
* @Version 1.0.0
*/
public interface TestService {
}

View File

@ -1,20 +0,0 @@
package com.muyu.data.service.impl;
import com.muyu.data.service.TestService;
import org.springframework.stereotype.Service;
/**
* @author WangXIn
* @packagecom.muyu.event.service.impl
* @nameTestServiceImpl
* @date2024/9/29 21:00
*/
@Service
public class TestServiceImpl implements TestService {
}

View File

@ -1,66 +0,0 @@
package com.muyu.data.util;
import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import java.util.ArrayList;
import java.util.List;
public class Iotdb {
public static void main(String[] args) throws IoTDBConnectionException, StatementExecutionException {
System.out.println("测试数据库开始~~~~~");
// 初始化与连接
Session session = new Session.Builder()
.host("47.116.173.119")
.port(6667)
.username("root")
.password("root")
.version(Version.V_1_0)
.build();
// 开启session Rpc不压缩
session.open(false);
// 写入数据
ArrayList<Object> list = new ArrayList<>();
list.add(100);
insertRecord(session,list);
//查询数据
queryRecord(session);
//关闭连接
session.close();
}
private static void insertRecord(Session session, List<Object> values) throws IoTDBConnectionException, StatementExecutionException {
ArrayList<String> measurements = new ArrayList<>();
ArrayList<TSDataType> types = new ArrayList<>();
measurements.add("status");
types.add(TSDataType.INT32);
session.insertRecord("root.four.test",System.currentTimeMillis(),measurements,types,values);
System.out.println("————————————————写入数据成功————————————————");
}
private static void queryRecord(Session session) throws IoTDBConnectionException, StatementExecutionException {
System.out.println("————————————————查询数据开始————————————————");
try(SessionDataSet dataSet= session.executeQueryStatement("select * from root.four.test")){
System.out.println(dataSet.getColumnNames());
dataSet.setFetchSize(1024);
while (dataSet.hasNext()){
System.out.println(dataSet.next());
}
}
System.out.println("————————————————查询数据结束————————————————");
}
}

View File

@ -1,48 +0,0 @@
package com.muyu.data.util;
import org.eclipse.paho.client.mqttv3.*;
public class Receive {
public static void main(String[] args) {
String topic = "vehicle";
String broker = "tcp://47.101.53.251:1883";
String clientId="lw";
try {
MqttClient mqttClient= new MqttClient(broker,clientId);
MqttConnectOptions connectOptions=new MqttConnectOptions();
connectOptions.setCleanSession(true);
System.out.println("Connecting to broker" + broker);
mqttClient.connect(connectOptions);
System.out.println("已连接");
mqttClient.setCallback(new MqttCallback(){
@Override
public void connectionLost(Throwable throwable) {
System.out.println("Connect lost!");
}
@Override
public void messageArrived(String s, MqttMessage mqttMessage) throws Exception {
System.out.println("Message arrived. topic:"+topic);
}
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
}
});
mqttClient.subscribe(topic);
System.out.println("Subscribed to topic " + topic);
} catch (MqttException e) {
System.out.println("reason "+e.getReasonCode());
System.out.println("msg " +e.getMessage());
System.out.println("loc " +e.getLocalizedMessage());
System.out.println("cause "+e.getCause());
System.out.println("excep "+e);
e.printStackTrace();
}
}
}

View File

@ -4,19 +4,17 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: wx
namespace: five
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
iotdb:
ip: 127.0.0.1
username: root
port: 6667
password: root
maxSize: 10
amqp:
deserialization:
trust:
all: true
main:
allow-bean-definition-overriding: true
application:
@ -55,7 +53,3 @@ spring:
- application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# xxl-job 配置文件
- application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# rabbit 配置文件
- application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# kafka 配置文件
- application-kafka-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

View File

@ -1,38 +0,0 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

View File

@ -1,95 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise</artifactId>
<version>3.6.3</version>
</parent>
<artifactId>enterpise-cache</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!-- SpringCloud Alibaba Nacos Config -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- SpringBoot Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- MuYu Common DataSource -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datasource</artifactId>
</dependency>
<!-- 缓存公共模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-cache</artifactId>
</dependency>
<!-- MuYu Common DataScope -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datascope</artifactId>
</dependency>
<!-- MuYu Common Log -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-log</artifactId>
</dependency>
<!-- 接口模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<!-- XllJob定时任务 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-xxl</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,28 +0,0 @@
package com.muyu.enterprise.cache;
import com.muyu.common.cache.CacheAbsBasic;
import com.muyu.domain.CarInformation;
/**
*
* @className: VehicleCacheService
* @author: Yang 🦅
* @date: 2024/9/30 00:36
* @Version: 1.0
* @description:
*/
public class VehicleCacheService extends CacheAbsBasic<String, CarInformation> {
@Override
public String keyPre() {
return "vehicle:info:";
}
@Override
public String decode(String key){
return key.replace("vehicle:info:","");
}
}

View File

@ -41,15 +41,5 @@
<artifactId>swagger-annotations-jakarta</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-system</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-saas</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -43,6 +43,7 @@ public class FenceGroup {
@Schema(name = "围栏组状态")
private Integer groupStates;
public static FenceGroup carFenceUpdateById(Integer states, FenceGroupUpdateReq fenceGroupBuilder ){
return FenceGroup.builder()
.groupId(fenceGroupBuilder.getGroupId())

View File

@ -66,10 +66,6 @@ public class SysCar extends BaseEntity{
@Schema(name = "启用状态")
private Integer state;
/** 车辆所属公司 */
@Schema(name = "公司Id")
private Integer deptId;
@Override

View File

@ -17,7 +17,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @date 2024-09-18
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Setter
@Getter

View File

@ -79,6 +79,8 @@ public class WarnLogs extends BaseEntity{
@Schema(name = "是否发送预警")
private Long status;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@ -42,13 +41,11 @@ public class FaultCodeListReq {
* 1
*/
@Schema(name = "页码")
@Builder.Default
private Integer pageNum=1;
/**
*
*/
@Schema(name = "每页大小")
@Builder.Default
private Integer pageSize=10;

View File

@ -9,7 +9,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Authoryan
* @Packagecom.muyu.domain.req
* @Projectplues

View File

@ -1,36 +0,0 @@
package com.muyu.domain.resp;
import com.muyu.domain.SysCar;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.List;
/**
*
* @Author WangXin
* @Data 2024/10/3
* @Description
* @Version 1.0.0
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@Tag(name = "车辆电子绑定电子围栏信息")
public class FenceGroupResp {
/**
*
*/
@Schema(name = "车辆基础信息对象")
private SysCar sysCar;
/**
*
*/
@Schema(name = "车辆电子围栏信息")
private List<CarFenceResq> carFenceResqList;
}

View File

@ -66,7 +66,6 @@ public class MessageValueListResp {
@Schema(description = "终止下标",example = "1")
private Integer messageEndIndex;
public static MessageValueListResp valueBuild(MessageValue messageValue){
return MessageValueListResp.builder()
.messageId(messageValue.getMessageId())

View File

@ -67,11 +67,6 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datasource</artifactId>
</dependency>
<!-- 缓存公共模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-cache</artifactId>
</dependency>
<!-- MuYu Common DataScope -->
<dependency>
@ -100,7 +95,7 @@
<!-- cache缓存框架 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-cache</artifactId>
<artifactId>enterprise-cache</artifactId>
</dependency>
</dependencies>

View File

@ -1,7 +1,8 @@
package com.muyu.controller;
package com.muyu.enterpise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.domain.FenceGroup;
import com.muyu.enterpise.service.CarAndFenceGroupMiddleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

View File

@ -1,9 +1,10 @@
package com.muyu.enterpise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.domain.FenceGroup;
import com.muyu.domain.req.CarFenceAdd;
import com.muyu.enterpise.service.CarFenceServiceMybaits;
import com.muyu.enterpise.service.MiddleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
@ -27,20 +28,45 @@ import java.util.List;
@Tag(name = "中间表添加",description = "添加")
@Log4j2
public class MiddleController {
@Autowired
private MiddleService middleService;
@Autowired
private CarFenceServiceMybaits carFenceServiceMybaits;
/**
*
*/
@PostMapping("/addCarFence")
@Operation(summary = "添加中间围栏和围栏组",description = "添加中间")
@Operation(summary = "添加中间",description = "添加中间")
public Result addCarFence(@RequestParam("fenceGroupId") Integer fenceGroupId, @RequestBody List<CarFenceAdd> carFences){
boolean i = carFenceServiceMybaits.saveBatch(carFences,fenceGroupId);
return i?Result.success("添加成功"):Result.error("失败");
carFenceServiceMybaits.addFenceGroup(fenceGroupId,carFences);
System.out.println("围栏组Id"+fenceGroupId);
System.out.println("围栏Id"+carFences);
return Result.success("成功");
}
/**
*
* @param groupId
* @return
*/
@GetMapping("/updateFenceGroupById")
@Operation(summary = "修改围栏状态",description = "修改围栏状态")
public Result updateFenceGroupById(@RequestParam("groupId") Integer groupId){
return Result.success(carFenceServiceMybaits.updateFenceGroupById(groupId));
}
/**
*
*/
@GetMapping("/activate")
@Operation(summary = "启动围栏状态",description = "启动围栏状态")
public Result activate(@RequestParam("groupId") Integer groupId){
return Result.success(carFenceServiceMybaits.activate(groupId));
}
/**
* id
@ -48,11 +74,19 @@ public class MiddleController {
@GetMapping("/BoundFenceGroup")
@Operation(summary = "根据围栏组的id查询绑定的围栏的中间表",description = "根据围栏组的id查询绑定的围栏的中间表")
public Result BoundFenceGroup(@RequestParam("groupId") Integer groupId){
carFenceServiceMybaits.BoundFenceGroup(groupId);
return Result.success();
return Result.success(carFenceServiceMybaits.BoundFenceGroup(groupId));
}
/**
* id
*/
@PostMapping("/addFenceGroupAddCarMiddle")
@Operation(summary = "根据围栏组和车辆的id添加中间表",description = "根据围栏组和车辆的id添加中间表")
public Result addFenceGroupAddCarMiddle(@RequestParam("carId") Integer carId , @RequestBody List<FenceGroup> fenceGroups ){
carFenceServiceMybaits.addFenceGroupAddCarMiddle(carId,fenceGroups);
return Result.success();
}
/**
*

Some files were not shown because too many files have changed in this diff Show More