1、sns的feignConfig改为兼容文件和参数传输,2、新增举报查询,3、改回平台分类
This commit is contained in:
parent
5a8903359d
commit
25dc59e213
@ -41,9 +41,9 @@ public class ShopBaseProductCategoryController extends BaseController {
|
|||||||
@RequestMapping(value = "/listCategory", method = RequestMethod.GET)
|
@RequestMapping(value = "/listCategory", method = RequestMethod.GET)
|
||||||
public CommonRes<BaseListRes<ShopBaseProductCategory>> listCategory(ProductCategoryListReq productCategoryListReq) {
|
public CommonRes<BaseListRes<ShopBaseProductCategory>> listCategory(ProductCategoryListReq productCategoryListReq) {
|
||||||
productCategoryListReq.setCategoryIsEnable(true);
|
productCategoryListReq.setCategoryIsEnable(true);
|
||||||
if(productCategoryListReq.getStore_id().equals("0")){
|
// if(productCategoryListReq.getStore_id().equals("0")){
|
||||||
productCategoryListReq.setStore_id("58");
|
// productCategoryListReq.setStore_id("58");
|
||||||
}
|
// }
|
||||||
IPage<ShopBaseProductCategory> pageList = shopBaseProductCategoryService.lists(productCategoryListReq);
|
IPage<ShopBaseProductCategory> pageList = shopBaseProductCategoryService.lists(productCategoryListReq);
|
||||||
|
|
||||||
return success(pageList);
|
return success(pageList);
|
||||||
|
|||||||
@ -5,6 +5,10 @@ import feign.RequestInterceptor;
|
|||||||
import feign.RequestTemplate;
|
import feign.RequestTemplate;
|
||||||
import feign.form.spring.SpringFormEncoder;
|
import feign.form.spring.SpringFormEncoder;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.ObjectFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
|
||||||
|
import org.springframework.cloud.openfeign.support.SpringEncoder;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.web.context.request.RequestContextHolder;
|
import org.springframework.web.context.request.RequestContextHolder;
|
||||||
@ -15,7 +19,8 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
@Configuration
|
@Configuration
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class FeignConfig {
|
public class FeignConfig {
|
||||||
|
@Autowired
|
||||||
|
private ObjectFactory<HttpMessageConverters> messageConverters;
|
||||||
@Bean("requestInterceptor")
|
@Bean("requestInterceptor")
|
||||||
public RequestInterceptor requestInterceptor() {
|
public RequestInterceptor requestInterceptor() {
|
||||||
return new RequestInterceptor() {
|
return new RequestInterceptor() {
|
||||||
@ -32,6 +37,8 @@ public class FeignConfig {
|
|||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public Encoder feignFormEncoder() {
|
public Encoder feignFormEncoder() {
|
||||||
return new SpringFormEncoder();
|
return new SpringFormEncoder(
|
||||||
|
new SpringEncoder(this.messageConverters)//兼容文件和参数的feign调用
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -58,22 +58,33 @@ public class SnsUserReportServiceImpl extends BaseServiceImpl<SnsUserReportMappe
|
|||||||
String reporterNickname= getParameter("reporterNickname");
|
String reporterNickname= getParameter("reporterNickname");
|
||||||
String reportedNickname= getParameter("reportedNickname");
|
String reportedNickname= getParameter("reportedNickname");
|
||||||
String reportedUserId= getParameter("reportedUserId");
|
String reportedUserId= getParameter("reportedUserId");
|
||||||
if(StringUtils.isNotBlank(reporterPhone)){
|
String reportCategory= getParameter("reportCategory");
|
||||||
snsUserReport.setReporterPhone(reporterPhone);
|
String processingStatus= getParameter("processingStatus");
|
||||||
}
|
if(StringUtils.isNotEmpty(reportedUserId)){
|
||||||
if(StringUtils.isNotBlank(reportedPhone)){
|
snsUserReport.setReportedUserId(Long.valueOf(reportedUserId));
|
||||||
snsUserReport.setReportedPhone(reportedPhone);
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotBlank(reporterNickname)){
|
|
||||||
snsUserReport.setReporterNickname(reporterNickname);
|
|
||||||
}
|
|
||||||
if(StringUtils.isNotEmpty(reportedNickname)){
|
|
||||||
snsUserReport.setReportedNickname(reportedNickname);
|
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotEmpty(reportedUserId)){
|
if(StringUtils.isNotEmpty(reportedUserId)){
|
||||||
snsUserReport.setReportedUserId(Long.valueOf(reportedUserId));
|
snsUserReport.setReportedUserId(Long.valueOf(reportedUserId));
|
||||||
}
|
}
|
||||||
|
if(StringUtils.isNotEmpty(reportCategory)){
|
||||||
|
snsUserReport.setReportCategory(Integer.valueOf(reportCategory));
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotEmpty(processingStatus)){
|
||||||
|
snsUserReport.setProcessingStatus(Integer.valueOf(processingStatus));
|
||||||
|
}
|
||||||
QueryWrapper<SnsUserReport> queryWrapper = new QueryWrapper<>(snsUserReport);
|
QueryWrapper<SnsUserReport> queryWrapper = new QueryWrapper<>(snsUserReport);
|
||||||
|
if(StringUtils.isNotBlank(reporterPhone)){
|
||||||
|
queryWrapper.like("reporter_phone", reporterPhone);
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(reportedPhone)){
|
||||||
|
queryWrapper.like("reported_phone", reportedPhone);
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(reporterNickname)){
|
||||||
|
queryWrapper.like("reporter_nickname", reporterNickname);
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotEmpty(reportedNickname)){
|
||||||
|
queryWrapper.like("reported_nickname", reportedNickname);
|
||||||
|
}
|
||||||
return this.lists(queryWrapper,pageNo,pageSize);
|
return this.lists(queryWrapper,pageNo,pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user