diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index 25c918e..e5d8ac1 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,7 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "muyu-file"; + +// public static final String SYSTEM_BUSINESS = "muyu-business"; + public static final String DATASOURCE_SERVICE = "muyu-net-working"; } diff --git a/muyu-common/muyu-common-saas/pom.xml b/muyu-common/muyu-common-saas/pom.xml deleted file mode 100644 index 503f4eb..0000000 --- a/muyu-common/muyu-common-saas/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu-common - 3.6.3 - - - muyu-common-saas - - - 17 - 17 - UTF-8 - - - SaaS多数据源模块 - - - - com.muyu - muyu-common-core - - - com.alibaba - druid - 1.2.20 - compile - - - org.springframework - spring-webmvc - - - com.muyu - muyu-common-security - - - diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java deleted file mode 100644 index b04f54c..0000000 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.muyu.saas.datasource; - -import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.common.core.utils.SpringUtils; - -import com.muyu.saas.domain.model.DataSourceInfo; -import com.muyu.saas.domain.model.EnterPriseInfo; -import com.muyu.saas.factory.DruidDataSourceFactory; -import com.muyu.saas.role.DynamicDataSource; -import lombok.AllArgsConstructor; -import lombok.extern.log4j.Log4j2; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 多数据源 ManyDataSource - * - * @author DeKangLiu - * Date 2024/6/3 20:01 - */ -@Component -@Log4j2 -@AllArgsConstructor -public class ManyDataSource { - - - @PostConstruct - public void init(){ - new Thread(()->{ - try { - Thread.sleep(10000); - } catch (InterruptedException ignored) {} - DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class); - DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class); - EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder() - .entCode("liu_45") - .ip("192.168.116.129") - .port(3351) - .build(); - - DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort()); - DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); - dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); - }).start(); - } - - - private List dataSourceInfoList(){ - List list = new ArrayList<>(); - list.add( - EnterPriseInfo.builder() - .entCode("liu_44") - .ip("192.168.116.129") - .port(3350) - .build() - ); - return list; - } - - @Bean - @Primary - public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { - - //企业列表 企业CODE 端口 ip - Map dataSourceMap = new HashMap<>(); - dataSourceInfoList() - .stream() - .map(enterPriseInfo -> DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(),enterPriseInfo.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; - } -} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/EnterPriseInfo.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/EnterPriseInfo.java deleted file mode 100644 index ac20ed2..0000000 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/EnterPriseInfo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.muyu.saas.domain.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 企业信息 EnterPriseInfo - * - * @author DeKangLiu - * Date 2024/6/4 08:53 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class EnterPriseInfo { - - private String entCode; - - private String ip; - - private Integer port; -} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/exception/SaaSException.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/exception/SaaSException.java deleted file mode 100644 index f2b33b2..0000000 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/exception/SaaSException.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.saas.exception; - -import com.muyu.common.core.exception.ServiceException; - -/** - * SaaS异常类 SaaSException - * - * @author DeKangLiu - * Date 2024/6/4 18:45 - */ -public class SaaSException extends ServiceException { - - public SaaSException(String message, Integer code) { - super(message, code); - } - - public SaaSException(String message) { - super(message); - } - - - public SaaSException() { - super(); - } - -} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/SaaSInterceptor.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/SaaSInterceptor.java deleted file mode 100644 index f071952..0000000 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/SaaSInterceptor.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.muyu.saas.interceptor; - -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.saas.contents.SaaSConstant; -import com.muyu.saas.exception.SaaSException; -import com.muyu.saas.holder.DynamicDataSourceHolder; -import com.muyu.saas.role.DynamicDataSource; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.AsyncHandlerInterceptor; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * SaaS拦截器 SaaSInterceptor - * - * @author DeKangLiu - * Date 2024/6/4 14:39 - */ -public class SaaSInterceptor implements AsyncHandlerInterceptor { - - /** - * 之前 - */ - @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非法访问"); - } else { - DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); - if (!dynamicDataSource.hashKye(SaasKey)){ - throw new SaaSException("SaaS非法访问"); - } - } - DynamicDataSourceHolder.setDynamicDataSourceKey(SaasKey); - return true; - } - - /** - * 之后 - */ - @Override - public void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - DynamicDataSourceHolder.removeDynamicDataSourceKey(); - } - -} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/WebMvcSaaSConfig.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/WebMvcSaaSConfig.java deleted file mode 100644 index d28bdf7..0000000 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/WebMvcSaaSConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.muyu.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(); - } -} diff --git a/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f20490c..0000000 --- a/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,4 +0,0 @@ -com.muyu.saas.interceptor.WebMvcSaaSConfig -com.muyu.saas.factory.DruidDataSourceFactory -com.muyu.saas.datasource.ManyDataSource -com.muyu.saas.domain.model.EnterPriseInfo diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteSysDeptService.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java rename to muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteSysDeptService.java index cc0ccc1..b6eafc5 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteSysDeptService.java @@ -1,9 +1,9 @@ -package com.muyu.system.remote; +package com.muyu.common.system.remote; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysDept; -import com.muyu.system.remote.factory.RemoteSysDeptFactory; +import com.muyu.common.system.remote.factory.RemoteSysDeptFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteSysUserService.java similarity index 81% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java rename to muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteSysUserService.java index c79e37a..c69b379 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteSysUserService.java @@ -1,10 +1,9 @@ -package com.muyu.system.remote; +package com.muyu.common.system.remote; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; -import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysUser; -import com.muyu.system.remote.factory.RemoteSysUserFactory; +import com.muyu.common.system.remote.factory.RemoteSysUserFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -28,7 +27,6 @@ public interface RemoteSysUserService { * @param user * @return Result */ - @RequiresPermissions("system:user:add") @PostMapping Result add(@Validated @RequestBody SysUser user); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSysDeptFactory.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java rename to muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSysDeptFactory.java index 90c268f..2a172bc 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysDeptFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSysDeptFactory.java @@ -1,8 +1,8 @@ -package com.muyu.system.remote.factory; +package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysDept; -import com.muyu.system.remote.RemoteSysDeptService; +import com.muyu.common.system.remote.RemoteSysDeptService; import lombok.extern.log4j.Log4j2; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSysUserFactory.java similarity index 87% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java rename to muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSysUserFactory.java index 5a29ff7..d8f8ae7 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/RemoteSysUserFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSysUserFactory.java @@ -1,8 +1,8 @@ -package com.muyu.system.remote.factory; +package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysUser; -import com.muyu.system.remote.RemoteSysUserService; +import com.muyu.common.system.remote.RemoteSysUserService; import org.springframework.cloud.openfeign.FallbackFactory; /** diff --git a/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b9a11b8..97054dc 100644 --- a/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,5 @@ com.muyu.common.system.remote.factory.RemoteUserFallbackFactory com.muyu.common.system.remote.factory.RemoteLogFallbackFactory com.muyu.common.system.remote.factory.RemoteFileFallbackFactory +com.muyu.common.system.remote.factory.RemoteSysDeptFactory +com.muyu.common.system.remote.factory.RemoteSysUserFactory diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index b995e91..5b58e93 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -18,7 +18,6 @@ muyu-common-datascope muyu-common-datasource muyu-common-system - muyu-common-saas muyu-common diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/DataSource.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/DataSource.java new file mode 100644 index 0000000..3b58cab --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/DataSource.java @@ -0,0 +1,52 @@ +package com.muyu.customer.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 多数据源对象 DataSource + * + * @author DeKangLiu + * Date 2024/6/22 22:56 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("datasource") +public class DataSource extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 数据源key */ + @Excel(name = "数据源key") + @ApiModelProperty(name = "数据源key", value = "数据源key") + private String enterpriseCode; + + /** 数据源端口 */ + @Excel(name = "数据源端口") + @ApiModelProperty(name = "数据源端口", value = "数据源端口") + private Integer port; + + /** 数据源ip */ + @Excel(name = "数据源ip") + @ApiModelProperty(name = "数据源ip", value = "数据源ip") + private String ip; + + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultCode.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultCode.java new file mode 100644 index 0000000..8244560 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultCode.java @@ -0,0 +1,94 @@ +package com.muyu.customer.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.customer.business.domain.req.FaultCodeEditReq; +import com.muyu.customer.business.domain.req.FaultCodeQueryReq; +import com.muyu.customer.business.domain.req.FaultCodeSaveReq; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆故障码对象 fault_code + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("fault_code") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "FaultCode", description = "车辆故障码") +public class FaultCode extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 故障码 */ + @Excel(name = "故障码") + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 故障标签 */ + @Excel(name = "故障标签") + @ApiModelProperty(name = "故障标签", value = "故障标签") + private String faultLabel; + + /** 故障位 */ + @Excel(name = "故障位") + @ApiModelProperty(name = "故障位", value = "故障位") + private Long faultBit; + + /** 故障值 */ + @Excel(name = "故障值") + @ApiModelProperty(name = "故障值", value = "故障值") + private Long faultValue; + + /** + * 查询构造器 + */ + public static FaultCode queryBuild( FaultCodeQueryReq faultCodeQueryReq){ + return FaultCode.builder() + .faultCode(faultCodeQueryReq.getFaultCode()) + .build(); + } + + /** + * 添加构造器 + */ + public static FaultCode saveBuild(FaultCodeSaveReq faultCodeSaveReq){ + return FaultCode.builder() + .faultCode(faultCodeSaveReq.getFaultCode()) + .faultLabel(faultCodeSaveReq.getFaultLabel()) + .faultBit(faultCodeSaveReq.getFaultBit()) + .faultValue(faultCodeSaveReq.getFaultValue()) + .build(); + } + + /** + * 修改构造器 + */ + public static FaultCode editBuild(Long id, FaultCodeEditReq faultCodeEditReq){ + return FaultCode.builder() + .id(id) + .faultCode(faultCodeEditReq.getFaultCode()) + .faultLabel(faultCodeEditReq.getFaultLabel()) + .faultBit(faultCodeEditReq.getFaultBit()) + .faultValue(faultCodeEditReq.getFaultValue()) + .build(); + } + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java new file mode 100644 index 0000000..b079747 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java @@ -0,0 +1,113 @@ +package com.muyu.customer.business.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.customer.business.domain.req.FaultRecordEditReq; +import com.muyu.customer.business.domain.req.FaultRecordQueryReq; +import com.muyu.customer.business.domain.req.FaultRecordSaveReq; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 故障记录对象 fault_record + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("fault_record") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "FaultRecord", description = "故障记录") +public class FaultRecord extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 故障码 */ + @Excel(name = "故障码") + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 车辆vin */ + @Excel(name = "车辆vin") + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 故障开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "故障开始时间", value = "故障开始时间") + private Date startTime; + + /** 故障结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "故障结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "故障结束时间", value = "故障结束时间") + private Date endTime; + + /** 故障级别 */ + @Excel(name = "故障级别") + @ApiModelProperty(name = "故障级别", value = "故障级别") + private String faultLevel; + + /** 故障是否处理 */ + @Excel(name = "故障是否处理") + @ApiModelProperty(name = "故障是否处理", value = "故障是否处理") + private String faultHandle; + + /** + * 查询构造器 + */ + public static FaultRecord queryBuild( FaultRecordQueryReq faultRecordQueryReq){ + return FaultRecord.builder() + .faultCode(faultRecordQueryReq.getFaultCode()) + .vin(faultRecordQueryReq.getVin()) + .build(); + } + + /** + * 添加构造器 + */ + public static FaultRecord saveBuild(FaultRecordSaveReq faultRecordSaveReq){ + return FaultRecord.builder() + .faultCode(faultRecordSaveReq.getFaultCode()) + .vin(faultRecordSaveReq.getVin()) + .startTime(faultRecordSaveReq.getStartTime()) + .endTime(faultRecordSaveReq.getEndTime()) + .faultLevel(faultRecordSaveReq.getFaultLevel()) + .faultHandle(faultRecordSaveReq.getFaultHandle()) + .build(); + } + + /** + * 修改构造器 + */ + public static FaultRecord editBuild(Long id, FaultRecordEditReq faultRecordEditReq){ + return FaultRecord.builder() + .id(id) + .faultCode(faultRecordEditReq.getFaultCode()) + .vin(faultRecordEditReq.getVin()) + .startTime(faultRecordEditReq.getStartTime()) + .endTime(faultRecordEditReq.getEndTime()) + .faultLevel(faultRecordEditReq.getFaultLevel()) + .faultHandle(faultRecordEditReq.getFaultHandle()) + .build(); + } + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeEditReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeEditReq.java new file mode 100644 index 0000000..18c268f --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeEditReq.java @@ -0,0 +1,42 @@ +package com.muyu.customer.business.domain.req; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆故障码对象 fault_code + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "FaultCodeEditReq", description = "车辆故障码") +public class FaultCodeEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 故障码 */ + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 故障标签 */ + @ApiModelProperty(name = "故障标签", value = "故障标签") + private String faultLabel; + + /** 故障位 */ + @ApiModelProperty(name = "故障位", value = "故障位") + private Long faultBit; + + /** 故障值 */ + @ApiModelProperty(name = "故障值", value = "故障值") + private Long faultValue; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeQueryReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeQueryReq.java new file mode 100644 index 0000000..0608b74 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeQueryReq.java @@ -0,0 +1,30 @@ +package com.muyu.customer.business.domain.req; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆故障码对象 fault_code + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "FaultCodeQueryReq", description = "车辆故障码") +public class FaultCodeQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 故障码 */ + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeSaveReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeSaveReq.java new file mode 100644 index 0000000..1c42b15 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultCodeSaveReq.java @@ -0,0 +1,51 @@ +package com.muyu.customer.business.domain.req; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆故障码对象 fault_code + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "FaultCodeSaveReq", description = "车辆故障码") +public class FaultCodeSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 故障码 */ + + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 故障标签 */ + + @ApiModelProperty(name = "故障标签", value = "故障标签") + private String faultLabel; + + /** 故障位 */ + + @ApiModelProperty(name = "故障位", value = "故障位") + private Long faultBit; + + /** 故障值 */ + + @ApiModelProperty(name = "故障值", value = "故障值") + private Long faultValue; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordEditReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordEditReq.java new file mode 100644 index 0000000..b9fa7f8 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordEditReq.java @@ -0,0 +1,54 @@ +package com.muyu.customer.business.domain.req; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 故障记录对象 fault_record + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "FaultRecordEditReq", description = "故障记录") +public class FaultRecordEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 故障码 */ + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 车辆vin */ + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 故障开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "故障开始时间", value = "故障开始时间") + private Date startTime; + + /** 故障结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "故障结束时间", value = "故障结束时间") + private Date endTime; + + /** 故障级别 */ + @ApiModelProperty(name = "故障级别", value = "故障级别") + private String faultLevel; + + /** 故障是否处理 */ + @ApiModelProperty(name = "故障是否处理", value = "故障是否处理") + private String faultHandle; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordQueryReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordQueryReq.java new file mode 100644 index 0000000..e7c907c --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordQueryReq.java @@ -0,0 +1,36 @@ +package com.muyu.customer.business.domain.req; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 故障记录对象 fault_record + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "FaultRecordQueryReq", description = "故障记录") +public class FaultRecordQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 故障码 */ + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 车辆vin */ + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordSaveReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordSaveReq.java new file mode 100644 index 0000000..b216163 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FaultRecordSaveReq.java @@ -0,0 +1,65 @@ +package com.muyu.customer.business.domain.req; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 故障记录对象 fault_record + * + * @author chx + * @date 2024-06-20 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "FaultRecordSaveReq", description = "故障记录") +public class FaultRecordSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 故障码 */ + + @ApiModelProperty(name = "故障码", value = "故障码") + private String faultCode; + + /** 车辆vin */ + + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 故障开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "故障开始时间", value = "故障开始时间") + private Date startTime; + + /** 故障结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "故障结束时间", value = "故障结束时间") + private Date endTime; + + /** 故障级别 */ + + @ApiModelProperty(name = "故障级别", value = "故障级别") + private String faultLevel; + + /** 故障是否处理 */ + + @ApiModelProperty(name = "故障是否处理", value = "故障是否处理") + private String faultHandle; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml index 7276ccd..560afd3 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml @@ -16,5 +16,17 @@ 17 UTF-8 + + + com.muyu + muyu-common-core + + + com.muyu + muyu-net-working-common + 3.6.3 + compile + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java new file mode 100644 index 0000000..d117e7d --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java @@ -0,0 +1,40 @@ +//package com.muyu.customer.business.domain; +// +//import com.muyu.common.core.annotation.Excel; +//import com.muyu.common.core.web.domain.BaseEntity; +//import lombok.AllArgsConstructor; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.NoArgsConstructor; +//import lombok.experimental.SuperBuilder; +// +///** +// * 多数据源对象 EnterpriseInfo +// * +// * @author DeKangLiu +// * Date 2024/6/22 20:37 +// */ +//@Data +//@SuperBuilder +//@NoArgsConstructor +//@AllArgsConstructor +//@EqualsAndHashCode(callSuper = true) +////@TableName("entinfo") +//public class EnterPriseInfo extends BaseEntity { +// private static final long serialVersionUID = 1L; +// +// /** 数据源key */ +// @Excel(name = "数据源key") +// private String entCode; +// +// /** 数据源ip */ +// @Excel(name = "数据源ip") +// private String ip; +// +// /** 数据源端口 */ +// @Excel(name = "数据源端口") +// private Integer port; +// +// /** 数据源ID */ +// private Long id; +//} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java new file mode 100644 index 0000000..612ba81 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java @@ -0,0 +1,24 @@ +//package com.muyu.customer.business.remote; +// +//import com.muyu.common.core.constant.ServiceNameConstants; +//import com.muyu.customer.business.remote.factory.RemoteBusinessFallbackFactory; +//import org.springframework.cloud.openfeign.FeignClient; +//import org.springframework.web.bind.annotation.GetMapping; +//import com.muyu.net.working.domain.DataSource; +//import java.util.List; +// +///** +// * 用户服务 RemoteBusinessService +// * +// * @author DeKangLiu +// * Date 2024/6/22 20:39 +// */ +//@FeignClient( +// contextId = "remoteBusinessService", +// value = ServiceNameConstants.SYSTEM_BUSINESS, +// fallbackFactory = RemoteBusinessFallbackFactory.class +//) +//public interface RemoteBusinessService { +// @GetMapping("/datasource/listAll") +// public List listAll(); +//} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java new file mode 100644 index 0000000..4b1afca --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java @@ -0,0 +1,35 @@ +//package com.muyu.customer.business.remote.factory; +// +//import com.muyu.customer.business.remote.RemoteBusinessService; +//import com.muyu.net.working.domain.DataSource; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.cloud.openfeign.FallbackFactory; +//import org.springframework.stereotype.Component; +// +//import java.util.List; +// +///** +// * 熔断器 RemoteBusinessFallbackFactory +// * +// * @author DeKangLiu +// * Date 2024/6/22 20:41 +// */ +//@Component +//public class RemoteBusinessFallbackFactory implements FallbackFactory { +// private static final Logger log = LoggerFactory.getLogger(RemoteBusinessFallbackFactory.class); +// +// @Override +// public RemoteBusinessService create (Throwable throwable) { +// log.error("用户服务调用失败:{}", throwable.getMessage()); +// return new RemoteBusinessService() { +// /** +// * 获取所有企业信息 +// */ +// @Override +// public List listAll() { +// return null; +// } +// }; +// } +//} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml index f49f4d2..ede8746 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml @@ -72,6 +72,11 @@ com.muyu muyu-common-datascope + + + org.springframework.boot + spring-boot-starter-amqp + @@ -84,10 +89,28 @@ com.muyu muyu-common-swagger + + + + + + + + org.json + json + 20140107 + com.muyu - muyu-common-saas + muyu-net-working-common 3.6.3 + compile + + + com.muyu + muyu-net-working-remote + 3.6.3 + compile diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java index a5d0d96..b2a849b 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java @@ -18,8 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication -//@EnableScheduling +@SpringBootApplication(exclude = {DynamicDataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class }) public class MuYuCustomerBusinessApplication { public static void main (String[] args) { SpringApplication.run(MuYuCustomerBusinessApplication.class, args); diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/ConfirmCallbackConfig.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/ConfirmCallbackConfig.java new file mode 100644 index 0000000..47ca454 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/ConfirmCallbackConfig.java @@ -0,0 +1,48 @@ +package com.muyu.customer.business.config; + +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 +public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * @PostContruct是spring框架的注解，在⽅法上加该注解会在项⽬启动的时候执⾏该⽅法，也可以理解为在spring容器初始化的时候执 + * @PostConstruct bean 被初始化的时候执行的方法的注解 + * @PreDestory bean 被销毁的时候执行的方法的注解 + */ + @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) { + // 消息投递到 broker 的状态，true表示成功 + System.out.println("消息发送成功！"); + } else { + // 发送异常 + System.out.println("发送异常原因 = " + cause); + // TODO 可以将消息 内容 以及 失败的原因 记录到 日志表中 + } + } + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/RabbitAdminConfig.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/RabbitAdminConfig.java new file mode 100644 index 0000000..24d4ec4 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/RabbitAdminConfig.java @@ -0,0 +1,53 @@ +package com.muyu.customer.business.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; + +/** + * RabbitAdmin是RabbitMQ的一个Java客户端库，它提供了管理RabbitMQ资源的功能。它是通过与RabbitMQ服务器进行交互来执行管理操作的。 + */ +@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; + + /** + * 构建 RabbitMQ的连接工厂 + * @return + */ + @Bean + public ConnectionFactory connectionFactory() { + CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); + connectionFactory.setAddresses(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setVirtualHost(virtualhost); + // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效 + connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED); + connectionFactory.setPublisherReturns(true); + return connectionFactory; + } + + /** + * 自己初始化 RabbitAdmin + * @param connectionFactory + * @return + */ + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); + rabbitAdmin.setAutoStartup(true); + return rabbitAdmin; + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/RabbitmqConfig.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/RabbitmqConfig.java new file mode 100644 index 0000000..0ae119c --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/RabbitmqConfig.java @@ -0,0 +1,15 @@ +package com.muyu.customer.business.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; + +@Configuration +public class RabbitmqConfig { + // 消息转换配置 + @Bean + public MessageConverter jsonMessageConverter() { + return new Jackson2JsonMessageConverter(); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/ReturnCallbackConfig.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/ReturnCallbackConfig.java new file mode 100644 index 0000000..3500376 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/config/ReturnCallbackConfig.java @@ -0,0 +1,34 @@ +package com.muyu.customer.business.config; + +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; + +/** + * 消息发送到队列的确认 一旦消息发送到队列失败 则会执行 returnedMessage 方法 + */ +@Component +public class ReturnCallbackConfig implements RabbitTemplate.ReturnsCallback { + + @Autowired + private 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) { + System.out.println("消息" + returnedMessage.getMessage().toString() + "被交换机" + returnedMessage.getExchange() + "回退！" + + "退回原因为：" + returnedMessage.getReplyText()); + // 回退了所有的信息，可做补偿机制 记录到 数据库 + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java new file mode 100644 index 0000000..2e588da --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java @@ -0,0 +1,114 @@ +package com.muyu.customer.business.consumer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.customer.business.domain.FaultRecord; +import com.muyu.customer.business.saas.holder.DynamicDataSourceHolder; +import com.muyu.customer.business.service.FaultRecordService; +import org.springframework.amqp.core.ExchangeTypes; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Component; +import com.rabbitmq.client.Channel; +import lombok.extern.log4j.Log4j2; +import org.springframework.amqp.core.Message; + +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * rabbitMQ消费者 Task + * + * @author DeKangLiu + * Date 2024/6/20 22:33 + */ +@Component +@Log4j2 +public class RabbitConsumer { + @Autowired + private FaultRecordService faultRecordService; + @Autowired + private StringRedisTemplate redisTemplate; + + @RabbitListener(bindings = {@QueueBinding(value = @Queue(name = "error"), + exchange = @Exchange(name = "carnet_fault_event", type = ExchangeTypes.DIRECT))}) +public void consumptionStartMessage(Message message, Channel channel) { + try { +// DynamicDataSourceHolder.setDynamicDataSourceKey("liu_"+42); + log.info("接收到消息：{}", new String(message.getBody())); + String body= new String(message.getBody()); + String[] split = body.split("_"); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = dateFormat.parse(split[3]); + String s = redisTemplate.opsForValue().get(split[0]+"1"); + System.out.println(s); + //选择数据源，切换数据源， + DynamicDataSourceHolder.setDynamicDataSourceKey("liu_"+s); + FaultRecord build = FaultRecord.builder() + .vin(split[0]) + .faultCode(split[1]) + .faultLevel(split[2]) + .startTime(date) + .build(); + log.info("123：{}",build); + faultRecordService.save(build); + // 移除数据源， + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); + log.info("消费成功！数据源为：{}",message); + + } catch (Exception e) { + log.info("消费失败，{}",e.getMessage()); + try { + //回退消息 + channel.basicReject(message.getMessageProperties().getDeliveryTag(),false); + log.info("回退成功"); + }catch (IOException ex){ + log.info("回退失败:{}",ex.getMessage()); + } + throw new RuntimeException(e); + } +} + @RabbitListener(bindings = {@QueueBinding(value = @Queue(name = "success"), + exchange = @Exchange(name = "carnet_fault_event", type = ExchangeTypes.DIRECT))}) + public void successMessage(Message message, Channel channel) { + try { + log.info("恢复正常消息：{}", new String(message.getBody())); + String body= new String(message.getBody()); + String[] split = body.split("_"); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = dateFormat.parse(split[3]); + String s = redisTemplate.opsForValue().get(split[0]+"1"); + System.out.println(s); + //选择数据源，切换数据源， + DynamicDataSourceHolder.setDynamicDataSourceKey("liu_"+s); + FaultRecord build = FaultRecord.builder() + .vin(split[0]) + .faultCode(split[1]) + .faultLevel(split[2]) + .startTime(date) + .build(); + FaultRecord faultRecordOne = faultRecordService.selectFault(build); + log.info("查询到的故障为：{}",faultRecordOne); + faultRecordOne.setEndTime(faultRecord.getEndTime()); + // 进行修改故障表 + faultRecordService.updateByFaultRecord(faultRecordOne); + // 移除数据源， + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); + } catch (Exception e) { + try { + channel.basicReject(message.getMessageProperties().getDeliveryTag(), true); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + } + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultCodeController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultCodeController.java new file mode 100644 index 0000000..6e9ecb9 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultCodeController.java @@ -0,0 +1,111 @@ +package com.muyu.customer.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.muyu.customer.business.domain.FaultCode; +import com.muyu.customer.business.domain.req.FaultCodeEditReq; +import com.muyu.customer.business.domain.req.FaultCodeQueryReq; +import com.muyu.customer.business.domain.req.FaultCodeSaveReq; +import com.muyu.customer.business.service.FaultCodeService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 车辆故障码Controller + * + * @author chx + * @date 2024-06-20 + */ +@Api(tags = "车辆故障码") +@RestController +@RequestMapping("/faultCode") +public class FaultCodeController extends BaseController { + @Autowired + private FaultCodeService faultCodeService; + + /** + * 查询车辆故障码列表 + */ + @ApiOperation("获取车辆故障码列表") + @RequiresPermissions("customerBusiness:faultCode:list") + @GetMapping("/list") + public Result> list(FaultCodeQueryReq faultCodeQueryReq) { + startPage(); + List list = faultCodeService.list(FaultCode.queryBuild(faultCodeQueryReq)); + return getDataTable(list); + } + + /** + * 导出车辆故障码列表 + */ + @ApiOperation("导出车辆故障码列表") + @RequiresPermissions("customerBusiness:faultCode:export") + @Log(title = "车辆故障码", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, FaultCode faultCode) { + List list = faultCodeService.list(faultCode); + ExcelUtil util = new ExcelUtil(FaultCode.class); + util.exportExcel(response, list, "车辆故障码数据"); + } + + /** + * 获取车辆故障码详细信息 + */ + @ApiOperation("获取车辆故障码详细信息") + @RequiresPermissions("customerBusiness:faultCode:query") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(faultCodeService.getById(id)); + } + + /** + * 新增车辆故障码 + */ + @RequiresPermissions("customerBusiness:faultCode:add") + @Log(title = "车辆故障码", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增车辆故障码") + public Result add(@RequestBody FaultCodeSaveReq faultCodeSaveReq) { + return toAjax(faultCodeService.save(FaultCode.saveBuild(faultCodeSaveReq))); + } + + /** + * 修改车辆故障码 + */ + @RequiresPermissions("customerBusiness:faultCode:edit") + @Log(title = "车辆故障码", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改车辆故障码") + public Result edit(@PathVariable Long id, @RequestBody FaultCodeEditReq faultCodeEditReq) { + return toAjax(faultCodeService.updateById(FaultCode.editBuild(id,faultCodeEditReq))); + } + + /** + * 删除车辆故障码 + */ + @RequiresPermissions("customerBusiness:faultCode:remove") + @Log(title = "车辆故障码", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除车辆故障码") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + return toAjax(faultCodeService.removeBatchByIds(ids)); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java new file mode 100644 index 0000000..ea82c06 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java @@ -0,0 +1,111 @@ +package com.muyu.customer.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.muyu.customer.business.domain.FaultRecord; +import com.muyu.customer.business.domain.req.FaultRecordEditReq; +import com.muyu.customer.business.domain.req.FaultRecordQueryReq; +import com.muyu.customer.business.domain.req.FaultRecordSaveReq; +import com.muyu.customer.business.service.FaultRecordService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 故障记录Controller + * + * @author chx + * @date 2024-06-20 + */ +@Api(tags = "故障记录") +@RestController +@RequestMapping("/faultRecord") +public class FaultRecordController extends BaseController { + @Autowired + private FaultRecordService faultRecordService; + + /** + * 查询故障记录列表 + */ + @ApiOperation("获取故障记录列表") + @RequiresPermissions("customerBusiness:faultRecord:list") + @GetMapping("/list") + public Result> list(FaultRecordQueryReq faultRecordQueryReq) { + startPage(); + List list = faultRecordService.list(FaultRecord.queryBuild(faultRecordQueryReq)); + return getDataTable(list); + } + + /** + * 导出故障记录列表 + */ + @ApiOperation("导出故障记录列表") + @RequiresPermissions("customerBusiness:faultRecord:export") + @Log(title = "故障记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, FaultRecord faultRecord) { + List list = faultRecordService.list(faultRecord); + ExcelUtil util = new ExcelUtil(FaultRecord.class); + util.exportExcel(response, list, "故障记录数据"); + } + + /** + * 获取故障记录详细信息 + */ + @ApiOperation("获取故障记录详细信息") + @RequiresPermissions("customerBusiness:faultRecord:query") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(faultRecordService.getById(id)); + } + + /** + * 新增故障记录 + */ + @RequiresPermissions("customerBusiness:faultRecord:add") + @Log(title = "故障记录", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增故障记录") + public Result add(@RequestBody FaultRecordSaveReq faultRecordSaveReq) { + return toAjax(faultRecordService.save(FaultRecord.saveBuild(faultRecordSaveReq))); + } + + /** + * 修改故障记录 + */ + @RequiresPermissions("customerBusiness:faultRecord:edit") + @Log(title = "故障记录", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改故障记录") + public Result edit(@PathVariable Long id, @RequestBody FaultRecordEditReq faultRecordEditReq) { + return toAjax(faultRecordService.updateById(FaultRecord.editBuild(id,faultRecordEditReq))); + } + + /** + * 删除故障记录 + */ + @RequiresPermissions("customerBusiness:faultRecord:remove") + @Log(title = "故障记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除故障记录") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + return toAjax(faultRecordService.removeBatchByIds(ids)); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java index e33d9a2..6ff616d 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java @@ -1,6 +1,9 @@ package com.muyu.customer.business.controller; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -10,6 +13,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.customer.business.mapper.VehicleMapper; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -38,6 +42,8 @@ public class VehicleController extends BaseController { private VehicleService vehicleService; @Autowired private HttpServletRequest request; + @Autowired + private StringRedisTemplate redisTemplate; /** * 查询车辆录入列表 @@ -47,7 +53,22 @@ public class VehicleController extends BaseController { @GetMapping("/list") public Result> list(VehicleQueryReq vehicleQueryReq) { startPage(); + List list = vehicleService.list(Vehicle.queryBuild(vehicleQueryReq)); + ExecutorService executor = Executors.newFixedThreadPool(list.size()); + list.forEach(vehicle -> { + executor.submit(new Runnable() { + @Override + public void run() { + redisTemplate + .opsForValue() + .set(vehicle.getVin()+"1", + String.valueOf(SecurityUtils.getLoginUser().getSysUser().getEnterpriseId()), + 24, + TimeUnit.HOURS); + } + }); + }); return getDataTable(list); } @@ -84,6 +105,7 @@ public class VehicleController extends BaseController { @PostMapping @ApiOperation("新增车辆录入") public Result add(@RequestBody VehicleSaveReq vehicleSaveReq) { + return toAjax(vehicleService.save(Vehicle.saveBuild(vehicleSaveReq))); } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleInfoController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleInfoController.java new file mode 100644 index 0000000..d28c388 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleInfoController.java @@ -0,0 +1,39 @@ +package com.muyu.customer.business.controller; + +import com.alibaba.fastjson2.JSON; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.customer.business.domain.Vehicle; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +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; + +/** + * 车辆录入对象 VehicleInfoController + * + * @author DeKangLiu + * Date 2024/6/22 20:31 + */ +@Log4j2 +@RestController +@RequestMapping("/vehicleInfo") +public class VehicleInfoController extends BaseController { + @Autowired + private RedisTemplate redisTemplate; + + @GetMapping("/list/{vin}") + public Result vehicleInfoAllList(@PathVariable String vin){ + + if (redisTemplate.hasKey(vin)){ + String lastElement = redisTemplate.opsForList().index(vin, -1); + Vehicle vehicleInfo = JSON.parseObject(lastElement, Vehicle.class); + return Result.success(vehicleInfo); + } + return null; + } + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java new file mode 100644 index 0000000..7ee1cd1 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java @@ -0,0 +1,15 @@ +package com.muyu.customer.business.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.customer.business.domain.FaultCode; + +/** + * 车辆故障码Mapper接口 + * + * @author chx + * @date 2024-06-20 + */ +public interface FaultCodeMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java new file mode 100644 index 0000000..ea1baff --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java @@ -0,0 +1,18 @@ +package com.muyu.customer.business.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.customer.business.domain.FaultRecord; + +/** + * 故障记录Mapper接口 + * + * @author chx + * @date 2024-06-20 + */ +public interface FaultRecordMapper extends BaseMapper { + + void addRecord(FaultRecord build); + + FaultRecord selectFault(FaultRecord build); +} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/DatasourceContent.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/contents/DatasourceContent.java similarity index 89% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/DatasourceContent.java rename to muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/contents/DatasourceContent.java index c794db9..8ac5ec6 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/DatasourceContent.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/contents/DatasourceContent.java @@ -1,4 +1,4 @@ -package com.muyu.saas.contents; +package com.muyu.customer.business.saas.contents; /** * @author DongZl diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/SaaSConstant.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/contents/SaaSConstant.java similarity index 77% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/SaaSConstant.java rename to muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/contents/SaaSConstant.java index e7ad2cf..3067bcd 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/SaaSConstant.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/contents/SaaSConstant.java @@ -1,4 +1,4 @@ -package com.muyu.saas.contents; +package com.muyu.customer.business.saas.contents; /** * SaaS常量 SaaSConstant diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/datasource/ManyDataSource.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/datasource/ManyDataSource.java new file mode 100644 index 0000000..ea34ca3 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/datasource/ManyDataSource.java @@ -0,0 +1,120 @@ +package com.muyu.customer.business.saas.datasource; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.fastjson.JSON; +import com.muyu.common.core.utils.SpringUtils; + +import com.muyu.common.redis.service.RedisService; +import com.muyu.customer.business.saas.factory.DruidDataSourceFactory; +import com.muyu.customer.business.saas.domain.model.DataSourceInfo; +import com.muyu.customer.business.saas.role.DynamicDataSource; +import com.muyu.net.working.remote.RemoteDatasourceService; +import com.rabbitmq.client.Channel; +import lombok.extern.log4j.Log4j2; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Primary; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Component; +import com.muyu.net.working.domain.DataSource; +import java.io.IOException; +import java.util.*; + +/** + * 多数据源 ManyDataSource + * + * @author DeKangLiu + * Date 2024/6/3 20:01 + */ +@Component +@Log4j2 +@AutoConfigureBefore(RedisService.class) +public class ManyDataSource { + + @Autowired + private StringRedisTemplate redisTemplate; + + @Autowired + private RemoteDatasourceService remoteDatasourceService; + + @Autowired + private RabbitTemplate rabbitTemplate; + @RabbitListener(queuesToDeclare = {@Queue(name = "liu-vehicle-exchange")}) + public void smsConfig(String msg, Message message, Channel channel){ + //获取消息的ID + String messageId = message.getMessageProperties().getMessageId(); + try { + //添加消息id到redis set集合中 添加成功返回1 表示未消费 添加失败返回0 表示已消费 + Long count = redisTemplate.opsForSet().add("messageId", messageId); + //添加成功 正常消费信息 + if (count == 1) { + log.info("开始消费"); + druidData(msg); + //确认消费 + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + log.info("消费成功"); + } + } catch (Exception e) { + log.info("消费失败，尝试重连"); + try { + //回退消息,尝试重连 + druidData(msg); + channel.basicReject(message.getMessageProperties().getDeliveryTag(),false); + log.info("消费失败"); + } catch (IOException ex) { + //回退失败 + log.info("消费异常"); + } + } + } + private void druidData(String msg) { + DataSource entInfo= JSON.parseObject(msg, DataSource.class); + log.info("消息为：{}",entInfo); + DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class); + DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); + DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(entInfo.getEnterpriseCode(), entInfo.getIp(), entInfo.getPort()); + DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); + dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); + } + + @Lazy + private List dataSourceInfoList(){ + List databaseNameList = new ArrayList<>(){{ + add(DataSource.builder() + .enterpriseCode("liu_44") + .ip("192.168.116.129") + .port(3350) + .build()); + }}; + List list = remoteDatasourceService.listAll(); + System.out.println(list); + databaseNameList.addAll(list); + return databaseNameList; + } + + @Bean + @Primary + public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { + //查企业 + Map dataSourceMap = new HashMap<>(); + dataSourceInfoList() + .stream() + .map(entInfo-> DataSourceInfo.hostAndPortBuild(entInfo.getEnterpriseCode(),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; + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/domain/model/DataSource.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/domain/model/DataSource.java new file mode 100644 index 0000000..7996217 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/domain/model/DataSource.java @@ -0,0 +1,52 @@ +package com.muyu.customer.business.saas.domain.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 多数据源对象 DataSource + * + * @author DeKangLiu + * Date 2024/6/22 22:56 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("datasource") +public class DataSource extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 数据源key */ + @Excel(name = "数据源key") + @ApiModelProperty(name = "数据源key", value = "数据源key") + private String enterpriseCode; + + /** 数据源端口 */ + @Excel(name = "数据源端口") + @ApiModelProperty(name = "数据源端口", value = "数据源端口") + private Integer port; + + /** 数据源ip */ + @Excel(name = "数据源ip") + @ApiModelProperty(name = "数据源ip", value = "数据源ip") + private String ip; + + +} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/DataSourceInfo.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/domain/model/DataSourceInfo.java similarity index 86% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/DataSourceInfo.java rename to muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/domain/model/DataSourceInfo.java index 04b9f75..e9bff93 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/DataSourceInfo.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/domain/model/DataSourceInfo.java @@ -1,8 +1,8 @@ -package com.muyu.saas.domain.model; +package com.muyu.customer.business.saas.domain.model; import com.muyu.common.core.utils.StringUtils; -import com.muyu.saas.contents.DatasourceContent; +import com.muyu.customer.business.saas.contents.DatasourceContent; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -44,7 +44,7 @@ public class DataSourceInfo { public static DataSourceInfo hostAndPortBuild(String key,String host, Integer port){ return DataSourceInfo.builder() .key(key) - .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host, port,port)) + .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host,port)) .password(DatasourceContent.PASSWORD) .userName(DatasourceContent.USER_NAME) .build(); diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/factory/DruidDataSourceFactory.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/factory/DruidDataSourceFactory.java similarity index 91% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/factory/DruidDataSourceFactory.java rename to muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/factory/DruidDataSourceFactory.java index bcd8ed8..8655146 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/factory/DruidDataSourceFactory.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/factory/DruidDataSourceFactory.java @@ -1,7 +1,7 @@ -package com.muyu.saas.factory; +package com.muyu.customer.business.saas.factory; import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.saas.domain.model.DataSourceInfo; +import com.muyu.customer.business.saas.domain.model.DataSourceInfo; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/holder/DynamicDataSourceHolder.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/holder/DynamicDataSourceHolder.java similarity index 95% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/holder/DynamicDataSourceHolder.java rename to muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/holder/DynamicDataSourceHolder.java index 4750419..7f1a352 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/holder/DynamicDataSourceHolder.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/holder/DynamicDataSourceHolder.java @@ -1,4 +1,4 @@ -package com.muyu.saas.holder; +package com.muyu.customer.business.saas.holder; import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/role/DataSourceAsp.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/role/DataSourceAsp.java new file mode 100644 index 0000000..39a670d --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/role/DataSourceAsp.java @@ -0,0 +1,51 @@ +package com.muyu.customer.business.saas.role; + + +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; +import com.muyu.customer.business.saas.holder.DynamicDataSourceHolder; +import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +/** + * 多数据源切面 + * + * @author DeKangLiu + * Date 2024/6/3 20:12 + */ +@Aspect +@Component +public class DataSourceAsp { + @Lazy + @Autowired + private RemoteUserService remoteUserService; + + @Pointcut("execution(public * com.muyu.customer.business.controller.*Controller.*(..))") + public void pointcut () { + } + + + /** + * 的每一個方法執行之前 執行的處理 + */ + @Before("pointcut()") + public void beforeMethod() { + Integer enterpriseId = SecurityUtils.getLoginUser().getSysUser().getEnterpriseId(); + DynamicDataSourceHolder.setDynamicDataSourceKey("liu_"+enterpriseId); + } + /** + * 的每一個方法執行之后 執行的處理 + * 无论正常还是异常终了 + * 不能接受到返回值 + */ + @After("pointcut()") + public void afterMethod() { + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + } +} diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/role/DynamicDataSource.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/role/DynamicDataSource.java similarity index 92% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/role/DynamicDataSource.java rename to muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/role/DynamicDataSource.java index c7ecfe7..d31a94a 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/role/DynamicDataSource.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/saas/role/DynamicDataSource.java @@ -1,7 +1,7 @@ -package com.muyu.saas.role; +package com.muyu.customer.business.saas.role; import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.saas.holder.DynamicDataSourceHolder; +import com.muyu.customer.business.saas.holder.DynamicDataSourceHolder; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultCodeService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultCodeService.java new file mode 100644 index 0000000..f5030fb --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultCodeService.java @@ -0,0 +1,22 @@ +package com.muyu.customer.business.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.customer.business.domain.FaultCode; + +/** + * 车辆故障码Service接口 + * + * @author chx + * @date 2024-06-20 + */ +public interface FaultCodeService extends IService { + /** + * 查询车辆故障码列表 + * + * @param faultCode 车辆故障码 + * @return 车辆故障码集合 + */ + public List list(FaultCode faultCode); + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java new file mode 100644 index 0000000..8f4ac0d --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java @@ -0,0 +1,25 @@ +package com.muyu.customer.business.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.customer.business.domain.FaultRecord; + +/** + * 故障记录Service接口 + * + * @author chx + * @date 2024-06-20 + */ +public interface FaultRecordService extends IService { + /** + * 查询故障记录列表 + * + * @param faultRecord 故障记录 + * @return 故障记录集合 + */ + public List list(FaultRecord faultRecord); + + void addRecord(FaultRecord build); + + FaultRecord selectFault(FaultRecord build); +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java index a93dcce..de7260e 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java @@ -3,6 +3,7 @@ package com.muyu.customer.business.service; import java.util.List; import com.muyu.customer.business.domain.Vehicle; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.customer.business.domain.req.VehicleQueryReq; /** * 车辆录入Service接口 diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultCodeServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultCodeServiceImpl.java new file mode 100644 index 0000000..fbad0f1 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultCodeServiceImpl.java @@ -0,0 +1,43 @@ +package com.muyu.customer.business.service.impl; + +import java.util.List; + +import com.muyu.common.core.utils.ObjUtils; +import com.muyu.customer.business.domain.FaultCode; +import com.muyu.customer.business.mapper.FaultCodeMapper; +import com.muyu.customer.business.service.FaultCodeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 车辆故障码Service业务层处理 + * + * @author chx + * @date 2024-06-20 + */ +@Slf4j +@Service +public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { + + /** + * 查询车辆故障码列表 + * + * @param faultCode 车辆故障码 + * @return 车辆故障码 + */ + @Override + public List list(FaultCode faultCode) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(faultCode.getFaultCode())){ + queryWrapper.eq(FaultCode::getFaultCode, faultCode.getFaultCode()); + } + + + + return list(queryWrapper); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java new file mode 100644 index 0000000..bcbf1a9 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java @@ -0,0 +1,61 @@ +package com.muyu.customer.business.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.ObjUtils; +import com.muyu.customer.business.domain.FaultRecord; +import com.muyu.customer.business.mapper.FaultRecordMapper; +import com.muyu.customer.business.service.FaultRecordService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 故障记录Service业务层处理 + * + * @author chx + * @date 2024-06-20 + */ +@Slf4j +@Service +public class FaultRecordServiceImpl extends ServiceImpl implements FaultRecordService { + @Autowired + private FaultRecordMapper faultRecordMapper; + + /** + * 查询故障记录列表 + * + * @param faultRecord 故障记录 + * @return 故障记录 + */ + @Override + public List list(FaultRecord faultRecord) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(faultRecord.getFaultCode())){ + queryWrapper.eq(FaultRecord::getFaultCode, faultRecord.getFaultCode()); + } + + if (ObjUtils.notNull(faultRecord.getVin())){ + queryWrapper.eq(FaultRecord::getVin, faultRecord.getVin()); + } + + + + + return list(queryWrapper); + } + + @Override + public void addRecord(FaultRecord build) { + faultRecordMapper.addRecord(build); + } + + @Override + public FaultRecord selectFault(FaultRecord build) { + return faultRecordMapper.selectFault(build); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java index 7cb72dd..81b1852 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java @@ -2,12 +2,14 @@ package com.muyu.customer.business.service.impl; import java.util.List; +import com.alibaba.fastjson2.JSONObject; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; import com.muyu.customer.business.domain.Vehicle; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import com.muyu.customer.business.mapper.FenceMapper; import com.muyu.customer.business.domain.Fence; @@ -15,7 +17,6 @@ import com.muyu.customer.business.service.FenceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.web.client.RestTemplate; - /** * 电子围栏Service业务层处理 * @@ -57,11 +58,20 @@ public class FenceServiceImpl extends ServiceImpl implement return list(queryWrapper); } + @Autowired + private StringRedisTemplate redisTemplate; @Override public Result getConn(Vehicle vehicle) { - Object forObject = restTemplate.getForObject("http://192.168.43.154:88/test/getList?vin="+vehicle.getVin(), Object.class); - - return Result.success(forObject); +// Object forObject = restTemplate.getForObject("http://192.168.43.154:88/test/getList?vin="+vehicle.getVin(), Object.class); + String value = ""; + if (Boolean.TRUE.equals(redisTemplate.hasKey(vehicle.getVin()))) { + value = redisTemplate.opsForValue().get(vehicle.getVin()); + System.out.println(value); + } + JSONObject jsonObject = JSONObject.parseObject(value); + System.out.println(jsonObject); + System.out.println(value); + return Result.success(jsonObject); } } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java index f2bbe1a..5db4bef 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java @@ -93,9 +93,6 @@ public class VehicleServiceImpl extends ServiceImpl imp } - - - return list(queryWrapper); } } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml index d352e31..bcc1efa 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml @@ -4,9 +4,26 @@ server: # Spring spring: + main: + allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册 + allow-circular-references: true application: # 应用名称 name: muyu-customer-business + rabbitmq: + host: 121.43.127.44 + port: 5672 + username: guest + password: guest + virtualHost: / + listener: + simple: + prefetch: 1 #每次消费一条消息 消费完成取下一条消费 + acknowledge-mode: manual # 手动确认消息 + retry: + enabled: true # 开启重试 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) profiles: # 环境配置 active: dev diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultCodeMapper.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultCodeMapper.xml new file mode 100644 index 0000000..4194f07 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultCodeMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + select id, fault_code, fault_label, fault_bit, fault_value from fault_code + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml new file mode 100644 index 0000000..1cce7a5 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + select id, fault_code, vin, start_time, end_time, fault_level, fault_handle from fault_record + + + INSERT INTO fault_record + (`fault_code`, `vin`, `start_time`, `end_time`, `fault_level`, `fault_handle`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES + values(#{faultCode},#{vin},#{startTime},null,#{faultLevel},#{faultHandle},null,null,null,null,null) + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/DataSource.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/DataSource.java new file mode 100644 index 0000000..87c16b9 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/DataSource.java @@ -0,0 +1,54 @@ +package com.muyu.net.working.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; + +/** + * 多数据源对象 DataSource + * + * @author DeKangLiu + * Date 2024/6/22 22:56 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("datasource") +public class DataSource extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 数据源key */ + @Excel(name = "数据源key") + @ApiModelProperty(name = "数据源key", value = "数据源key") + private String enterpriseCode; + + /** 数据源端口 */ + @Excel(name = "数据源端口") + @ApiModelProperty(name = "数据源端口", value = "数据源端口") + private Integer port; + + /** 数据源ip */ + @Excel(name = "数据源ip") + @ApiModelProperty(name = "数据源ip", value = "数据源ip") + private String ip; + + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml index 7fa8fbb..95f7565 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml @@ -17,6 +17,20 @@ UTF-8 + + org.springframework.cloud + spring-cloud-openfeign-core + + + com.muyu + muyu-common-core + + + com.muyu + muyu-net-working-common + 3.6.3 + compile + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/remote/RemoteDatasourceService.java b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/remote/RemoteDatasourceService.java new file mode 100644 index 0000000..f91ee9f --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/remote/RemoteDatasourceService.java @@ -0,0 +1,27 @@ +package com.muyu.net.working.remote; + + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.net.working.remote.factory.RemoteDatasourceFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import com.muyu.net.working.domain.DataSource; + +import java.util.List; + +/** + * 用户服务 RemoteBusinessService + * + * @author DeKangLiu + * Date 2024/6/22 20:39 + */ +@FeignClient( + contextId = "remoteDatasourceService", + value = ServiceNameConstants.DATASOURCE_SERVICE, + fallbackFactory = RemoteDatasourceFallbackFactory.class, + path = "/datasource" +) +public interface RemoteDatasourceService { + @GetMapping("/listAll") + public List listAll(); +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/remote/factory/RemoteDatasourceFallbackFactory.java b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/remote/factory/RemoteDatasourceFallbackFactory.java new file mode 100644 index 0000000..810dff3 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/remote/factory/RemoteDatasourceFallbackFactory.java @@ -0,0 +1,39 @@ +package com.muyu.net.working.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.net.working.domain.DataSource; +import com.muyu.net.working.remote.RemoteDatasourceService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +import javax.xml.crypto.Data; +import java.util.List; + +/** + * 熔断器 RemoteBusinessFallbackFactory + * + * @author DeKangLiu + * Date 2024/6/22 20:41 + */ +@Component +public class RemoteDatasourceFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteDatasourceFallbackFactory.class); + + @Override + public RemoteDatasourceService create (Throwable throwable) { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteDatasourceService() { + + /** + * + * @return + */ + @Override + public List listAll() { + return null; + } + }; + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..bd6bb87 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.net.working.remote.factory.RemoteDatasourceFallbackFactory diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml index 4f40f0c..c5b11bc 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml @@ -93,6 +93,11 @@ com.muyu muyu-common-swagger + + org.springframework.amqp + spring-rabbit + 2.4.1 + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/ConfirmCallbackConfig.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/ConfirmCallbackConfig.java new file mode 100644 index 0000000..ec6cc31 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/ConfirmCallbackConfig.java @@ -0,0 +1,48 @@ +package com.muyu.net.working.config; + +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 +public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * @PostContruct是spring框架的注解，在⽅法上加该注解会在项⽬启动的时候执⾏该⽅法，也可以理解为在spring容器初始化的时候执 + * @PostConstruct bean 被初始化的时候执行的方法的注解 + * @PreDestory bean 被销毁的时候执行的方法的注解 + */ + @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) { + // 消息投递到 broker 的状态，true表示成功 + System.out.println("消息发送成功！"); + } else { + // 发送异常 + System.out.println("发送异常原因 = " + cause); + // TODO 可以将消息 内容 以及 失败的原因 记录到 日志表中 + } + } + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/RabbitAdminConfig.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/RabbitAdminConfig.java new file mode 100644 index 0000000..5db47c2 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/RabbitAdminConfig.java @@ -0,0 +1,53 @@ +package com.muyu.net.working.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; + +/** + * RabbitAdmin是RabbitMQ的一个Java客户端库，它提供了管理RabbitMQ资源的功能。它是通过与RabbitMQ服务器进行交互来执行管理操作的。 + */ +@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; + + /** + * 构建 RabbitMQ的连接工厂 + * @return + */ + @Bean + public ConnectionFactory connectionFactory() { + CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); + connectionFactory.setAddresses(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setVirtualHost(virtualhost); + // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效 + connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED); + connectionFactory.setPublisherReturns(true); + return connectionFactory; + } + + /** + * 自己初始化 RabbitAdmin + * @param connectionFactory + * @return + */ + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); + rabbitAdmin.setAutoStartup(true); + return rabbitAdmin; + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/RabbitmqConfig.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/RabbitmqConfig.java new file mode 100644 index 0000000..6d87484 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/RabbitmqConfig.java @@ -0,0 +1,16 @@ +package com.muyu.net.working.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; + +@Configuration +public class RabbitmqConfig { + // 消息转换配置 + @Bean + public MessageConverter jsonMessageConverter() { + // 使用json序列化方式，进行消息转换 + return new Jackson2JsonMessageConverter(); + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/ReturnCallbackConfig.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/ReturnCallbackConfig.java new file mode 100644 index 0000000..583cd2b --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/config/ReturnCallbackConfig.java @@ -0,0 +1,34 @@ +package com.muyu.net.working.config; + +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; + +/** + * 消息发送到队列的确认 一旦消息发送到队列失败 则会执行 returnedMessage 方法 + */ +@Component +public class ReturnCallbackConfig implements RabbitTemplate.ReturnsCallback { + + @Autowired + private 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) { + System.out.println("消息" + returnedMessage.getMessage().toString() + "被交换机" + returnedMessage.getExchange() + "回退！" + + "退回原因为：" + returnedMessage.getReplyText()); + // 回退了所有的信息，可做补偿机制 记录到 数据库 + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/DataSourceController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/DataSourceController.java new file mode 100644 index 0000000..2ad540a --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/DataSourceController.java @@ -0,0 +1,53 @@ +package com.muyu.net.working.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.net.working.domain.DataSource; +import com.muyu.net.working.domain.Enterprise; +import com.muyu.net.working.service.DataSourceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 多数据源控制层 DataSourceController + * + * @author DeKangLiu + * Date 2024/6/22 23:07 + */ +@Api(tags = "多数据源") +@Log4j2 +@RestController +@RequestMapping("/datasource") +public class DataSourceController extends BaseController { + @Autowired + private DataSourceService dataSourceService; + + @ApiOperation("获取多数据源列表") + @GetMapping("/list") + public Result> list(DataSource dataSource) { + startPage(); + List list = dataSourceService.list(dataSource); + return getDataTable(list); + } + + @GetMapping("/listAll") + public List listAll() { + List list = dataSourceService.list(); + return list; + } + + @PostMapping + @ApiOperation("新增多数据源") + public Result add(@RequestBody DataSource dataSource) { + return toAjax(dataSourceService.save(dataSource)); + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java index 03ea348..a92d6ba 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java @@ -8,11 +8,9 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; -import com.muyu.system.remote.RemoteSysDeptService; -import com.muyu.system.remote.RemoteSysUserService; -import com.muyu.system.remote.factory.RemoteSysDeptFactory; +import com.muyu.common.system.remote.RemoteSysDeptService; +import com.muyu.common.system.remote.RemoteSysUserService; import io.swagger.annotations.*; -import io.swagger.models.auth.In; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/DataSourceMapper.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/DataSourceMapper.java new file mode 100644 index 0000000..229c097 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/DataSourceMapper.java @@ -0,0 +1,18 @@ +package com.muyu.net.working.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.net.working.domain.DataSource; +import com.muyu.net.working.domain.Enterprise; + +import java.util.List; + +/** + * DataSourcrMapper + * + * @author DeKangLiu + * Date 2024/6/22 23:13 + */ +public interface DataSourceMapper extends BaseMapper { + + List list(DataSource dataSource); +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/DataSourceService.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/DataSourceService.java new file mode 100644 index 0000000..11eb02f --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/DataSourceService.java @@ -0,0 +1,17 @@ +package com.muyu.net.working.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.net.working.domain.DataSource; + +import java.util.List; + +/** + * 多数据源业务层 DataSourceService + * + * @author DeKangLiu + * Date 2024/6/22 23:09 + */ +public interface DataSourceService extends IService { + + List list(DataSource dataSource); +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/DataSourceServiceImpl.java new file mode 100644 index 0000000..36eb633 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/DataSourceServiceImpl.java @@ -0,0 +1,30 @@ +package com.muyu.net.working.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.net.working.domain.DataSource; +import com.muyu.net.working.mapper.DataSourceMapper; +import com.muyu.net.working.service.DataSourceService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * DataSourceServiceImpl + * + * @author DeKangLiu + * Date 2024/6/22 23:12 + */ +@Service +@Slf4j +public class DataSourceServiceImpl extends ServiceImpl implements DataSourceService { + @Autowired + private DataSourceMapper dataSourceMapper; + + @Override + public List list(DataSource dataSource) { + return dataSourceMapper.list(dataSource); + } + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java index 985c30f..104d068 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java @@ -8,12 +8,16 @@ import java.net.URL; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import com.alibaba.fastjson.JSON; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; +import com.muyu.net.working.domain.DataSource; import com.muyu.net.working.domain.req.EnterpriseSaveReq; +import com.muyu.net.working.service.DataSourceService; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.net.working.mapper.EnterpriseMapper; @@ -34,6 +38,10 @@ public class EnterpriseServiceImpl extends ServiceImpl parammap = new HashMap<>(); parammap.put("enterpriseId", "liu-"+enterprise.getId()); parammap.put("mysqlPort", String.valueOf(3306+enterprise.getId())); @@ -161,6 +170,17 @@ public class EnterpriseServiceImpl extends ServiceImpl{ + message.getMessageProperties().setMessageId(UUID.randomUUID().toString()); + //设置消息延迟时间为5秒 + message.getMessageProperties().setDelay(5000); + return message; + } ); // 7.关闭HttpURLConnection连接 httpConn.disconnect(); } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml index 87f64d0..793357c 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml @@ -4,6 +4,20 @@ server: # Spring spring: + rabbitmq: + host: 121.43.127.44 + port: 5672 + username: guest + password: guest + virtualHost: / + listener: + simple: + prefetch: 1 #每次消费一条消息 消费完成取下一条消费 + acknowledge-mode: manual # 手动确认消息 + retry: + enabled: true # 开启重试 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) application: # 应用名称 name: muyu-net-working diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/datasource/DataSourceMapper.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/datasource/DataSourceMapper.xml new file mode 100644 index 0000000..0c58490 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/datasource/DataSourceMapper.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 71898a6..0000000 --- a/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.muyu.system.remote.factory.RemoteSysUserFactory -com.muyu.system.remote.factory.RemoteSysDeptFactory