diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java index 062387cba..ef00f4018 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java @@ -2,17 +2,11 @@ package org.dromara.app; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.content.domain.bo.ArticleBO; -import com.wzj.soopin.content.domain.bo.IndexListBO; import com.wzj.soopin.content.domain.bo.SearchBO; -import com.wzj.soopin.content.domain.vo.ArticleVO; -import com.wzj.soopin.content.domain.vo.IndexVlogVO; import com.wzj.soopin.content.enums.SearchTypeEnum; import com.wzj.soopin.content.service.VlogService; import com.wzj.soopin.goods.domain.bo.ProductBo; -import com.wzj.soopin.goods.domain.vo.ProductVO; import com.wzj.soopin.goods.service.ProductService; -import com.wzj.soopin.goods.service.impl.ProductServiceImpl; import com.wzj.soopin.member.domain.bo.MemberBO; import com.wzj.soopin.member.service.IMemberService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,14 +16,11 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.service.ISysTenantService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; import java.util.Objects; @Slf4j @@ -39,31 +30,12 @@ import java.util.Objects; @RequiredArgsConstructor public class AppSearchController { - private final ProductService productService; - - private final ISysTenantService sysTenantService; - private final IMemberService memberService; - private final VlogService vlogService; - - @Tag(name = "检索") - @PostMapping("/search") - public R> search(@RequestBody ArticleBO bo,@RequestBody Page page) { - -// ProductBo productBo=new ProductBo(); -// productBo.setNameLike(bo.getTitle()); -// Page productPage = productService.page(page, bo.toWrapper()); -// List articleList = productService.getList( bo.toWrapper()); -// return R.ok(articleList); - return null; - } - - @Tag(name = "视频、商品和用户检索") - @PostMapping("/searchApp") + @PostMapping("") public R> searchApp(@RequestBody SearchBO searchBO, @RequestBody Page page) { try { LoginUser loginUser = LoginHelper.getLoginUser(); @@ -72,7 +44,7 @@ public class AppSearchController { } searchBO.setUserId(String.valueOf(loginUser.getUserId())); } catch (Exception e) { - log.error("用户没登陆", e); + log.error("用户没登陆11", e); } IPage pages = null; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/SearchBO.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/SearchBO.java index dfe3daf0b..aa4d6cee9 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/SearchBO.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/SearchBO.java @@ -1,6 +1,7 @@ package com.wzj.soopin.content.domain.bo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Data; /** @@ -23,6 +24,7 @@ public class SearchBO { * 标题 */ @Schema(description = "标题") + @NotBlank(message = "搜索关键字为空!") private String title; /**