diff --git a/app/Services/ParkingElectronicMapService.php b/app/Services/ParkingElectronicMapService.php index 2537c7f..539c91d 100644 --- a/app/Services/ParkingElectronicMapService.php +++ b/app/Services/ParkingElectronicMapService.php @@ -117,7 +117,9 @@ class ParkingElectronicMapService extends BaseService if ($id) { $model = ParkingElectronicMap::query()->findOrFail($id); $model->delete(); - (new OperationLogService())->logDeleted($model, 'map.sync_delete'); + $OperationLog = new OperationLogService(); + $OperationLog->menuTitle = 'draw_map'; + $OperationLog->logDeleted($model, 'map.sync_delete'); } } diff --git a/app/Services/ParkingPatternSpaceService.php b/app/Services/ParkingPatternSpaceService.php index 4cef9d1..6de4dc8 100644 --- a/app/Services/ParkingPatternSpaceService.php +++ b/app/Services/ParkingPatternSpaceService.php @@ -175,7 +175,9 @@ class ParkingPatternSpaceService extends BaseService $model = ParkingPatternSpace::query()->whereIn('id', $ids); $oldValue = $model->select()->get()->toArray(); $model->delete(); - (new OperationLogService())->logDeletedData( + $OperationLogService = new OperationLogService(); + $OperationLogService->menuTitle = 'model_manage'; + $OperationLogService->logDeletedData( new ParkingPatternSpace(), 'parking_pattern_space.delete', $oldValue diff --git a/app/Services/ParkingSpaceRepairService.php b/app/Services/ParkingSpaceRepairService.php index 2953d53..5f33dea 100644 --- a/app/Services/ParkingSpaceRepairService.php +++ b/app/Services/ParkingSpaceRepairService.php @@ -284,4 +284,24 @@ class ParkingSpaceRepairService extends BaseService throw $e; } } + + // 车位删除同步删除已添加模式车位 + public static function syncDelRepair($space_id) + { + $ids = ParkingSpaceRepair::query()->where([ + 'space_id' => $space_id + ])->pluck('id'); + if ($ids) { + $model = ParkingSpaceRepair::query()->whereIn('id', $ids); + $oldValue = $model->select()->get()->toArray(); + $model->delete(); + $OperationLogService = new OperationLogService(); + $OperationLogService->menuTitle = 'parking_repair_list'; + $OperationLogService->logDeletedData( + new ParkingSpaceRepair(), + 'parking_repair_list.delete', + $oldValue + ); + } + } } diff --git a/app/Services/ParkingSpaceService.php b/app/Services/ParkingSpaceService.php index 03ab208..8203ce8 100644 --- a/app/Services/ParkingSpaceService.php +++ b/app/Services/ParkingSpaceService.php @@ -552,14 +552,7 @@ class ParkingSpaceService extends BaseService $model->delete(); - // 同步删除已添加的绘制地图 - ParkingElectronicMapService::syncDeleteMapSpace( - $id, - $oldValue['floor_id'] - ); - - // 同步删除模式关联车位 - ParkingPatternSpaceService::syncDelPatternSpace($id); + $this->syncDelete($id, $oldValue['floor_id']); DB::commit(); return true; @@ -569,6 +562,22 @@ class ParkingSpaceService extends BaseService } } + // 同步删除车位其他信息 + protected function syncDelete($id, $floor_id) + { + // 同步删除已添加的绘制地图 + ParkingElectronicMapService::syncDeleteMapSpace( + $id, + $floor_id + ); + + // 同步删除模式关联车位 + ParkingPatternSpaceService::syncDelPatternSpace($id); + + // 同步删除维修记录 + ParkingSpaceRepairService::syncDelRepair($id); + } + /** * @param $ids * @return bool @@ -587,13 +596,8 @@ class ParkingSpaceService extends BaseService 'parking_space.delete' ); $model->delete(); - // 同步删除已添加的绘制地图 - ParkingElectronicMapService::syncDeleteMapSpace( - $id, - $oldValue['floor_id'] - ); - // 同步删除模式关联车位 - ParkingPatternSpaceService::syncDelPatternSpace($id); + + $this->syncDelete($id, $oldValue['floor_id']); } DB::commit();