From cdff710a90f263e02be34c2d46758bc5d779585c Mon Sep 17 00:00:00 2001 From: zhang xu <2125563902@qq.com> Date: Tue, 25 Jun 2024 22:36:55 +0800 Subject: [PATCH] =?UTF-8?q?test:(=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8=20?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=B9=8B=E5=89=8D=E7=9A=84bug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/RemoteNetworkingService.java | 25 +++++++ ...a => RemoteNetworkingFallbackFactory.java} | 4 +- .../core/constant/ServiceNameConstants.java | 1 + .../common/datasource/annotation/Slave.java | 4 +- .../system/remote/RemoteUserService.java | 11 ++- .../factory/RemoteUserFallbackFactory.java | 12 ++-- .../java/com/muyu/domain/FaultRecord.java | 8 +-- .../src/main/java/com/muyu/domain/PayOf.java | 39 ---------- .../com/muyu/domain/datasources/EntInfo.java | 34 --------- .../com/muyu/domain/req/FaultRecordReqVo.java | 30 ++++++++ .../com/muyu/domain/vo/FaultRecordVo.java | 27 +++++++ .../service/impl/FaultRecordServiceImpl.java | 47 ------------ .../system/controller/SysUserController.java | 2 +- .../muyu/system/mapper/SysUserRoleMapper.java | 5 ++ .../resources/mapper/system/SysUserMapper.xml | 6 +- .../vehicle/myDatasource/ManyDataSource.java | 26 ++++--- .../com/muyu/vehicle/rabbit/Consumer.java | 23 +----- .../vehicle}/service/FaultCodeService.java | 3 +- .../vehicle}/service/FaultRecordService.java | 8 ++- .../service/Impl}/FaultCodeServiceImpl.java | 9 +-- .../service/Impl/FaultRecordServiceImpl.java | 72 +++++++++++++++++++ .../service/Impl/InformationServiceImpl.java | 10 ++- 22 files changed, 217 insertions(+), 189 deletions(-) create mode 100644 muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/RemoteNetworkingService.java rename muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/{RemoteUserFallbackFactory.java => RemoteNetworkingFallbackFactory.java} (86%) delete mode 100644 muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/PayOf.java delete mode 100644 muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/datasources/EntInfo.java create mode 100644 muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/FaultRecordReqVo.java create mode 100644 muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/vo/FaultRecordVo.java delete mode 100644 muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultRecordServiceImpl.java rename muyu-modules/{muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking => muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle}/service/FaultCodeService.java (86%) rename muyu-modules/{muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking => muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle}/service/FaultRecordService.java (69%) rename muyu-modules/{muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl => muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl}/FaultCodeServiceImpl.java (84%) create mode 100644 muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultRecordServiceImpl.java diff --git a/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/RemoteNetworkingService.java b/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/RemoteNetworkingService.java new file mode 100644 index 0000000..af014af --- /dev/null +++ b/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/RemoteNetworkingService.java @@ -0,0 +1,25 @@ +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.EntInfo; +import com.muyu.common.system.remote.factory.RemoteNetworkingFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + + +/** + * 用户服务 + * + * @author muyu + */ +@FeignClient(contextId = "remoteNetworkingService", value = ServiceNameConstants.NET, fallbackFactory = RemoteNetworkingFallbackFactory.class) +public interface RemoteNetworkingService { + @GetMapping("/entInfo/list") + public Result> list() ; + +} diff --git a/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/RemoteNetworkingFallbackFactory.java similarity index 86% rename from muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java rename to muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/RemoteNetworkingFallbackFactory.java index 1153182..27cc417 100644 --- a/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-business/src/main/java/com/muyu/common/system/remote/factory/RemoteNetworkingFallbackFactory.java @@ -16,8 +16,8 @@ import java.util.List; * @author muyu */ @Component -public class RemoteUserFallbackFactory implements FallbackFactory { - private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class); +public class RemoteNetworkingFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteNetworkingFallbackFactory.class); @Override public RemoteNetworkingService create (Throwable throwable) { 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..076de64 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,5 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "muyu-file"; + public static final String NET = "muyu-networking"; } diff --git a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java b/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java index 97d118d..64b84b1 100644 --- a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java +++ b/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java @@ -1,7 +1,9 @@ package com.muyu.common.datasource.annotation; -import com.muyu.common.datasource.annotation; + +import com.baomidou.dynamic.datasource.annotation.DS; + import java.lang.annotation.*; /** diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index 229d0c9..2e8677b 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -3,12 +3,12 @@ package com.muyu.common.system.remote; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.EntInfo; + import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; -//import com.muyu.domain.datasources.EntInfo; + import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,8 +38,7 @@ public interface RemoteUserService { @PostMapping("/user") public Result add (@Validated @RequestBody SysUser user); - @GetMapping("/list") - public Result> list(); + @PostMapping @@ -48,8 +47,8 @@ public interface RemoteUserService { - @GetMapping("selectUserById") - public Result selectUserById (Long userId); + @GetMapping("/user/selectUserById") + public Result selectUserById (@RequestParam("userId") Long userId); diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index a9f6c8d..3da8fd2 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,12 +1,12 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.EntInfo; + import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; -//import com.muyu.domain.datasources.EntInfo; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -39,10 +39,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory> list() { - return Result.error("获取失败"); - } @Override public Result addRole(SysRole role) { @@ -50,8 +46,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory selectUserById(Long userId) { + return Result.error("调用失败:"); } diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/FaultRecord.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/FaultRecord.java index 1873ec1..efdb091 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/FaultRecord.java +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/FaultRecord.java @@ -51,14 +51,14 @@ public class FaultRecord { private String vin; /** 故障开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(name = "故障开始时间", value = "故障开始时间") private Date startTime; /** 故障结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "故障结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "故障结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(name = "故障结束时间", value = "故障结束时间") private Date endTime; diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/PayOf.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/PayOf.java deleted file mode 100644 index 7424ee2..0000000 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/PayOf.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.muyu.domain; - -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import javax.naming.ldap.PagedResultsControl; - -/** 支付表 - * @ClassDescription: - * @JdkVersion: 17 - * @Author: zhangxu - * @Created: 2024/5/25 9:33 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor@SuperBuilder -public class PayOf extends BaseEntity { - /** - * 支付id - * */ - private Long id; - /** - * 企业id - * */ - private Long enterpriseId; - /** - * 支付方式/类型（id） - * */ - private Long modeOfPaymentId; - /** - * 需要支付的金额 - * */ - private Double price; - - -} diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/datasources/EntInfo.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/datasources/EntInfo.java deleted file mode 100644 index aebe816..0000000 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/datasources/EntInfo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.domain.datasources; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @ClassDescription: - * @JdkVersion: 17 - * @Author: zhangxu - * @Created: 2024/6/10 20:40 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@TableName("etn_info") -public class EntInfo { - @TableId(type = IdType.AUTO) - private Long id; - - private String entCode; - - private String ip; - - private Long port; - - -} diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/FaultRecordReqVo.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/FaultRecordReqVo.java new file mode 100644 index 0000000..7144c84 --- /dev/null +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/FaultRecordReqVo.java @@ -0,0 +1,30 @@ +package com.muyu.domain.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/6/24 8:47 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class FaultRecordReqVo { + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date max; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date min; + + +} diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/vo/FaultRecordVo.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/vo/FaultRecordVo.java new file mode 100644 index 0000000..8e9b1a4 --- /dev/null +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/vo/FaultRecordVo.java @@ -0,0 +1,27 @@ +package com.muyu.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/6/24 8:37 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class FaultRecordVo { + + private String faultCode; + + private String vin; + + private Integer count; + + private String faultLabel; +} diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultRecordServiceImpl.java b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultRecordServiceImpl.java deleted file mode 100644 index 338f175..0000000 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultRecordServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.muyu.networking.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.FaultRecord; -import com.muyu.networking.mapper.FaultRecordMapper; -import com.muyu.networking.service.FaultRecordService; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.amqp.RabbitTemplateConfigurer; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @ClassDescription: - * @JdkVersion: 17 - * @Author: zhangxu - * @Created: 2024/6/20 15:22 - */ -@Service -@Slf4j -public class FaultRecordServiceImpl extends ServiceImpl implements FaultRecordService { - - - - - - - /** - * 查询故障记录列表 - * - * @param faultRecord 故障记录 - * @return 故障记录 - */ - @Override - public List list(FaultRecord faultRecord) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return list(queryWrapper); - } - - - - - -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java index 284eb5e..0e81f87 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -69,7 +69,7 @@ public class SysUserController extends BaseController { @GetMapping("selectUserById") - public Result selectUserById (Long userId) { + public Result selectUserById (@RequestParam("userId") Long userId) { SysUser user = userService.selectUserById(userId); return success(user); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java index 512adb8..a6056ed 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java @@ -1,6 +1,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysUserRole; import org.apache.ibatis.annotations.Param; @@ -57,6 +58,10 @@ public interface SysUserRoleMapper extends BaseMapper { */ public int deleteUserRoleInfo (SysUserRole userRole); + + public SysUser selectById(Long id); + + /** * 批量取消授权用户角色 * diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 3a26e5d..08c3b77 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -14,6 +14,7 @@ + @@ -56,6 +57,7 @@ u.avatar, u.phonenumber, u.ent_id, + u.enterprise_id, u.password, u.sex, u.status, @@ -85,7 +87,7 @@ - where u.user_id = #{userId} diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java index 9e44453..96a8386 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java @@ -7,10 +7,10 @@ import com.alibaba.fastjson.JSON; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.system.domain.EntInfo; -import com.muyu.common.system.remote.RemoteUserService; + +import com.muyu.common.system.remote.RemoteNetworkingService; import com.muyu.vehicle.myDatasource.domain.DataSourceInfo; -import com.muyu.vehicle.myDatasource.domain.EnterpriseInfo; import com.muyu.vehicle.myDatasource.factory.DruidDataSourceFactory; import com.muyu.vehicle.myDatasource.rule.DynamicDataSource; import com.rabbitmq.client.Channel; @@ -26,10 +26,7 @@ import org.springframework.stereotype.Component; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @ClassDescription: @@ -43,7 +40,7 @@ public class ManyDataSource { @Autowired - private RemoteUserService remoteEntInfoService; + private RemoteNetworkingService remoteEntInfoService; @Autowired @@ -83,30 +80,30 @@ public class ManyDataSource { } } - private List dataSourceInfoList() { + private List dataSourceInfoList() { + List list = new ArrayList<>(); Result> entInfoResult = remoteEntInfoService.list(); List entInfoList = entInfoResult.getData(); - List list = new ArrayList<>(); entInfoList.forEach(entInfo -> { list.add( - EnterpriseInfo.builder() + EntInfo.builder() .entCode(entInfo.getEntCode()) .ip(entInfo.getIp()) - .port(String.valueOf(entInfo.getPort())) + .port(entInfo.getPort()) .build() ); }); + return list; } @Bean @Primary public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { - Map dataSourceMap = new HashMap<>(); dataSourceInfoList() .stream() - .map(enterpriseInfo -> DataSourceInfo.hostAndPortBuild(enterpriseInfo.getEntCode(), enterpriseInfo.getIp(), Integer.valueOf(enterpriseInfo.getPort()))) + .map(enterpriseInfo -> DataSourceInfo.hostAndPortBuild(enterpriseInfo.getEntCode(), enterpriseInfo.getIp(), enterpriseInfo.getPort().intValue())) .forEach(dataSourceInfo -> { dataSourceMap.put(dataSourceInfo.getKey(), druidDataSourceFactory.create(dataSourceInfo)); }); @@ -115,7 +112,8 @@ public class ManyDataSource { // dynamicDataSource.setDefaultTargetDataSource(masterDataSource()); dynamicDataSource.setTargetDataSources(dataSourceMap); //将数据源信息备份在defineTargetDataSources中 - dynamicDataSource.setDefaultTargetDataSource(dataSourceMap); + List list = dataSourceMap.values().stream().toList(); + dynamicDataSource.setDefineTargetDataSources(dataSourceMap); return dynamicDataSource; } diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/rabbit/Consumer.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/rabbit/Consumer.java index 24595f9..e280688 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/rabbit/Consumer.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/rabbit/Consumer.java @@ -34,8 +34,8 @@ import java.util.concurrent.Executors; @Component @Log4j2 public class Consumer { - private static final String QUEUE_NAME_EVENT_START = "zhiLian-vehicle-end"; - private static final String QUEUE_NAME_EVENT_ENT = "zhiLian-vehicle-start"; + private static final String QUEUE_NAME_EVENT_START = "zhiLian-vehicle-start"; + private static final String QUEUE_NAME_EVENT_ENT = "zhiLian-vehicle-end"; @Autowired private FaultRecordService recordService; @@ -69,13 +69,9 @@ public class Consumer { redisTemplate.opsForValue().set(information.getNumber()+"1", String.valueOf(information.getEnterpriseId())); } }); - }); DynamicDataSourceHolder.removeDynamicDataSourceKey(); - } - - @RabbitListener( queuesToDeclare= {@Queue(name = QUEUE_NAME_EVENT_START)}) public void receive(String msg, Channel channel, Message message) { //获取消息的ID @@ -102,36 +98,21 @@ public class Consumer { recordService.save(build); // 移除数据源， DynamicDataSourceHolder.removeDynamicDataSourceKey(); - } - }); - channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); log.info("消费成功！数据源为：{}",message); - } - } catch (IOException 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); - } } diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/FaultCodeService.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/FaultCodeService.java similarity index 86% rename from muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/FaultCodeService.java rename to muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/FaultCodeService.java index 95689bd..b1e8270 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/FaultCodeService.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/FaultCodeService.java @@ -1,9 +1,8 @@ -package com.muyu.networking.service; +package com.muyu.vehicle.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultCode; -import com.muyu.domain.FaultRecord; import java.util.List; diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/FaultRecordService.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/FaultRecordService.java similarity index 69% rename from muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/FaultRecordService.java rename to muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/FaultRecordService.java index c6c4734..b492505 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/FaultRecordService.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/FaultRecordService.java @@ -1,7 +1,10 @@ -package com.muyu.networking.service; +package com.muyu.vehicle.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultRecord; +import com.muyu.domain.req.FaultRecordReqVo; +import com.muyu.domain.vo.FaultRecordVo; + import java.util.List; @@ -24,8 +27,9 @@ public interface FaultRecordService extends IService */ public List list(FaultRecord faultRecord); + void updateByFaultRecord(FaultRecord build); FaultRecord getByFaultRecord(FaultRecord faultRecord); - void updateByFaultRecord(FaultRecord byFaultRecord); + List countList(FaultRecordReqVo recordReqVo); } diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultCodeServiceImpl.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultCodeServiceImpl.java similarity index 84% rename from muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultCodeServiceImpl.java rename to muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultCodeServiceImpl.java index 853a3c8..13e6104 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/FaultCodeServiceImpl.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultCodeServiceImpl.java @@ -1,13 +1,14 @@ -package com.muyu.networking.service.impl; +package com.muyu.vehicle.service.Impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultCode; -import com.muyu.networking.mapper.FaultCodeMapper; -import com.muyu.networking.service.FaultCodeService; +import com.muyu.vehicle.mapper.FaultCodeMapper; +import com.muyu.vehicle.service.FaultCodeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -32,7 +33,7 @@ public class FaultCodeServiceImpl extends ServiceImpl list(FaultCode faultCode) { - + diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultRecordServiceImpl.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultRecordServiceImpl.java new file mode 100644 index 0000000..e23924f --- /dev/null +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/FaultRecordServiceImpl.java @@ -0,0 +1,72 @@ +package com.muyu.vehicle.service.Impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.FaultRecord; + + +import com.muyu.domain.req.FaultRecordReqVo; +import com.muyu.domain.vo.FaultRecordVo; +import com.muyu.vehicle.mapper.FaultRecordMapper; +import com.muyu.vehicle.service.FaultRecordService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/6/20 15:22 + */ +@Service +@Slf4j +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 (StringUtils.isNotEmpty(faultRecord.getFaultCode())){ + queryWrapper.eq(FaultRecord::getFaultCode, faultRecord.getFaultCode()); + } + + if (StringUtils.isNotEmpty(faultRecord.getVin())){ + queryWrapper.eq(FaultRecord::getVin, faultRecord.getVin()); + } + return list(queryWrapper); + + } + + @Override + public void updateByFaultRecord(FaultRecord build) { + faultRecordMapper.updateByFaultRecord(build); + } + + @Override + public FaultRecord getByFaultRecord(FaultRecord faultRecord) { + return faultRecordMapper.getByFaultRecord(faultRecord); + } + + @Override + public List countList(FaultRecordReqVo recordReqVo) { + return faultRecordMapper.countList(recordReqVo); + } + + +} diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/InformationServiceImpl.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/InformationServiceImpl.java index ae0f48a..8975778 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/InformationServiceImpl.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/InformationServiceImpl.java @@ -4,7 +4,9 @@ package com.muyu.vehicle.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; + import com.muyu.domain.Information; +import com.muyu.domain.Vehicle; import com.muyu.vehicle.mapper.InformationMapper; import com.muyu.vehicle.service.IInformationService; import org.springframework.beans.factory.annotation.Autowired; @@ -48,8 +50,6 @@ public class InformationServiceImpl extends ServiceImpl selectInformationList(Information information) { - - return informationMapper.selectInformationList(information); } @@ -102,4 +102,10 @@ public class InformationServiceImpl extends ServiceImpl selectVehicleListAll(Information information) { + List information1 = informationMapper.selectVehicleListAll(information); + return information1; + } }