From 2738a8912d347f4a901e3ace00cfe9a61c3369c4 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 28 Nov 2024 18:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/DevInfoController.java | 5 +++-- .../material/device/domain/vo/DevNameVo.java | 21 +++++++++++++++++++ .../device/service/DevInfoService.java | 3 ++- .../service/impl/DevInfoServiceImpl.java | 21 +++++++++++++++---- .../controller/MaLeaseInfoController.java | 5 +++-- .../bonus/material/lease/domain/MaLease.java | 6 ++++++ .../material/lease/domain/MaLeaseDto.java | 3 +++ .../material/lease/MaLeaseInfoMapper.xml | 9 ++++---- 8 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevNameVo.java 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 8e95df7..a585f0f 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 @@ -98,8 +98,9 @@ public class DevInfoController extends BaseController { //@RequiresPermissions("equip:info:query") @ApiOperation(value = "装备详情") @GetMapping(value = "/getInfo/{maId}") - public AjaxResult getInfo(@PathVariable("maId") Long maId) { - return success(devInfoService.selectDevInfoByMaId(maId)); + public AjaxResult getInfo(@PathVariable("maId") Long maId, + @RequestParam(value = "isHome", required = false) Boolean isHome) { + return success(devInfoService.selectDevInfoByMaId(maId, isHome)); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevNameVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevNameVo.java new file mode 100644 index 0000000..61e9c01 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevNameVo.java @@ -0,0 +1,21 @@ +package com.bonus.material.device.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** 最新装备返回分类设备vo + * @Author ma_sh + * @create 2024/11/28 16:00 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DevNameVo { + + private String typeName; + + private List devInfoList; +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java index e5c71c3..e18dc79 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java @@ -20,9 +20,10 @@ public interface DevInfoService { * 查询设备信息 * * @param maId 设备信息主键 + * @param isHome 是否是首页进入 * @return 设备信息 */ - DevInfoVo selectDevInfoByMaId(Long maId); + DevInfoVo selectDevInfoByMaId(Long maId, Boolean isHome); /** * 查询装备共享大厅列表 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 28843b5..3d62b89 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 @@ -13,6 +13,7 @@ import com.bonus.material.book.domain.BookCarInfoDto; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.vo.DevInfoVo; +import com.bonus.material.device.domain.vo.DevNameVo; import com.bonus.material.device.domain.vo.LeaseVo; import com.bonus.material.device.mapper.BmFileInfoMapper; import com.bonus.material.device.mapper.DevInfoMapper; @@ -64,15 +65,15 @@ public class DevInfoServiceImpl implements DevInfoService { * @return 设备信息 */ @Override - public DevInfoVo selectDevInfoByMaId(Long maId) { + public DevInfoVo selectDevInfoByMaId(Long maId, Boolean isHome) { DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId); //判断该装备是否已经被该企业或个人加入预约车，不能重复加入 Long userId = SecurityUtils.getLoginUser().getUserid(); if (devInfoVo != null) { //更新搜索量 try { - //只针对于上架状态装备更新浏览量 - if (devInfoVo.getMaStatus().equals(MaStatusEnum.LISTING.getCode())) { + //只针对于首页上架状态装备更新浏览量（去除后台查看浏览量更新） + if (isHome != null && isHome && devInfoVo.getMaStatus().equals(MaStatusEnum.LISTING.getCode())) { updateHotSearch(maId); } } catch (Exception e) { @@ -178,6 +179,7 @@ public class DevInfoServiceImpl implements DevInfoService { @Override public AjaxResult selectDevInfoHotList(DevInfoVo devInfo) { + List voList = new ArrayList<>(); List hotList = devInfoMapper.selectDevInfoHotList(devInfo); if (CollectionUtil.isEmpty(hotList)) { return AjaxResult.success(Collections.emptyMap()); @@ -187,7 +189,18 @@ public class DevInfoServiceImpl implements DevInfoService { Map> groupedByFirstName = hotList.stream() .filter(info -> info.getFirstName() != null) .collect(Collectors.groupingBy(DevInfoVo::getFirstName)); - return AjaxResult.success(groupedByFirstName); + // 遍历 Map 中的每个条目，将数据转化成 DevNameVo 对象 + for (Map.Entry> entry : groupedByFirstName.entrySet()) { + String typeName = entry.getKey(); + List devInfoList = entry.getValue(); + // 创建一个 DevNameVo 对象并设置相应的字段 + DevNameVo devNameVo = new DevNameVo(); + devNameVo.setTypeName(typeName); + devNameVo.setDevInfoList(devInfoList); + // 将 DevNameVo 对象添加到 voList 中 + voList.add(devNameVo); + } + return AjaxResult.success(voList); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java index 43810ce..81e516b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java @@ -63,9 +63,10 @@ public class MaLeaseInfoController extends BaseController { @ApiOperation(value = "查询出租方需求列表") @GetMapping("/rentList") public AjaxResult rentList(MaLeaseDto dto) { - startPage(); List list = leaseInfoService.rentList(dto); - return AjaxResult.success(getDataTable(list)); + Integer pageIndex = Convert.toInt(dto.getPageNum(), 1); + Integer pageSize = Convert.toInt(dto.getPageSize(), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java index 99a59dd..9756858 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java @@ -45,6 +45,12 @@ public class MaLease { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String startTime; + @ApiModelProperty("预估天数（字符串转换）") + private String rentDay; + + @ApiModelProperty("预估数量（字符串转换）") + private String rentNum; + /** * 需求截止日期(年月日) */ diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java index e87b820..fb40e2c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java @@ -15,6 +15,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class MaLeaseDto extends BaseEntity { + private Integer pageNum; + private Integer pageSize; + /** * 需求名称 */ diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index 510e9c5..94b4554 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -174,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(m.end_time,'%Y-%m-%d') between #{finishStartTime} and #{finishEndTime} GROUP BY m.lease_code + ORDER BY m.start_time DESC