diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java index 3604c36..6f81c91 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java @@ -172,10 +172,13 @@ public class WebController extends BaseController { * @date 10:04 2025/7/8 **/ @ApiOperation("热门产品-前10") - @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "showPlat", value = "平台标识(网站|App)", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + }) @GetMapping("/hotProduct") - public R> hotProduct(@RequestParam(required = true) String tenantId) { - return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, true)); + public R> hotProduct(@RequestParam(required = true) String tenantId,@RequestParam(required = true) String showPlat) { + return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, true,showPlat)); } /** @@ -186,10 +189,13 @@ public class WebController extends BaseController { * @date 10:04 2025/7/8 **/ @ApiOperation("普通产品-前10") - @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "showPlat", value = "平台标识(网站|App)", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + }) @GetMapping("/product") - public R> product(@RequestParam(required = true) String tenantId) { - return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, false)); + public R> product(@RequestParam(required = true) String tenantId,@RequestParam(required = true) String showPlat) { + return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, false,showPlat)); } /** @@ -200,10 +206,13 @@ public class WebController extends BaseController { * @date 10:04 2025/7/8 **/ @ApiOperation("热门新闻-前10") - @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "showPlat", value = "平台标识(网站|App)", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + }) @GetMapping("/hotNews") - public R> hotNews(@RequestParam(required = true) String tenantId) { - return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_NEWS, true)); + public R> hotNews(@RequestParam(required = true) String tenantId,@RequestParam(required = true) String showPlat) { + return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_NEWS, true,showPlat)); } /** @@ -237,16 +246,18 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页码(1开始)", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "pageSize", value = "每页显示数量", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class), - @ApiImplicitParam(name = "text", value = "搜索内容", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class) + @ApiImplicitParam(name = "text", value = "搜索内容", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "showPlat", value = "平台标识(网站|App)", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/prodPageList") - public R> prodPageList(String tenantId, String catgId, String text, + public R> prodPageList(String tenantId, @RequestParam(required = false) String catgId, @RequestParam(required = false) String text,String showPlat, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(BusiProdNew::getDataType, DATA_TYPE_PRODUCT) .eq(BusiProdNew::getIfPublic, true) + .like(BusiProdNew::getShowPlat,showPlat) .eq(BusiProdNew::getTenantId, tenantId); if (StringUtils.isNotEmpty(text)) { queryWrapper.and(wq -> wq @@ -291,16 +302,18 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页码(1开始)", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "pageSize", value = "每页显示数量", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class), - @ApiImplicitParam(name = "text", value = "搜索内容", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class) + @ApiImplicitParam(name = "text", value = "搜索内容", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "showPlat", value = "平台标识(网站|App)", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/newsPageList") - public R> newsPageList(String tenantId, String catgId, String text, + public R> newsPageList(String tenantId, @RequestParam(required = false) String catgId, @RequestParam(required = false) String text,String showPlat, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(BusiProdNew::getDataType, DATA_TYPE_NEWS) .eq(BusiProdNew::getIfPublic, true) + .like(BusiProdNew::getShowPlat,showPlat) .eq(BusiProdNew::getTenantId, tenantId); if (StringUtils.isNotEmpty(text)) { queryWrapper.and(wq -> wq @@ -354,14 +367,15 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "pageNum", value = "页码(1开始)", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "pageSize", value = "每页显示数量", required = true, dataType = "int", paramType = "query", dataTypeClass = Integer.class), - @ApiImplicitParam(name = "text", value = "搜索内容", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) + @ApiImplicitParam(name = "text", value = "搜索内容", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "showPlat", value = "平台标识(网站|App)", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/searchText") - public R> searchText(String tenantId, String text, + public R> searchText(String tenantId, String text,String showPlat, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - return R.ok(prodNewService.searchTextAll(tenantId, text, page)); + return R.ok(prodNewService.searchTextAll(tenantId, text, page,showPlat)); } /** diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNewController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNewController.java index c83dc4c..afea83a 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNewController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNewController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.base.service.IBasePicsService; import com.ruoyi.busi.domain.BusiProdNew; import com.ruoyi.busi.domain.BusiProdRandom; +import com.ruoyi.busi.domain.BusiRelation; import com.ruoyi.busi.service.IBusiProdNewService; import com.ruoyi.busi.service.IBusiProdRandomService; +import com.ruoyi.busi.service.IBusiRelationService; import com.ruoyi.busi.utils.SimHash; import com.ruoyi.busi.utils.TextPreprocessor; import com.ruoyi.busi.vo.ProdNewVO; @@ -15,6 +17,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -43,6 +46,8 @@ public class BusiNewController extends BaseController private IBasePicsService basePicsService; @Autowired private IBusiProdRandomService prodRandomService; + @Autowired + private IBusiRelationService relationService; /** * 查询新闻列表 @@ -121,6 +126,13 @@ public class BusiNewController extends BaseController }); basePicsService.saveBatch(prodNewVO.getFileList()); } + //默认负责人就是当前用户 + BusiRelation relation = new BusiRelation(); + relation.setUserId(SecurityUtils.getUserId()); + relation.setProdId(prodNewVO.getId()); + relation.setTenantId(prodNewVO.getTenantId()); + relationService.save(relation); + busiProdNewService.setAmount(prodNewVO.getTenantId()); return success(); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java index 46b6039..a97eb13 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java @@ -10,11 +10,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.base.service.IBasePicsService; import com.ruoyi.busi.domain.BusiProdRandom; +import com.ruoyi.busi.domain.BusiRelation; import com.ruoyi.busi.service.IBusiProdRandomService; +import com.ruoyi.busi.service.IBusiRelationService; import com.ruoyi.busi.utils.SimHash; import com.ruoyi.busi.utils.TextPreprocessor; import com.ruoyi.busi.vo.ProdNewVO; import com.ruoyi.busi.vo.ProdRandomVO; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +57,8 @@ public class BusiProdController extends BaseController private IBasePicsService basePicsService; @Autowired private IBusiProdRandomService prodRandomService; + @Autowired + private IBusiRelationService relationService; /** * 查询产品列表 @@ -132,6 +137,13 @@ public class BusiProdController extends BaseController }); basePicsService.saveBatch(prodNewVO.getFileList()); } + //默认负责人就是当前用户 + BusiRelation relation = new BusiRelation(); + relation.setUserId(SecurityUtils.getUserId()); + relation.setProdId(prodNewVO.getId()); + relation.setTenantId(prodNewVO.getTenantId()); + relationService.save(relation); + busiProdNewService.setAmount(prodNewVO.getTenantId()); return success(); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java index 13eb083..35231bf 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java @@ -89,7 +89,7 @@ public class BusiRelationController extends BaseController List busiRelationList = new ArrayList<>(); userIdList.forEach(item->{ BusiRelation relation = new BusiRelation(); - relation.setUserId(item); + relation.setUserId(Long.valueOf(item)); relation.setProdId(busiRelation.getProdId()); relation.setTenantId(busiRelation.getTenantId()); busiRelationList.add(relation); diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java index f85af2f..c6ae3cf 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java @@ -30,7 +30,7 @@ public class BusiRelation extends DlBaseEntity /** 用户id */ @Excel(name = "用户id") - private String userId; + private Long userId; /** 产品、新闻id */ @Excel(name = "产品、新闻id") diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java index 9866acc..8d1b7b0 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdNewService.java @@ -54,7 +54,7 @@ public interface IBusiProdNewService extends IService * @param tenantId 租户id * @return java.util.List **/ - List hotProdOrNews(String tenantId,String dateType,Boolean ifHot); + List hotProdOrNews(String tenantId,String dateType,Boolean ifHot,String showPlat); /** * web站点查看详情 @@ -74,7 +74,7 @@ public interface IBusiProdNewService extends IService * @param page 分页对象 * @return com.baomidou.mybatisplus.core.metadata.IPage **/ - IPage searchTextAll(String tenantId, String text,Page page); + IPage searchTextAll(String tenantId, String text,Page page,String showPlat); /** * 相似度检测 diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java index 151d338..4667d2b 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdNewServiceImpl.java @@ -146,13 +146,14 @@ public class BusiProdNewServiceImpl extends ServiceImpl hotProdOrNews(String tenantId,String dateType,Boolean ifHot) { + public List hotProdOrNews(String tenantId,String dateType,Boolean ifHot,String showPlat) { Page page = new Page<>(1, 10); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(BusiProdNew::getTenantId,tenantId) .eq(BusiProdNew::getDataType,dateType) .eq(BusiProdNew::getIfPublic,true) .eq(BusiProdNew::getIfReco,ifHot) + .like(BusiProdNew::getShowPlat,showPlat) .orderByDesc(BusiProdNew::getSort); //查所有栏目 BusiCategory category = new BusiCategory(); @@ -202,10 +203,11 @@ public class BusiProdNewServiceImpl extends ServiceImpl searchTextAll(String tenantId, String text, Page page) { + public IPage searchTextAll(String tenantId, String text, Page page,String showPlat) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(BusiProdNew::getTenantId,tenantId) .eq(BusiProdNew::getIfPublic,true) + .like(BusiProdNew::getShowPlat,showPlat) .and(wq->wq .like(BusiProdNew::getTitle,text) .or().like(BusiProdNew::getDescription,text) diff --git a/dl_vue/src/views/busi/new/index.vue b/dl_vue/src/views/busi/new/index.vue index cda4afa..2751575 100644 --- a/dl_vue/src/views/busi/new/index.vue +++ b/dl_vue/src/views/busi/new/index.vue @@ -4,6 +4,16 @@ + + + + + + - + +