添加车辆操作日志

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/aop/LogAspect.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.util.IPUtils;
 import com.xxfc.platform.vehicle.biz.SysLogBiz;
 import com.xxfc.platform.vehicle.entity.SysLog;
 import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleApply;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -77,6 +78,11 @@ public class LogAspect {
                     Vehicle vehicle = (Vehicle)args[i];
                     vehicleId = vehicle.getId();
                     state = vehicle.getState();
+                }else if (paramNames[i].contains("vehicleApply")){
+                    VehicleApply vehicleApply = (VehicleApply)args[i];
+                    vehicleId = vehicleApply.getVehicleId();
+                    state = 1;
+
                 }
             }
             sysLog.setParams(params);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleApplyBiz.java

@@ -14,6 +14,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.aop.GlobalLog;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleApply;
@@ -150,22 +151,28 @@ public class VehicleApplyBiz extends BaseBiz<VehicleApplyMapper, VehicleApply>{
             if (vehicleApply == null ){
                 throw  new BaseException("申请记录不存在",ResultCode.FAILED_CODE);
             }
-           String vehicleId =vehicleBiz.addOrUpd(vehicleApply);
+           String vehicleId = vehicleBiz.addOrUpd(vehicleApply);
             if (StringUtils.isNotBlank(vehicleId)){
+                vehicleApply.setVehicleId(vehicleId);
+                updVehicleApply(vehicleApply);
+            }
+        }
+        sendSms(vehicleApply);
+    }
+
+
+    @GlobalLog(type = 2,value = "运营平台审核自动上架")
+    public void   updVehicleApply(VehicleApply vehicleApply){
         VehicleApply vehicleApply1=new VehicleApply();
         vehicleApply1.setId(vehicleApply.getId());
-                vehicleApply1.setVehicleId(vehicleId);
+        vehicleApply1.setVehicleId(vehicleApply.getVehicleId());
         updateSelectiveById(vehicleApply1);
         String extensionList=vehicleApply.getExtensionList();
         if (StringUtils.isNotBlank(extensionList)){
-                    extensionBiz.saveOrUpd(vehicleId,extensionList);
+            extensionBiz.saveOrUpd(vehicleApply.getVehicleId(),extensionList);
         }
-
     }
 
-        }
-        sendSms(vehicleApply);
-    }
 
     public void  sendSms(VehicleApply vehicleApply){
         try {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/AdminVehicleController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.aop.GlobalLog;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleExtensionBiz;
 import com.xxfc.platform.vehicle.entity.Vehicle;
@@ -73,6 +74,7 @@ public class AdminVehicleController extends BaseController<VehicleBiz>{
     @PostMapping("/unauth/app/updVehicleFeign")
     @IgnoreUserToken
     @ApiModelProperty("更新商品信息Feign")
+    @GlobalLog(type = 3,value = "特惠租车上下架商品")
     public ObjectRestResponse updVehicleFeign(@RequestBody Vehicle vehicle) {
         baseBiz.updateSelectiveById(vehicle);
         return ObjectRestResponse.succ();