From 09a4b163164a9474483a52d12267f23d40dbd8f6 Mon Sep 17 00:00:00 2001 From: fuck_zhn <2218834824@qq.com> Date: Wed, 22 Nov 2023 09:25:58 +0800 Subject: [PATCH] =?UTF-8?q?aop=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dragon/car/config/ConfigAspect.java | 22 +++ .../java/com/dragon/car/domain/FaultCode.java | 5 + .../car/domain/resp/VehicleFaultInfoResp.java | 2 + .../java/com/dragon/car/utils/LogAOP.java | 141 ++++++++++++++++ .../com/dragon/car/utils/LogRecordAspect.java | 158 ++++++++++++++++++ .../server/service/impl/FaultServiceImpl.java | 29 ---- .../{server => service}/DragonCarMain.java | 2 +- .../controller/CarController.java | 46 +++-- .../service/controller/FaultController.java | 30 ++++ .../mapper/CarManageMapper.java} | 4 +- .../car/service/mapper/FaultCodeMapper.java | 26 +++ .../service/CarManageService.java} | 4 +- .../service/FaultService.java | 12 +- .../service/impl/CarManageServiceImpl.java} | 10 +- .../service/impl/FaultServiceImpl.java | 47 ++++++ 15 files changed, 486 insertions(+), 52 deletions(-) create mode 100644 dragon-car-common/src/main/java/com/dragon/car/config/ConfigAspect.java create mode 100644 dragon-car-common/src/main/java/com/dragon/car/utils/LogAOP.java create mode 100644 dragon-car-common/src/main/java/com/dragon/car/utils/LogRecordAspect.java delete mode 100644 dragon-car-service/src/main/java/com/dragon/car/server/service/impl/FaultServiceImpl.java rename dragon-car-service/src/main/java/com/dragon/car/{server => service}/DragonCarMain.java (94%) rename dragon-car-service/src/main/java/com/dragon/car/{server => service}/controller/CarController.java (67%) create mode 100644 dragon-car-service/src/main/java/com/dragon/car/service/controller/FaultController.java rename dragon-car-service/src/main/java/com/dragon/car/{server/mapper/ReqCarMapper.java => service/mapper/CarManageMapper.java} (66%) create mode 100644 dragon-car-service/src/main/java/com/dragon/car/service/mapper/FaultCodeMapper.java rename dragon-car-service/src/main/java/com/dragon/car/{server/service/CarService.java => service/service/CarManageService.java} (90%) rename dragon-car-service/src/main/java/com/dragon/car/{server => service}/service/FaultService.java (58%) rename dragon-car-service/src/main/java/com/dragon/car/{server/service/impl/CarServiceImpl.java => service/service/impl/CarManageServiceImpl.java} (87%) create mode 100644 dragon-car-service/src/main/java/com/dragon/car/service/service/impl/FaultServiceImpl.java diff --git a/dragon-car-common/src/main/java/com/dragon/car/config/ConfigAspect.java b/dragon-car-common/src/main/java/com/dragon/car/config/ConfigAspect.java new file mode 100644 index 0000000..c075cb5 --- /dev/null +++ b/dragon-car-common/src/main/java/com/dragon/car/config/ConfigAspect.java @@ -0,0 +1,22 @@ +package com.dragon.car.config; + +import com.dragon.car.utils.LogRecordAspect; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +/** + * @author : Administrator + * @Description : 配置类: [{日志AOP},{}] + */ +@Configuration +@EnableAspectJAutoProxy +public class ConfigAspect { + + /** 启用切面处理和开启自动代理 */ + + @Bean + public LogRecordAspect logRecordAspect () { + return new LogRecordAspect (); + } +} diff --git a/dragon-car-common/src/main/java/com/dragon/car/domain/FaultCode.java b/dragon-car-common/src/main/java/com/dragon/car/domain/FaultCode.java index ab68b39..4c4dbcf 100644 --- a/dragon-car-common/src/main/java/com/dragon/car/domain/FaultCode.java +++ b/dragon-car-common/src/main/java/com/dragon/car/domain/FaultCode.java @@ -1,5 +1,8 @@ package com.dragon.car.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -9,11 +12,13 @@ import lombok.Data; */ @Data @Builder +@TableName ("fault_code") public class FaultCode { /** * 故障码编号 */ + @TableId (type = IdType.AUTO) private Integer id; /** diff --git a/dragon-car-common/src/main/java/com/dragon/car/domain/resp/VehicleFaultInfoResp.java b/dragon-car-common/src/main/java/com/dragon/car/domain/resp/VehicleFaultInfoResp.java index 48121c0..d3fd6b5 100644 --- a/dragon-car-common/src/main/java/com/dragon/car/domain/resp/VehicleFaultInfoResp.java +++ b/dragon-car-common/src/main/java/com/dragon/car/domain/resp/VehicleFaultInfoResp.java @@ -1,5 +1,6 @@ package com.dragon.car.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; @@ -11,6 +12,7 @@ import java.time.LocalDateTime; */ @Data @Builder +@TableName ("vehicleFaultInfoResp") public class VehicleFaultInfoResp { private Integer id; private Integer vehicleId; diff --git a/dragon-car-common/src/main/java/com/dragon/car/utils/LogAOP.java b/dragon-car-common/src/main/java/com/dragon/car/utils/LogAOP.java new file mode 100644 index 0000000..25a8bf0 --- /dev/null +++ b/dragon-car-common/src/main/java/com/dragon/car/utils/LogAOP.java @@ -0,0 +1,141 @@ +package com.dragon.car.utils; + +import com.dragon.common.core.constant.SecurityConstants; +import com.dragon.common.core.domain.Result; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.*; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Optional; +import java.util.UUID; + +/** + * @author : Administrator + * @description : 更新AOP日志 + */ +@Component +@Aspect +@Slf4j +public class LogAOP { + /** + * com.dragon.car.service.controller：表示匹配这个包下的类。 + * ..：表示匹配任意子包。 + * ：表示匹配任意类。 + * .*：表示匹配任意方法。 + * (..)：表示匹配任意参数列表的方法。 + */ + private static final String POINT = "execution(* com.dragon.car.service.controller..*.*(..))"; + private static final ThreadLocal START_TIME = ThreadLocal.withInitial (System::currentTimeMillis); + private static final ThreadLocal SEQUENCE = ThreadLocal.withInitial ( + () -> UUID + .randomUUID () + .toString () + .replaceAll ("-", "")); + + @Pointcut (POINT) + public void executeService () { + + } + + /** 前置通知 */ + @Before ("executeService()") + public void before (JoinPoint joinPoint) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes (); + HttpServletRequest request = Optional.ofNullable (attributes).map (ServletRequestAttributes::getRequest).orElse (null); + String ipAddress = Optional.ofNullable (request).map (r -> r.getHeader ("X-Forwarded-For")).orElse (null); + + if (ipAddress == null || ipAddress.isEmpty () || "unknown".equalsIgnoreCase (ipAddress)) { + Optional.ofNullable (request).map (HttpServletRequest::getRemoteAddr).orElse (null); + } + else { + ipAddress = ipAddress.split (",")[0]; + } + String headers = Optional.ofNullable (request).map (HttpServletRequest::getHeaderNames) + .map (Enumeration::asIterator) + .stream () + .map (name -> name + ":" + request.getHeader (name.toString ())) + .reduce ("", (a, b) -> a + "|" + b); + + + String parameters = Optional.ofNullable (request).map (HttpServletRequest::getParameterMap) + .map (map -> map.entrySet () + .stream () + .map (entry -> entry.getKey () + ":" + Arrays.toString (entry.getValue ())) + .reduce ("", (a, b) -> a + "|" + b)) + .orElse (""); + log.info ( + """ + trace log begin --> sequence::{}, + userName::{}, + RealIp::{}, + User- Agent::{}, + requestUri::{}, + header::{}, + requestMethod::{}, + request::{}, + args::{} + """, + + SEQUENCE.get (), SecurityConstants.DETAILS_USERNAME, ipAddress, + Optional.ofNullable (request) + .map (r -> r.getHeader ("User-Agent")) + .orElse (""), + Optional.ofNullable (request) + .map (HttpServletRequest::getRequestURI) + .orElse (""), + headers, + Optional.ofNullable (request) + .map (HttpServletRequest::getMethod) + .orElse (""), + Optional.ofNullable (request) + .map (HttpServletRequest::toString) + .orElse (""), + Arrays.deepToString (joinPoint.getArgs ()) + ); + + START_TIME.set (System.currentTimeMillis ()); + + } + + /** 后置 */ + @AfterReturning (pointcut = "executeService()", returning = "result") + public void after (Object result) { + String responseBody = result instanceof Result ? result.toString () : "not standard response"; + log.info (""" + trace log end -->sequence::{}, used::{}ms, responseBody::{} + """, SEQUENCE.get (), (System.currentTimeMillis () - START_TIME.get ()), responseBody); + SEQUENCE.remove (); + START_TIME.remove (); + } + + /** 异常 */ + @AfterThrowing (pointcut = "executeService()", throwing = "e") + public void afterThrowing (JoinPoint joinPoint, Exception e) { + log.error ( + """ + trace log exception --> sequence::{}, + message::{}, + requestMethod::{}, + requestUri::{}, + args::{} + """, + SEQUENCE.get (), + e.getMessage (), + Optional.ofNullable (RequestContextHolder.getRequestAttributes ()) + .map (attributes -> ((ServletRequestAttributes) attributes).getRequest ().getMethod ()) + .orElse (""), + Optional.ofNullable (RequestContextHolder.getRequestAttributes ()) + .map (attributes -> ((ServletRequestAttributes) attributes).getRequest ().getRequestURI ()) + .orElse (""), + Arrays.deepToString (joinPoint.getArgs ()), + e + ); + } + +} diff --git a/dragon-car-common/src/main/java/com/dragon/car/utils/LogRecordAspect.java b/dragon-car-common/src/main/java/com/dragon/car/utils/LogRecordAspect.java new file mode 100644 index 0000000..93ccc0a --- /dev/null +++ b/dragon-car-common/src/main/java/com/dragon/car/utils/LogRecordAspect.java @@ -0,0 +1,158 @@ +package com.dragon.car.utils; + +import com.dragon.common.core.constant.SecurityConstants; +import com.dragon.common.core.domain.Result; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.RandomStringUtils; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Map; + +/** + * @author : Administrator + * @Description : aop日志 + */ +@Aspect +@Component +@Slf4j +public class LogRecordAspect { + /** 定义切面表达式 */ + private static final String POINT = "execution(* com.dragon.car.server.controller..*.*(..))"; + /** 记录每次请求的开始时间 */ + private static final ThreadLocal START_TIME = new ThreadLocal<> (); + /** 记录每次请求的序列号 */ + private static final ThreadLocal SEQUENCE = new ThreadLocal<> (); + @Resource + HttpServletRequest request; + + @Pointcut (POINT) + public void executeService () { + + } + + @Before ("executeService()") + public void beFore (JoinPoint pjp) { + + //请求信息 + RequestAttributes req = RequestContextHolder.getRequestAttributes (); + ServletRequestAttributes reqSra = (ServletRequestAttributes) req; + HttpServletRequest request = null; + if (reqSra != null) { + request = reqSra.getRequest (); + } + String header = null; + if (request != null) { + header = request.getHeader ("X-Forwarded-For"); + } + if (header == null || header.isEmpty () || "unknown".equalsIgnoreCase (header)) { + + if (request != null) { + header = request.getRemoteAddr (); + } + } + else { + + int i = header.indexOf (","); + if (i != -1) { + header = header.substring (0, i); + } + } + /*ip地址是*/ + String ipAddr = null; + if (header != null) { + ipAddr = header.trim (); + } + Enumeration headerNames = null; + if (request != null) { + headerNames = request.getHeaderNames (); + } + StringBuilder stringBuilder = new StringBuilder (); + if (headerNames != null) { + while (headerNames.hasMoreElements ()) { + String s = headerNames.nextElement (); + stringBuilder.append (s) + .append (":") + .append (request.getHeader (s)) + .append ("|"); + } + } + /*解析参数*/ + Object[] pjpArgs = pjp.getArgs (); + Map parameterMap = null; + if (request != null) { + parameterMap = request.getParameterMap (); + } + StringBuilder builder = new StringBuilder (); + if (parameterMap != null) { + parameterMap.forEach ((k, v) -> builder + .append (k) + .append (":") + .append (Arrays.deepToString (v)) + .append ("|") + ); + } + /*每次请求的序列号,避免方便匹配同一个请求以及对应的响应*/ + + SEQUENCE.set (getRandom ()); + if (request != null) { + log.info ( + "trace log begin --> sequence::{},userName::{},RealIp::{},User-Agent::{},requestUri::{}" + ",header::{},requestMethod::{},request::{}, args::{}", + SEQUENCE.get (), + SecurityConstants.DETAILS_USERNAME, + ipAddr, + request.getHeader ("User-Agent"), + request.getRequestURI (), + builder.toString (), + request.getMethod (), + stringBuilder.toString (), + Arrays.deepToString (pjpArgs) + ); + } + + START_TIME.set (System.currentTimeMillis ()); + + } + + public String getRandom () { + + return RandomStringUtils.random (8, true, true); + } + + @AfterReturning (pointcut = "executeService()", returning = "result") + public void after (Object result) { + try { + String res = "not standard response"; + //自定义返回标准类 + if (result instanceof Result) { + res = result.toString (); + } + log.info ( + """ + trace log end -->sequence::{}, used::{}ms, responseBody::{} + """, + SEQUENCE.get (), (System.currentTimeMillis () - START_TIME.get ()), + res + ); + + } + catch (Exception e) { + throw new RuntimeException (e); + } + finally { + START_TIME.remove (); + SEQUENCE.remove (); + } + } +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/FaultServiceImpl.java b/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/FaultServiceImpl.java deleted file mode 100644 index 1388b03..0000000 --- a/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/FaultServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.dragon.car.server.service.impl; - -import com.dragon.car.domain.resp.ResquestFaultCode; -import com.dragon.car.server.service.FaultService; -import com.dragon.common.core.domain.Result; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author : Administrator - * @description : 车辆故障码维护 - */ -@Service -public class FaultServiceImpl implements FaultService { - - - /** - * 对故障码的管理查看 - * - * @return 故障码的返回结果集 - */ - @Override - public Result> faultCodeList () { - - - return null; - } -} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java b/dragon-car-service/src/main/java/com/dragon/car/service/DragonCarMain.java similarity index 94% rename from dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java rename to dragon-car-service/src/main/java/com/dragon/car/service/DragonCarMain.java index 3cd4b98..7bf5d5e 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/DragonCarMain.java @@ -1,4 +1,4 @@ -package com.dragon.car.server; +package com.dragon.car.service; import com.dragon.common.security.annotation.EnableCustomConfig; diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java b/dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java similarity index 67% rename from dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java rename to dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java index 0c2fe80..25c5546 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java @@ -1,9 +1,9 @@ -package com.dragon.car.server.controller; +package com.dragon.car.service.controller; import com.dragon.car.domain.req.RequestCar; import com.dragon.car.domain.resp.ResquestFaultCode; -import com.dragon.car.server.service.CarService; -import com.dragon.car.server.service.FaultService; +import com.dragon.car.service.service.CarManageService; +import com.dragon.car.service.service.FaultService; import com.dragon.common.core.domain.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -21,7 +21,7 @@ import java.util.List; @RequestMapping ("/car") public class CarController { @Autowired - CarService carService; + CarManageService carManageService; @Autowired FaultService faultService; @@ -33,32 +33,54 @@ public class CarController { @PostMapping ("/carInit") public Result> carInit () { - return carService.carInit (); + return carManageService.carInit (); } - //车辆添加 + /** + * 车辆添加 + * + * @param request + * + * @return + */ @PostMapping ("/carInsert") public Result carInsert (@RequestBody RequestCar request) { - return carService.carInsert (request); + return carManageService.carInsert (request); } - // 辆修改参数 + /** + * 辆修改参数 + * + * @param request + * + * @return + */ @PostMapping ("/carUpdate") public Result carUpdate (@RequestBody RequestCar request) { - return carService.carUpdate (request); + return carManageService.carUpdate (request); } - // 车辆删除 + /** + * 车辆删除 + * + * @param request + * + * @return + */ @PostMapping ("/carDelect") public Result carDelect (@RequestBody RequestCar request) { - return carService.carDelect (request); + return carManageService.carDelect (request); } - // TODO: 2023/11/20 车辆故障码 + /** + * 车辆故障码 + */ @PostMapping ("/faultCode") public Result> faultCodeList () { return faultService.faultCodeList (); } + + } diff --git a/dragon-car-service/src/main/java/com/dragon/car/service/controller/FaultController.java b/dragon-car-service/src/main/java/com/dragon/car/service/controller/FaultController.java new file mode 100644 index 0000000..2b122a1 --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/service/controller/FaultController.java @@ -0,0 +1,30 @@ +package com.dragon.car.service.controller; + +import com.dragon.car.domain.resp.VehicleFaultInfoResp; +import com.dragon.car.service.service.FaultService; +import com.dragon.common.core.domain.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author : Administrator + * @description : 故障码管理控制 + */ +@RestController +@RequestMapping ("/fault") +public class FaultController { + @Autowired + FaultService faultService; + + // 按 ID 选择带有故障代码的车辆故障信息 + + @GetMapping ("/{id}") + public Result getVehicleFaultInfoWithFaultCode (@PathVariable ("id") Integer id) { + return faultService.getVehicleFaultInfoWithFaultCodeById (id); + } + + +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/mapper/ReqCarMapper.java b/dragon-car-service/src/main/java/com/dragon/car/service/mapper/CarManageMapper.java similarity index 66% rename from dragon-car-service/src/main/java/com/dragon/car/server/mapper/ReqCarMapper.java rename to dragon-car-service/src/main/java/com/dragon/car/service/mapper/CarManageMapper.java index 2246504..a639b5c 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/server/mapper/ReqCarMapper.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/mapper/CarManageMapper.java @@ -1,4 +1,4 @@ -package com.dragon.car.server.mapper; +package com.dragon.car.service.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dragon.car.domain.req.RequestCar; @@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper; * @description : */ @Mapper -public interface ReqCarMapper extends BaseMapper { +public interface CarManageMapper extends BaseMapper { } diff --git a/dragon-car-service/src/main/java/com/dragon/car/service/mapper/FaultCodeMapper.java b/dragon-car-service/src/main/java/com/dragon/car/service/mapper/FaultCodeMapper.java new file mode 100644 index 0000000..1689aac --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/service/mapper/FaultCodeMapper.java @@ -0,0 +1,26 @@ +package com.dragon.car.service.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dragon.car.domain.VehicleFaultInfo; +import com.dragon.car.domain.resp.VehicleFaultInfoResp; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author : Administrator + * @description : 故障码映射 + */ +@Mapper +public interface FaultCodeMapper extends BaseMapper { + + @Select (""" + SELECT vfi.*, fc.code, fc.description + FROM vehicle_fault_info vfi + INNER JOIN fault_code fc ON vfi.fault_code_id = fc.id + WHERE vfi.id = #{id} + """) + VehicleFaultInfoResp selectVehicleFaultInfoWithFaultCodeById (@Param ("id") Integer id); + + +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java b/dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java similarity index 90% rename from dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java rename to dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java index 9337547..70339e0 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java @@ -1,4 +1,4 @@ -package com.dragon.car.server.service; +package com.dragon.car.service.service; import com.dragon.car.domain.req.RequestCar; import com.dragon.common.core.domain.Result; @@ -9,7 +9,7 @@ import java.util.List; * @author : Administrator * @description : */ -public interface CarService { +public interface CarManageService { /** * 初始化车辆 * diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/service/FaultService.java b/dragon-car-service/src/main/java/com/dragon/car/service/service/FaultService.java similarity index 58% rename from dragon-car-service/src/main/java/com/dragon/car/server/service/FaultService.java rename to dragon-car-service/src/main/java/com/dragon/car/service/service/FaultService.java index b40caaa..6fe4b4e 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/server/service/FaultService.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/service/FaultService.java @@ -1,6 +1,7 @@ -package com.dragon.car.server.service; +package com.dragon.car.service.service; import com.dragon.car.domain.resp.ResquestFaultCode; +import com.dragon.car.domain.resp.VehicleFaultInfoResp; import com.dragon.common.core.domain.Result; import java.util.List; @@ -18,4 +19,13 @@ public interface FaultService { * @return 故障码的返回结果集 */ Result> faultCodeList (); + + /** + * 按照id码查车 + * + * @param id + * + * @return List + */ + Result getVehicleFaultInfoWithFaultCodeById (Integer id); } diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java b/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java similarity index 87% rename from dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java rename to dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java index ccbcf7e..7fbd2d6 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java @@ -1,10 +1,10 @@ -package com.dragon.car.server.service.impl; +package com.dragon.car.service.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.dragon.car.domain.req.RequestCar; -import com.dragon.car.server.mapper.ReqCarMapper; -import com.dragon.car.server.service.CarService; +import com.dragon.car.service.mapper.CarManageMapper; +import com.dragon.car.service.service.CarManageService; import com.dragon.common.core.domain.Result; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; @@ -18,10 +18,10 @@ import java.util.List; */ @Service @Log4j2 -public class CarServiceImpl implements CarService { +public class CarManageServiceImpl implements CarManageService { @Resource - ReqCarMapper carMapper; + CarManageMapper carMapper; /** diff --git a/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/FaultServiceImpl.java b/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/FaultServiceImpl.java new file mode 100644 index 0000000..68d7521 --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/FaultServiceImpl.java @@ -0,0 +1,47 @@ +package com.dragon.car.service.service.impl; + +import com.dragon.car.domain.resp.ResquestFaultCode; +import com.dragon.car.domain.resp.VehicleFaultInfoResp; +import com.dragon.car.service.mapper.FaultCodeMapper; +import com.dragon.car.service.service.FaultService; +import com.dragon.common.core.domain.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author : Administrator + * @description : 车辆故障码维护 + */ +@Service +public class FaultServiceImpl implements FaultService { + @Autowired + FaultCodeMapper faultCodeMapper; + + /** + * 对故障码的管理查看 + * + * @return 故障码的返回结果集 + */ + @Override + public Result> faultCodeList () { + + + return null; + } + + /** + * 按照id码查车 + * + * @param id + * + * @return List + */ + @Override + public Result getVehicleFaultInfoWithFaultCodeById (Integer id) { + VehicleFaultInfoResp vehicleFaultInfoResp = faultCodeMapper.selectVehicleFaultInfoWithFaultCodeById (id); + + return Result.success (vehicleFaultInfoResp); + } +}