From 7484683d3ae8c6b8647be1990d355b1228041c54 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 26 Nov 2024 10:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=85=B1=E4=BA=AB=E5=A4=A7?= =?UTF-8?q?=E5=8E=85=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BookCarController.java | 7 +------ .../material/book/mapper/BookCarMapper.java | 13 +++++++++++- .../material/book/service/BookCarService.java | 2 +- .../book/service/impl/BookCarServiceImpl.java | 19 +++++++++++++----- .../device/controller/DevInfoController.java | 4 ++-- .../service/impl/DevInfoServiceImpl.java | 4 ++++ .../mapper/material/bookcar/BookCarMapper.xml | 8 ++++++++ .../mapper/material/device/DevInfoMapper.xml | 20 ++++++++----------- .../mapper/material/home/MaTypeInfoMapper.xml | 2 +- 9 files changed, 51 insertions(+), 28 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java index bf05a72..eef187a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java @@ -32,12 +32,7 @@ public class BookCarController extends BaseController { @ApiOperation(value = "添加预约车") @PostMapping("/addBookCar") public AjaxResult addBookCar(@RequestBody BookCarInfoDto bookCarInfoDto) { - Integer i = bookCarService.addBookCar(bookCarInfoDto); - if (i > 0) { - return AjaxResult.success("添加成功"); - } else { - return AjaxResult.error("添加失败"); - } + return bookCarService.addBookCar(bookCarInfoDto); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java index c9d38f0..91008fc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java @@ -6,7 +6,6 @@ import com.bonus.material.device.domain.vo.DevInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** @@ -23,6 +22,18 @@ public interface BookCarMapper { */ Integer addBookCarDetail(BookCarInfoDto bookCarInfoDto); + /** + * 查询预约车详情 + * @param devInfo + * @return + */ List getBookCarDetails(BookCarInfoDto devInfo); + /** + * 查询设备详情 + * @param maId + * @param userId + * @return + */ + DevInfoVo selectDevInfoByMaId(@Param("maId") String maId, @Param("userId") Long userId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java index 9bf75de..42ae881 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java @@ -17,7 +17,7 @@ public interface BookCarService { * @param bookCarInfoDto * @return */ - Integer addBookCar(BookCarInfoDto bookCarInfoDto); + AjaxResult addBookCar(BookCarInfoDto bookCarInfoDto); /** * 获取预约车详情 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java index 41117d9..ed5d5a1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java @@ -39,11 +39,20 @@ public class BookCarServiceImpl implements BookCarService { @Override @Transactional(rollbackFor = Exception.class) - public Integer addBookCar(BookCarInfoDto bookCarInfoDto) { - Long userid = SecurityUtils.getLoginUser().getUserid(); - bookCarInfoDto.setCreater(userid.toString()); - bookCarInfoDto.setOrderUser(userid); - return bookCarMapper.addBookCarDetail(bookCarInfoDto); + public AjaxResult addBookCar(BookCarInfoDto bookCarInfoDto) { + Long userId = SecurityUtils.getLoginUser().getUserid(); + bookCarInfoDto.setCreater(userId.toString()); + bookCarInfoDto.setOrderUser(userId); + //先根据设备id查询设备信息 + DevInfoVo devInfoVo = bookCarMapper.selectDevInfoByMaId(bookCarInfoDto.getMaId(), userId); + if (devInfoVo != null) { + return AjaxResult.error("该设备已添加到预约车，请勿重复添加"); + } + Integer result = bookCarMapper.addBookCarDetail(bookCarInfoDto); + if (result > 0) { + return AjaxResult.success("添加成功"); + } + return AjaxResult.error("添加失败"); } @Override diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index 99f4576..46bfe64 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -48,8 +48,8 @@ public class DevInfoController extends BaseController { @PostMapping("/list") public AjaxResult list(@RequestBody DevInfoVo devInfo) { List list = devInfoService.selectDevInfoList(devInfo); - Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); - Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + Integer pageIndex = Convert.toInt(devInfo.getPageNum(), 1); + Integer pageSize = Convert.toInt(devInfo.getPageSize(), 10); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index e96c791..472821a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -100,6 +100,10 @@ public class DevInfoServiceImpl implements DevInfoService { return devInfoVo; } + /** + * 更新设备搜索量 + * @param maId + */ private void updateHotSearch(Long maId) { int count = devInfoMapper.getHotSearchCountByMaId(maId); if (count == 0) { diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml index 9177ff4..df9a300 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml @@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.code as code, d.device_name as deviceName, d.device_weight as deviceWeight, + d.device_count as deviceCount, d.type_id as typeId, d.ma_status as maStatus, d.brand as brand, @@ -38,4 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where d.is_active = '1' and bcd.order_status = '0' + + \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index f6e3799..fbf3d5c 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -117,12 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.area_id = #{areaId} and d.brand = #{brand} and d.model_name like concat('%', #{modelName}, '%') - - and DATEDIFF(DATE_FORMAT(now(), '%Y-%m-%d'), d.production_date) >= #{ageMin} * 365 - and DATEDIFF(DATE_FORMAT(now(), '%Y-%m-%d'), d.production_date) <= #{ageMax} * 365 + + and TIMESTAMPDIFF(YEAR, d.production_date, NOW()) >= #{ageMin} + and TIMESTAMPDIFF(YEAR, d.production_date, NOW()) <= #{ageMax} - - and DATEDIFF(DATE_FORMAT(now(), '%Y-%m-%d'), d.production_date) > #{ageMax} * 365 + + and TIMESTAMPDIFF(YEAR, d.production_date, NOW()) >= #{ageMax} and d.working_hours >= #{workingHoursMin} and d.working_hours <= #{workingHoursMax} @@ -145,11 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or locate(#{keyWord},mt2.type_name) > 0 or locate(#{keyWord},mt3.type_name) > 0 or locate(#{keyWord},c.company_name) > 0 - or locate(#{keyWord},d.ma_id) > 0 - or locate(#{keyWord},d.model_name) > 0 - or locate(#{keyWord},d.specification) > 0 - or locate(#{keyWord},d.serial_number) > 0 - or locate(#{keyWord},d.description) > 0 + or locate(#{keyWord},d.device_name) > 0 ) and d.is_active='1' @@ -163,10 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,d.day_lease_price DESC - ,d.update_time + ,d.create_time - ,d.update_time DESC + ,d.create_time DESC diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml index fe14b4d..3a6bf0d 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"