From b2151b00d6f90a1306ae5416f8988f47be9fc5cd Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Mon, 14 Jul 2025 23:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=BC=E5=85=A5=E5=BC=80?= =?UTF-8?q?=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/controller/ZcCarController.java | 43 +++++++++++++----- .../controller/ZcRentCarRuleController.java | 2 +- .../operation/service/IZcCarService.java | 2 + .../service/impl/ZcCarServiceImpl.java | 8 ++++ .../templates/operation/car/car.html | 45 +++++++++++++++++-- 5 files changed, 84 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarController.java index a811360..3fab1a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarController.java @@ -26,7 +26,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 车型管理Controller + * 车辆管理Controller * * @author ruoyi * @date 2025-07-13 @@ -50,7 +50,7 @@ public class ZcCarController extends BaseController } /** - * 查询车型管理列表 + * 查询车辆管理列表 */ @RequiresPermissions("operation:car:list") @PostMapping("/list") @@ -63,21 +63,21 @@ public class ZcCarController extends BaseController } /** - * 导出车型管理列表 + * 导出车辆管理列表 */ @RequiresPermissions("operation:car:export") - @Log(title = "车型管理", businessType = BusinessType.EXPORT) + @Log(title = "车辆管理", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody public AjaxResult export(ZcCar zcCar) { List list = zcCarService.selectZcCarList(zcCar); ExcelUtil util = new ExcelUtil(ZcCar.class); - return util.exportExcel(list, "车型管理数据"); + return util.exportExcel(list, "车辆管理数据"); } /** - * 新增车型管理 + * 新增车辆管理 */ @GetMapping("/add") public String add(ModelMap mmap) @@ -89,10 +89,10 @@ public class ZcCarController extends BaseController } /** - * 新增保存车型管理 + * 新增保存车辆管理 */ @RequiresPermissions("operation:car:add") - @Log(title = "车型管理", businessType = BusinessType.INSERT) + @Log(title = "车辆管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody public AjaxResult addSave(ZcCar zcCar) @@ -106,7 +106,7 @@ public class ZcCarController extends BaseController } /** - * 修改车型管理 + * 修改车辆管理 */ @RequiresPermissions("operation:car:edit") @GetMapping("/edit/{id}") @@ -121,7 +121,7 @@ public class ZcCarController extends BaseController } /** - * 修改保存车型管理 + * 修改保存车辆管理 */ @RequiresPermissions("operation:car:edit") @Log(title = "车型管理", businessType = BusinessType.UPDATE) @@ -138,14 +138,33 @@ public class ZcCarController extends BaseController } /** - * 删除车型管理 + * 删除车辆管理 */ @RequiresPermissions("operation:car:remove") - @Log(title = "车型管理", businessType = BusinessType.DELETE) + @Log(title = "车辆管理", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) { return toAjax(zcCarService.deleteZcCarByIds(ids)); } + + @Log(title = "车辆管理", businessType = BusinessType.UPDATE) + @RequiresPermissions("operation:car:edit") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(ZcCar zcCar) + { + return toAjax(zcCarService.changeStatus(zcCar)); + } + + @RequiresPermissions("operation:car:view") + @GetMapping("/importTemplate") + @ResponseBody + public AjaxResult importTemplate() + { + ExcelUtil util = new ExcelUtil(ZcCar.class); + return util.importTemplateExcel("车辆数据"); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java index 5e6e016..f4081ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java @@ -180,7 +180,7 @@ public class ZcRentCarRuleController extends BaseController - @Log(title = "运营商管理", businessType = BusinessType.UPDATE) + @Log(title = "租车计费", businessType = BusinessType.UPDATE) @RequiresPermissions("operation:company:edit") @PostMapping("/changeStatus") @ResponseBody diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/IZcCarService.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/IZcCarService.java index 956064d..98b1067 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/IZcCarService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/IZcCarService.java @@ -66,4 +66,6 @@ public interface IZcCarService * @return 是否唯一 (0:唯一, 1:不唯一) */ String checkVinUnique(ZcCar zcCar); + + public int changeStatus(ZcCar zcCar); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java index faf3e0c..1c365e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java @@ -106,4 +106,12 @@ public class ZcCarServiceImpl implements IZcCarService } return OperationConstants.USER_VIN_UNIQUE; } + + @Override + public int changeStatus(ZcCar zcCar) { + zcCar.setUpdateTime(DateUtils.getNowDate()); + return zcCarMapper.updateZcCar(zcCar); + } + + } diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/car.html b/ruoyi-admin/src/main/resources/templates/operation/car/car.html index a8e9231..e396ba5 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/car.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/car.html @@ -53,9 +53,12 @@ 删除 - - - + + 导入 + + + 导出 +
@@ -78,6 +81,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + importUrl: prefix + "/importData", + importTemplateUrl: prefix + "/importTemplate", modalName: "车型管理", columns: [{ checkbox: true @@ -155,13 +160,47 @@ formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); + actions.push('分配 '); actions.push('删除'); + if (row.status == 1) { + actions.push('上架 '); + } else { + actions.push('下架 '); + } return actions.join(''); } }] }; $.table.init(options); }); + + /* 下架 */ + function disable(id) { + $.modal.confirm("确认是否下架此车辆？下架后此车辆将在不会显示在用户小程序中", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "status": 1 }); + }) + } + + /* 上架 */ + function enable(id) { + $.modal.confirm("请确认是否需要上架此车辆 ？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "status": 0 }); + }) + } + + \ No newline at end of file