From 42ea13df4b802d9be3dcedd5b1f440bb13c783c0 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sat, 9 Dec 2023 16:53:18 +0800 Subject: [PATCH] fix --- .../equip/controller/DevInfoController.java | 9 +++++ .../zlpt/equip/mapper/DevInfoMapper.java | 5 +++ .../zlpt/equip/service/IDevInfoService.java | 2 + .../service/impl/DevInfoServiceImpl.java | 40 +++++++++++++++++++ .../main/resources/mapper/DevInfoMapper.xml | 11 +++++ 5 files changed, 67 insertions(+) diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java index 90cde97..58ae5bd 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java @@ -47,6 +47,15 @@ public class DevInfoController extends BaseController return getDataTable(list); } + @ApiOperation(value = "收藏装备列表") + @PostMapping("/userCollectList") + public TableDataInfo userCollectList(@RequestBody DevInfoVo devInfo) + { + startPage(devInfo.getPageNum(), devInfo.getPageSize()); + List list = devInfoService.selectUserCollectList(devInfo); + return getDataTable(list); + } + // @RequiresPermissions("equip:info:list") @ApiOperation(value = "装备推荐列表") @GetMapping("/hotList") diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java index b071596..f189ab4 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java @@ -3,6 +3,7 @@ package com.bonus.zlpt.equip.mapper; import java.util.List; import com.bonus.zlpt.common.core.domain.system.SysFile; import com.bonus.zlpt.equip.api.domain.DevInfo; +import com.bonus.zlpt.equip.api.domain.UserCollect; import com.bonus.zlpt.equip.api.domain.dto.InforMationDto; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.system.api.domain.BaseAddress; @@ -24,6 +25,8 @@ public interface DevInfoMapper */ public DevInfoVo selectDevInfoByMaId(Long maId); + public int updateHotSearchByMaId(Long maId); + /** * 查询设备图片集 * @@ -42,6 +45,8 @@ public interface DevInfoMapper */ public List selectDevInfoList(DevInfo devInfo); + public List selectUserCollectByUserId(Long userId); + public List selectDevInfoHotList(DevInfo devInfo); /** diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java index f014050..eabf03f 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java @@ -31,6 +31,8 @@ public interface IDevInfoService */ public List selectDevInfoList(DevInfoVo devInfo); + List selectUserCollectList(DevInfoVo devInfo); + public List selectDevInfoHotList(DevInfoVo devInfo); /** diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index d6b79c5..ce21ebd 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -2,8 +2,11 @@ package com.bonus.zlpt.equip.service.impl; import java.util.*; import java.util.stream.Collectors; + +import com.bonus.zlpt.common.security.utils.SecurityUtils; import com.bonus.zlpt.equip.api.domain.DevInfo; import com.bonus.zlpt.equip.api.domain.SysFileInfo; +import com.bonus.zlpt.equip.api.domain.UserCollect; import com.bonus.zlpt.equip.api.domain.dto.InforMationDto; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.system.SysFile; @@ -11,6 +14,7 @@ import com.bonus.zlpt.common.core.utils.DateUtils; import com.bonus.zlpt.equip.api.enums.MaStatusEnum; import com.bonus.zlpt.system.api.domain.BaseAddress; import com.bonus.zlpt.system.api.domain.SysDic; +import com.bonus.zlpt.system.api.model.LoginUser; import org.springframework.beans.BeanUtils; import com.bonus.zlpt.equip.mapper.SysFileInfoMapper; import org.springframework.stereotype.Service; @@ -51,6 +55,8 @@ public class DevInfoServiceImpl implements IDevInfoService public DevInfoVo selectDevInfoByMaId(Long maId) { DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId); + //更新搜索量 + devInfoMapper.updateHotSearchByMaId(maId); try { List files = devInfoMapper.getFilesByMaId(maId); if (!CollectionUtils.isEmpty(files) && files.get(0) != null) { @@ -112,6 +118,40 @@ public class DevInfoServiceImpl implements IDevInfoService return list; } + /** + * 查询设备收藏列表 + * + * @param devInfo 设备信息 + * @return 设备信息 + */ + @Override + public List selectUserCollectList(DevInfoVo devInfo) + { + List result = new ArrayList<>(); + result = devInfoMapper.selectDevInfoList(devInfo); + LoginUser user = SecurityUtils.getLoginUser(); + if (Objects.nonNull(user)) { + List userCollectList = devInfoMapper.selectUserCollectByUserId(user.getUserid()); + result = filterUserCollect(result, userCollectList); + } + fillInMaStatusStr(result); + fillInCityStr(result); + return result; + } + + private List filterUserCollect(List list, List userCollectList) { + List result = new ArrayList<>(); + for (DevInfoVo devInfoVo : list) { + for (UserCollect userCollect : userCollectList) { + if (devInfoVo.getMaId() == userCollect.getMaId()) { + result.add(devInfoVo); + } + } + } + return result; + } + + @Override public List selectDevInfoHotList(DevInfoVo devInfo) { diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml index a47baf2..a31a7dd 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml @@ -346,6 +346,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + update ma_hot_search + set search_num = search_num + 1 + where ma_id = #{maId} + +