123

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

@@ -74,17 +74,19 @@ public class LogAspect {
             Integer state = 0;
             for (int i = 0; i < args.length; i++) {
                 params += "  " + paramNames[i] + ": " + args[i];
-                if (paramNames[i].contains("vehicle")){
+                if (paramNames[i].equals("vehicle")){
                     Vehicle vehicle = (Vehicle)args[i];
                     vehicleId = vehicle.getId();
                     state = vehicle.getState();
-                }else if (paramNames[i].contains("vehicleApply")){
+                }else if (paramNames[i].equals("vehicleApply")){
                     VehicleApply vehicleApply = (VehicleApply)args[i];
                     vehicleId = vehicleApply.getVehicleId();
-                    state = 1;
-
+                    state = vehicleApply.getApplyStatus() == 1 ? 1 : 0;
                 }
             }
+            if (state > 0){
+                return;
+            }
             sysLog.setParams(params);
             sysLog.setVehicleId(vehicleId);
             sysLog.setOperateType(state);

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

@@ -44,6 +44,20 @@ public class SysLogBiz extends BaseBiz<SysLogMapper, SysLog> {
      }
 
 
+     public  void  vehicleLog(Vehicle vehicle){
+         try {
+             SysLog sysLog = new SysLog();
+             sysLog.setOperateType(vehicle.getState());
+             sysLog.setVehicleId(vehicle.getId());
+             sysLog.setType(3);
+             sysLog.setOperation("特惠租车上下架商品");
+             addLog(sysLog);
+         }catch (Exception e){
+             e.printStackTrace();
+         }
+     }
+
+
 
 
 

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

@@ -160,8 +160,6 @@ public class VehicleApplyBiz extends BaseBiz<VehicleApplyMapper, VehicleApply>{
         sendSms(vehicleApply);
     }
 
-
-    @GlobalLog(type = 2,value = "运营平台审核自动上架")
     public void   updVehicleApply(VehicleApply vehicleApply){
         VehicleApply vehicleApply1=new VehicleApply();
         vehicleApply1.setId(vehicleApply.getId());

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/AdminVehicleApplyController.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.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.vehicle.aop.GlobalLog;
 import com.xxfc.platform.vehicle.biz.VehicleApplyBiz;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleApply;
@@ -72,6 +73,7 @@ public class AdminVehicleApplyController extends BaseController<VehicleApplyBiz,
 
     @PostMapping("audit")
     @ApiModelProperty("商家入驻审核")
+    @GlobalLog(type = 2,value = "运营平台审核自动上架")
     public  ObjectRestResponse audit(@RequestBody VehicleApply vehicleApply) {
         baseBiz.audit(vehicleApply);
         return ObjectRestResponse.succ();

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

@@ -6,6 +6,7 @@ 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.SysLogBiz;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleExtensionBiz;
 import com.xxfc.platform.vehicle.entity.Vehicle;
@@ -40,6 +41,9 @@ public class AdminVehicleController extends BaseController<VehicleBiz>{
     @Autowired
     VehicleExtensionBiz extensionBiz;
 
+    @Autowired
+    SysLogBiz sysLogBiz;
+
 
     @Override
     public UserFeign getUserFeign() {
@@ -74,9 +78,9 @@ 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);
+        sysLogBiz.vehicleLog(vehicle);
         return ObjectRestResponse.succ();
     }