修改 小程序首页接口

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -11,6 +11,7 @@ import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
 import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
 import com.wwdz.ch.wx.service.ItemService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -51,6 +52,9 @@ public class ItemServiceImpl implements ItemService {
             coinRequestDto.setPage(dto.getPage());
             coinRequestDto.setLimit(dto.getSize());
             coinRequestDto.setIsExcluded(1);
+            if (StringUtils.isNotBlank(dto.getName())) {
+                coinRequestDto.setName(dto.getName());
+            }
             PageInfo<Item> page = itemDao.findByPage(coinRequestDto);
             PageInfo<AgentTranceResponseVo> result = new PageInfo<>();
             result.setPageNum(page.getPageNum());
@@ -96,59 +100,6 @@ public class ItemServiceImpl implements ItemService {
         }
     }
 
-    @Override
-    public Result search(ItemRequestDto dto) {
-        try {
-            CoinRequestDto coinRequestDto = new CoinRequestDto();
-            coinRequestDto.setPage(dto.getPage());
-            coinRequestDto.setLimit(dto.getSize());
-            coinRequestDto.setIsExcluded(1);
-            coinRequestDto.setName(dto.getName());
-            PageInfo<Item> page = itemDao.findByPage(coinRequestDto);
-            PageInfo<AgentTranceResponseVo> result = new PageInfo<>();
-            result.setPageNum(page.getPageNum());
-            result.setPageSize(page.getPageSize());
-            result.setTotal(page.getTotal());
-            result.setList(new ArrayList<>());
-            result.setHasNextPage(page.isHasNextPage());
-            if (CollectionUtils.isEmpty(page.getList())) {
-                return Result.success(result);
-            }
-            List<AgentTranceResponseVo> resultList = new ArrayList<>();
-            for (Item item : page.getList()) {
-                ItemResponseVo vo = new ItemResponseVo();
-                vo.setId(item.getId());
-                vo.setName(item.getName());
-                vo.setImages(item.getImages());
-                vo.setPrice(String.valueOf(item.getPrice() * 100));
-                vo.setDetail(item.getDetail());
-                vo.setIsCollected(0);
-                if (!dto.getUserId().equals(0L)) {
-                    vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId()) ? 1 : 0);
-                    vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
-                }
-                long count = favoritesItemsRelationDao.countByItemId(item.getId());
-                if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
-                    count --;
-                }
-                vo.setCollectCount(count);
-                vo.setSourceType(item.getSourceType());
-
-                AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
-                agentTranceResponseVo.setAgentTraceInfo_("");
-                agentTranceResponseVo.setViewType(1);
-                agentTranceResponseVo.setDetail(vo);
-                resultList.add(agentTranceResponseVo);
-            }
-            result.setList(resultList);
-            logger.info("【请求结束】查询首页搜索成功");
-            return Result.success(result);
-        } catch (Exception e) {
-            logger.error("查询首页搜索失败", e);
-            return Result.failed("搜索失败");
-        }
-    }
-
     @Override
     public Result list(ItemRequestDto dto) {
         return null;

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ItemService.java

@@ -6,8 +6,6 @@ import com.wwdz.ch.wx.entity.request.ItemRequestDto;
 public interface ItemService {
     Result page(ItemRequestDto dto);
 
-    Result search(ItemRequestDto dto);
-
     Result list(ItemRequestDto dto);
 
     Result add(ItemRequestDto dto);

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxItemController.java

@@ -35,31 +35,6 @@ public class WxItemController {
         String json = klDataRequestDto.getKl_data();
         logger.info("【请求开始】藏品列表首页,请求参数,kl_data:{}", json);
         String userId = JsonUtils.getValueByPath(json, "userId");
-        String page = JsonUtils.getValueByPath(json, "page");
-        String size = JsonUtils.getValueByPath(json, "size");
-        if (StringUtils.isBlank(page)) {
-            return Result.failed("当前页不能为空");
-        }
-        if (StringUtils.isBlank(size)) {
-            return Result.failed("页面大小不能为空");
-        }
-
-        ItemRequestDto dto = new ItemRequestDto();
-        dto.setUserId(0L);
-        if (StringUtils.isNotBlank(userId)) {
-            dto.setUserId(Long.parseLong(userId));
-        }
-        dto.setPage(Integer.parseInt(page));
-        dto.setSize(Integer.parseInt(size));
-        return itemService.page(dto);
-    }
-
-    @ApiOperation(value = "搜索分页查询")
-    @PostMapping("/search")
-    public Result search(@RequestBody KlDataRequestDto klDataRequestDto) {
-        String json = klDataRequestDto.getKl_data();
-        logger.info("【请求开始】藏品列表搜索,请求参数,kl_data:{}", json);
-        String userId = JsonUtils.getValueByPath(json, "userId");
         String name = JsonUtils.getValueByPath(json, "name");
         String page = JsonUtils.getValueByPath(json, "page");
         String size = JsonUtils.getValueByPath(json, "size");
@@ -69,9 +44,6 @@ public class WxItemController {
         if (StringUtils.isBlank(size)) {
             return Result.failed("页面大小不能为空");
         }
-        if (StringUtils.isBlank(name)) {
-            return Result.failed("搜索内容不能为空");
-        }
 
         ItemRequestDto dto = new ItemRequestDto();
         dto.setUserId(0L);
@@ -81,7 +53,7 @@ public class WxItemController {
         dto.setPage(Integer.parseInt(page));
         dto.setSize(Integer.parseInt(size));
         dto.setName(name);
-        return itemService.search(dto);
+        return itemService.page(dto);
     }
 
     @ApiOperation(value = "列表查询")