diff --git a/fance-menghang-service/src/main/java/com/shiyi/internet/aop/AopConfig.java b/fance-menghang-service/src/main/java/com/shiyi/internet/aop/AopConfig.java new file mode 100644 index 0000000..7eef592 --- /dev/null +++ b/fance-menghang-service/src/main/java/com/shiyi/internet/aop/AopConfig.java @@ -0,0 +1,76 @@ +package com.shiyi.internet.aop; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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.servlet.http.HttpServletRequest; + + +/** + * @Description : aop切面 + * @Author : YangHaoYu + * @Date: 2023-11-24 18:43 + */ +@Aspect +@Component +public class AopConfig { + //日志打印 + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + ThreadLocal threadLocal = new ThreadLocal<>(); + + /** + * @Description: 定义切面的那个类 + No such property: code for class: Script1 + * @return: void + * @Author: YHY + * @Updator: YHY + * @Date 2023/11/24 18:51 + */ + @Pointcut("execution(* com.shiyi.internet.controller.*.*(..))") + public void print(){} + + + @Around("print()") + public Object LogStart(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { + threadLocal.set(System.currentTimeMillis()); + //使用ServletRequestAttributes请求上下文获取更多 + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = attributes.getRequest(); + String typeName = proceedingJoinPoint.getSignature().getDeclaringTypeName(); + String name = proceedingJoinPoint.getSignature().getName(); + //使用数据来获取参数 + Object[] pointArgs = proceedingJoinPoint.getArgs(); + ObjectMapper objectMapper = new ObjectMapper(); + logger.info("—_—方—_—_—法_—_—_—启—_—_—动—_—_—开—_—_—始—_—_—希—_—_—望—_—_—无—_—_—B—_—_—U—_—_—G—_—"); + logger.info("|调用前是: 【{}】", typeName); + logger.info("|方法名称: 【{}】", name); + logger.info("|传递参数: 【{}】", objectMapper.writeValueAsString(objectMapper)); + logger.info("|URL: 【{}】", request.getRequestURI().toString()); + logger.info("IP: 【{}】", request.getRemoteAddr()); + logger.info("______________________________________________________________________"); + + + Object proceed = proceedingJoinPoint.proceed(); + logger.info("|调用前是: 【{}】", typeName); + logger.info("|方法名称: 【{}】", name); + logger.info("|传递参数: 【{}】", objectMapper.writeValueAsString(objectMapper)); + logger.info("|URL: 【{}】", request.getRequestURI().toString()); + logger.info("IP: 【{}】", request.getRemoteAddr()); + logger.info("|耗时: 【{}】", System.currentTimeMillis() - threadLocal.get()); + + return proceed; + } + + +} diff --git a/fance-menghang-service/src/main/java/com/shiyi/internet/controller/DrivingRecordController.java b/fance-menghang-service/src/main/java/com/shiyi/internet/controller/DrivingRecordController.java index 3fdab30..ed11e38 100644 --- a/fance-menghang-service/src/main/java/com/shiyi/internet/controller/DrivingRecordController.java +++ b/fance-menghang-service/src/main/java/com/shiyi/internet/controller/DrivingRecordController.java @@ -42,11 +42,7 @@ public class DrivingRecordController extends BaseController { @RequiresPermissions("record:record:list") @GetMapping("/list") public Result> list(DrivingRecord drivingRecord){ - log.info("功能名称:车辆行驶记录,请求URL:【{}】,请求方法:【{}】",request.getRequestURI(), - request.getMethod()); Result> result = drivingRecordService.listDriving(drivingRecord); - log.info("功能名称:车辆行驶记录,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -72,12 +68,8 @@ public class DrivingRecordController extends BaseController { */ @GetMapping("fingCarRecordById/{recordId}") public Result fingCarRecordById(@PathVariable Integer recordId){ - log.info("功能名称:查询详细车辆行驶记录,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),recordId); DrivingRecord drivingRecord = drivingRecordService.fingCarRecordById(recordId); Result result = Result.success(drivingRecord); - log.info("功能名称:查询详细车辆行驶记录,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(result)); return result; } @@ -91,12 +83,8 @@ public class DrivingRecordController extends BaseController { @Log(title = "车辆行驶记录", businessType = BusinessType.INSERT) @PostMapping("/insertDriving") public Result insertDriving(@RequestBody DrivingRecord drivingRecord){ - log.info("功能名称:添加车辆行驶记录,请求URL:【{}】,请求防范:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),drivingRecord); drivingRecordService.insertDriving(drivingRecord); Result result = Result.success(); - log.info("功能名称:添加车辆行驶记录,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(result)); return result; } @@ -109,12 +97,8 @@ public class DrivingRecordController extends BaseController { @Log(title = "修改车辆行驶记录", businessType = BusinessType.UPDATE) @PostMapping("/updateDrivingRecord") public Result updateDrivingRecord(@RequestBody DrivingRecord drivingRecord){ - log.info("功能名称:修改车辆行驶记录,请求URL:【{}】,请求方法:【{}】,请求参数:【{】】",request.getRequestURI(), - request.getMethod(),drivingRecord); drivingRecordService.updateDrivingRecord(drivingRecord); Result result = Result.success(); - log.info("功能名称:修改车辆行驶记录,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(result)); return result; } @@ -127,12 +111,8 @@ public class DrivingRecordController extends BaseController { @Log(title = "根据ID删除车辆行驶记录", businessType = BusinessType.DELETE) @PostMapping("/deleteDrivingRecord/{recordId}") public Result deleteDrivingRecord(@PathVariable Integer recordId){ - log.info("功能名称:根据ID删除车辆行驶记录,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),recordId); drivingRecordService.deleteDrivingRecord(recordId); Result result = Result.success(); - log.info("功能名称:根据ID删除车辆行驶记录,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(result)); return result; } diff --git a/fance-menghang-service/src/main/java/com/shiyi/internet/controller/FencingController.java b/fance-menghang-service/src/main/java/com/shiyi/internet/controller/FencingController.java index 0fe8989..38934f8 100644 --- a/fance-menghang-service/src/main/java/com/shiyi/internet/controller/FencingController.java +++ b/fance-menghang-service/src/main/java/com/shiyi/internet/controller/FencingController.java @@ -37,11 +37,7 @@ public class FencingController extends BaseController { */ @GetMapping("/fencingList") public Result> fencingList(){ - log.info("功能名称:电子围栏,请求URL:【{}】,请求方法:【{}】",request.getRequestURI(), - request.getMethod()); Result> result = fencingService.fencingList(); - log.info("功能名称:电子围栏,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -55,12 +51,8 @@ public class FencingController extends BaseController { */ @PostMapping("/addfencing") public Result addfencing(@RequestBody Fencing fencing){ - log.info("功能名称:添加电子围栏,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),fencing); fencingService.addfencing(fencing); Result result = Result.success(); - log.info("功能名称:添加电子围栏,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -74,11 +66,7 @@ public class FencingController extends BaseController { */ @PostMapping("/deleteFencingById/{fencingId}") public Result deleteFencingById(@PathVariable Integer fencingId){ - log.info("功能名称:获取编号删除围栏,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),fencingId); Result result = fencingService.deleteFencingById(fencingId); - log.info("功能名称:获取编号删除围栏,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -92,11 +80,7 @@ public class FencingController extends BaseController { */ @PostMapping("/updateFencing") public Result updateFencing(@RequestBody Fencing fencing){ - log.info("功能名称:修改围栏,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),fencing); Result result = fencingService.updateFencing(fencing); - log.info("功能名称:修改围栏,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -111,12 +95,8 @@ public class FencingController extends BaseController { */ @PostMapping("/findFencingById/{fencingId}") public Result findFencingById(@PathVariable Integer fencingId){ - log.info("功能名称:精确查询电子围栏信息,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),fencingId); ResponseFencing responseFencing = fencingService.findFencingById(fencingId); Result result = Result.success(responseFencing); - log.info("功能名称:精确查询电子围栏信息,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -131,11 +111,7 @@ public class FencingController extends BaseController { */ @PostMapping("/deleteFencingAllIds/{ids}") public Result deleteFencingAllIds(@PathVariable Integer[] ids){ - log.info("功能名称:批量删除围栏,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),ids); Result result = fencingService.deleteFencingAllIds(ids); - log.info("功能名称:批量删除围栏,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } diff --git a/fance-menghang-service/src/main/java/com/shiyi/internet/controller/VehicleController.java b/fance-menghang-service/src/main/java/com/shiyi/internet/controller/VehicleController.java index 4c3d5ec..191c586 100644 --- a/fance-menghang-service/src/main/java/com/shiyi/internet/controller/VehicleController.java +++ b/fance-menghang-service/src/main/java/com/shiyi/internet/controller/VehicleController.java @@ -43,11 +43,7 @@ public class VehicleController extends BaseController { */ @GetMapping("/vehicleList") public Result> vehicleList(){ - log.info("功能名称:车辆管理系统,请求URL:【{}】,请求方法:【{}】",request.getRequestURI(), - request.getMethod()); Result> result = vehicleService.vehicleList(); - log.info("功能名称:车辆管理系统,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -61,11 +57,7 @@ public class VehicleController extends BaseController { */ @PostMapping("/deletVehiclById/{carId}") public Result deletVehiclById(@PathVariable Integer carId){ - log.info("功能名称:获取编号删除车辆,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),carId); Result result = vehicleService.deletVehiclById(carId); - log.info("功能名称:获取编号删除车辆,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -79,11 +71,7 @@ public class VehicleController extends BaseController { */ @PostMapping("/addVehicl") public Result addVehicl(@RequestBody Car car){ - log.info("功能名称:添加车辆信息,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),car); Result result = vehicleService.addVehicl(car); - log.info("功能名称:添加车辆信息,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -97,12 +85,8 @@ public class VehicleController extends BaseController { */ @GetMapping("/findVehiclById/{carId}") public Result findVehiclById(@PathVariable Integer carId){ - log.info("功能名称:精确查询车辆系统信息,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),carId); ResponseCar responseCar = vehicleService.findVehiclById(carId); Result result = Result.success(responseCar); - log.info("功能名称:精确查询车辆系统信息,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -117,11 +101,7 @@ public class VehicleController extends BaseController { */ @PostMapping("/updateVehicl") public Result updateVehicl(@RequestBody Car car){ - log.info("功能名称:修改车辆管理,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),car); Result result = vehicleService.updateVehicl(car); - log.info("功能名称:修改车辆管理,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -142,7 +122,7 @@ public class VehicleController extends BaseController { /** - * @Description:修改车辆状态 + * @Description:修改车辆状态(启动/停止) No such property: code for class: Script1 * @return: com.fate.common.core.domain.Result * @Author: YHY @@ -151,11 +131,7 @@ public class VehicleController extends BaseController { */ @PostMapping("/updateVehicleStatus/{vin}/{status}") public Result updateVehicleStatus(@PathVariable("vin") String vin, @PathVariable("status")Integer status){ - log.info("功能名称:修改车辆状态,请求URL:【{}】,请求方法:【{}】,请求参数:【{}】",request.getRequestURI(), - request.getMethod(),vin,status); Result result = vehicleService.updateVehicleStatus(vin,status); - log.info("功能名称:修改车辆状态,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); return result; } @@ -170,11 +146,7 @@ public class VehicleController extends BaseController { */ @GetMapping("onlineVehicle") public Result> onlineVehicle(){ - log.info("功能名称:查询所有在线车辆,请求URL:【{}】,请求方法:【{}】",request.getRequestURI(), - request.getMethod()); Result> result = vehicleService.onlineVehicle(); - log.info("功能名称:查询所有在线车辆,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(result)); return result; } @@ -189,13 +161,18 @@ public class VehicleController extends BaseController { */ @GetMapping("/countData") public Result countData(){ - log.info("功能名称:统计数据,请求URL:【{}】,请求方法:【{}】",request.getRequestURI(), - request.getMethod()); Result result = vehicleService.countData(); - log.info("功能名称:统计数据,请求URL:【{}】,请求方法:【{}】,响应结果:【{}】",request.getRequestURI(), - request.getMethod(),JSONObject.toJSONString(result)); return result; } + /** + * 车辆列表 + */ + @GetMapping("/vehicleList") + public Result vehicleLists(){ + Result result = Result.success(vehicleService.vehicleList()); + return result; + } + } diff --git a/fance-menghang-service/src/main/resources/mapper/VehicleMapper.xml b/fance-menghang-service/src/main/resources/mapper/VehicleMapper.xml index 380d986..bb6f7cf 100644 --- a/fance-menghang-service/src/main/resources/mapper/VehicleMapper.xml +++ b/fance-menghang-service/src/main/resources/mapper/VehicleMapper.xml @@ -34,7 +34,7 @@ car_address=#{carAddress} where car_id=#{carId} - update t_car set car_vin=#{},car_status=#{status} + update t_car set car_vin=#{carVin},car_status=#{status} delete from t_car where car_id=#{carId}