From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
index 4878d3c..01560a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
@@ -1,29 +1,35 @@
package com.panzhihua.applets.api;
+import java.util.Objects;
+
import javax.annotation.Resource;
import javax.validation.Valid;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageMerchantProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
-import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
-import com.panzhihua.common.model.vos.community.convenient.ConvenientProductVO;
-import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtBusinessDetailVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientProductLevelInfoVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientProductVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import java.util.Objects;
/**
* @description: 社区便民服务商家接口
@@ -63,18 +69,20 @@
if (Objects.isNull(communityId)) {
return R.fail("社区id不能为空");
}
- return communityService.getSuitableServiceCategories(communityId);
+ return communityService.getSuitableServiceCategories(communityId,this.getAreaCode());
}
@ApiOperation(value = "分页获取热门商家", response = ConvenientMerchantVO.class)
@PostMapping("/merchant/popular")
public R getPopularMerchants(@RequestBody @Valid PagePopularMerchantDTO pagePopularMerchantDTO) {
+ pagePopularMerchantDTO.setAreaCode(this.getAreaCode());
return communityService.getPopularMerchants(pagePopularMerchantDTO);
}
@ApiOperation(value = "分页获取服务类型下商家", response = ConvenientMerchantVO.class)
@PostMapping("/merchant/classify")
public R getClassifyMerchants(@RequestBody @Valid PageClassifyMerchantDTO pageClassifyMerchantDTO) {
+ pageClassifyMerchantDTO.setAreaCode(this.getAreaCode());
return communityService.getClassifyMerchants(pageClassifyMerchantDTO);
}
@@ -84,9 +92,45 @@
return communityService.getMerchantDetail(merchantId);
}
- @ApiOperation(value = "分页获取商家产品", response = ConvenientProductVO.class)
- @PostMapping("/merchant/product")
- public R getMerchantProduct(@RequestBody @Valid PageMerchantProductDTO pageMerchantProductDTO) {
- return communityService.getMerchantProduct(pageMerchantProductDTO);
+ @ApiOperation(value = "获取商家产品", response = ConvenientProductLevelInfoVO.class)
+ @GetMapping("/product/list")
+ public R getMerchantProduct(@RequestParam("merchantId") Long merchantId) {
+ return communityService.getMerchantProduct(merchantId);
+ }
+
+ @ApiOperation(value = "获取产品详情", response = ConvenientProductVO.class)
+ @GetMapping("/product/detail")
+ public R getProductDetail(@RequestParam("productId") Long productId) {
+ return communityService.getProductDetail(productId);
+ }
+
+ @ApiOperation(value = "商家分页搜索", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/search")
+ public R pageSearchMerchant(@RequestBody @Valid PageSearchDTO pageSearchDTO) {
+ return communityService.pageSearchMerchant(pageSearchDTO);
+ }
+
+ @ApiOperation(value = "商品分页搜索", response = ConvenientProductVO.class)
+ @PostMapping("/product/search")
+ public R pageSearchProduct(@RequestBody @Valid PageSearchDTO pageSearchDTO) {
+ return communityService.pageSearchProduct(pageSearchDTO);
+ }
+
+ @ApiOperation(value = "增加商家咨询量")
+ @GetMapping("/merchant/incr-consult")
+ public R incrMerchantConsult(@RequestParam("merchantId") Long merchantId) {
+ return communityService.consultMerchant(merchantId);
+ }
+
+ @ApiOperation(value = "增加商家浏览量")
+ @GetMapping("/merchant/incr-view")
+ public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
+ return communityService.incrMerchantView(merchantId);
+ }
+
+ @ApiOperation(value = "增加产品浏览量")
+ @GetMapping("/product/incr-view")
+ public R incrProductView(@RequestParam("productId") Long productId) {
+ return communityService.incrProductView(productId);
}
}
--
Gitblit v1.7.1