From 945ef99da877e9f57ec4e74008e61de416fa04cd Mon Sep 17 00:00:00 2001 From: zc Date: Mon, 5 Jan 2026 15:17:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=A0=E9=99=A4=E8=BF=98?= =?UTF-8?q?=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/controller/CarInfoController.java | 23 +++++++++++++++---- .../vehicle/controller/CarParkController.java | 2 +- .../system/vehicle/mapper/CarInfoMapper.java | 8 +++++++ .../vehicle/mapper/CarParkRecordMapper.java | 3 ++- .../vehicle/service/ICarInfoService.java | 7 ++++++ .../service/ICarParkRecordService.java | 2 +- .../service/impl/CarInfoServiceImpl.java | 6 +++++ .../impl/CarParkRecordServiceImpl.java | 2 +- .../service/impl/CarParkServiceImpl.java | 1 - .../mapper/vehicle/CarInfoMapper.xml | 9 +++++++- .../mapper/vehicle/CarParkRecordMapper.xml | 6 ++--- 11 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarInfoController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarInfoController.java index f2a2d6a..bf1a467 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarInfoController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarInfoController.java @@ -56,9 +56,11 @@ public class CarInfoController extends BaseController */ @RequiresPermissions("system:carInfo:list") @GetMapping("/list") - public TableDataInfo list(CarInfo carInfo) - { + public TableDataInfo list(CarInfo carInfo) { startPage(); + if (StrUtil.isBlank(carInfo.getDelFlag())) { + carInfo.setDelFlag("0"); + } List list = carInfoService.selectCarInfoList(carInfo); return getDataTable(list); } @@ -69,8 +71,10 @@ public class CarInfoController extends BaseController @RequiresPermissions("system:carInfo:export") @Log(title = "车辆信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, CarInfo carInfo) - { + public void export(HttpServletResponse response, CarInfo carInfo) { + if (StrUtil.isBlank(carInfo.getDelFlag())) { + carInfo.setDelFlag("0"); + } List list = carInfoService.selectCarInfoList(carInfo); ExcelUtil util = new ExcelUtil(CarInfo.class); util.exportExcel(response, list, "车辆信息数据"); @@ -190,10 +194,19 @@ public class CarInfoController extends BaseController @DeleteMapping("/{customerIds}") public AjaxResult remove(@PathVariable Long[] customerIds) { - //carParkRecordService.deleteCarParkRecordByCustomerIds(customerIds); return toAjax(carInfoService.deleteCarInfoByCustomerIds(customerIds)); } + /** + * 还原删除车辆信息 + */ + @RequiresPermissions("system:delCarInfo:restore") + @Log(title = "车辆还原", businessType = BusinessType.UPDATE) + @PostMapping("/restore") + public AjaxResult restore(@RequestBody List customerIds) { + return toAjax(carInfoService.restore(customerIds)); + } + /** * 获取企业模块|菜单权限树 */ diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarParkController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarParkController.java index b7267d5..3a20a34 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarParkController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/controller/CarParkController.java @@ -46,7 +46,7 @@ public class CarParkController extends BaseController } /** - * 查询车场信息下拉数据 + * 查询车场信息详情 */ @RequiresPermissions("system:carPark:list") @GetMapping("/getCarParkSelect/{id}") diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarInfoMapper.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarInfoMapper.java index f6987f3..6bbe5f1 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarInfoMapper.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarInfoMapper.java @@ -1,6 +1,7 @@ package com.dcsoft.system.vehicle.mapper; import com.dcsoft.system.vehicle.domain.CarInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -63,4 +64,11 @@ public interface CarInfoMapper public CarInfo selectCarInfoByCarNo(String plate); CarInfo selectCarInfoByPlate(String plate); + /** + * 还原删除车辆信息 + * + * @param customerIds 需要还原的车辆信息主键集合 + * @return 结果 + */ + int restore(@Param("list") List customerIds); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarParkRecordMapper.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarParkRecordMapper.java index 9e555ae..c92b271 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarParkRecordMapper.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/mapper/CarParkRecordMapper.java @@ -1,6 +1,7 @@ package com.dcsoft.system.vehicle.mapper; import com.dcsoft.system.vehicle.domain.CarParkRecord; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -62,7 +63,7 @@ public interface CarParkRecordMapper public int deleteCarParkRecordByParkId(Long parkId); - public int deleteCarParkRecordByCustomerIds(Long[] ids); + public int deleteCarParkRecordByCustomerIds(@Param("list") List ids); public int deleteCarParkRecordByCustomerId(Long[] ids); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarInfoService.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarInfoService.java index 4761c12..e6fd5f9 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarInfoService.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarInfoService.java @@ -76,4 +76,11 @@ public interface ICarInfoService String importData(List userList, boolean updateSupport, String operName); CarInfo selectCarInfoByPlate(String plate); + /** + * 还原删除车辆信息 + * + * @param customerIds 需要还原的车辆信息主键集合 + * @return 结果 + */ + int restore(List customerIds); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarParkRecordService.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarParkRecordService.java index f371d36..34da3d5 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarParkRecordService.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/ICarParkRecordService.java @@ -62,7 +62,7 @@ public interface ICarParkRecordService public int deleteCarParkRecordByParkId(Long parkId); - public int deleteCarParkRecordByCustomerIds(Long[] customerIds); + public int deleteCarParkRecordByCustomerIds(List customerIds); public int deleteCarParkRecordByCustomerId(Long customerId); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarInfoServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarInfoServiceImpl.java index 0e9294b..6a720a2 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarInfoServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarInfoServiceImpl.java @@ -330,6 +330,12 @@ public class CarInfoServiceImpl implements ICarInfoService return carInfoMapper.selectCarInfoByPlate(plate); } + @Override + public int restore(List customerIds) { + carParkRecordMapper.deleteCarParkRecordByCustomerIds(customerIds); + return carInfoMapper.restore(customerIds); + } + public static boolean checkPlateNumberFormat(String content) { String pattern = "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}(([A-HJ-Z]{1}[A-HJ-NP-Z0-9]{5})|([A-HJ-Z]{1}(([ADF]{1}[A-HJ-NP-Z0-9]{1}[0-9]{4})|([0-9]{5}[ADF]{1})))|([A-HJ-Z]{1}[A-D0-9]{1}[0-9]{3}警)))|([0-9]{6}使)|((([沪粤川云桂鄂陕蒙藏黑辽渝]{1}A)|鲁B|闽D|蒙E|蒙H)[0-9]{4}领)|(WJ[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼·•]{1}[0-9]{4}[TDSHBXJ0-9]{1})|([VKHBSLJNGCE]{1}[A-DJ-PR-TVY]{1}[0-9]{5})"; return Pattern.matches(pattern, content); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkRecordServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkRecordServiceImpl.java index 69f6d3c..2f83dbd 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkRecordServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkRecordServiceImpl.java @@ -99,7 +99,7 @@ public class CarParkRecordServiceImpl implements ICarParkRecordService } @Override - public int deleteCarParkRecordByCustomerIds(Long[] ids) + public int deleteCarParkRecordByCustomerIds(List ids) { return carParkRecordMapper.deleteCarParkRecordByCustomerIds(ids); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkServiceImpl.java index 5783499..a28ad58 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/vehicle/service/impl/CarParkServiceImpl.java @@ -8,7 +8,6 @@ import com.dcsoft.system.vehicle.service.ICarParkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/vehicle/CarInfoMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/vehicle/CarInfoMapper.xml index 1c840b3..e7d534c 100644 --- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/vehicle/CarInfoMapper.xml +++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/vehicle/CarInfoMapper.xml @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -156,6 +157,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{customerId} + + update car_info set del_flag = '0' where customer_id in + + #{customerId} + +