提交 03091cb3 authored 作者: 吕本才's avatar 吕本才

去掉controller包装器,暂时不使用拦截器,后续再进行测试

上级 e5238122
...@@ -47,7 +47,6 @@ public class JmDataScopeInterceptor implements HandlerInterceptor { ...@@ -47,7 +47,6 @@ public class JmDataScopeInterceptor implements HandlerInterceptor {
if (roles.length > 0) { if (roles.length > 0) {
log.info(roles[0]); log.info(roles[0]);
} }
return true; return true;
} }
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
......
...@@ -5,8 +5,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; ...@@ -5,8 +5,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@Configuration @Configuration
public class JmWebConfigurer implements WebMvcConfigurer { public class JmWebConfigurer implements WebMvcConfigurer {
...@@ -16,14 +14,14 @@ public class JmWebConfigurer implements WebMvcConfigurer { ...@@ -16,14 +14,14 @@ public class JmWebConfigurer implements WebMvcConfigurer {
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
List<String> patterns = new ArrayList<>(); // List<String> patterns = new ArrayList<>();
// 拦截报表查看页面 // 拦截报表查看页面
// patterns.add("/jmreport/shareView/**"); // patterns.add("/jmreport/shareView/**");
patterns.add("/share/list"); // patterns.add("/share/list");
//
registry.addInterceptor(dataScopeInterceptor) // registry.addInterceptor(dataScopeInterceptor)
.addPathPatterns(patterns) // 需要拦截的请求 // .addPathPatterns(patterns) // 需要拦截的请求
.excludePathPatterns(); // 不需要拦截的请求 // .excludePathPatterns(); // 不需要拦截的请求
} }
} }
package com.link.report.config.advice;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sfa.common.core.domain.R;
import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
/**
* @author : liqiulin
* @date : 2024-10-28 17
* @describe :自动封装
*/
@RestControllerAdvice
public class ControllerResponseAdvice implements ResponseBodyAdvice<Object>{
/**
* response是R类型或者注释了NotControllerResponseAdvice都不进行包装
*/
@Override
public boolean supports(MethodParameter methodParameter, Class converterType) {
// if (methodParameter.getParameterType().isAssignableFrom(AjaxResult.class)) {
// return false;
// }
return !methodParameter.getParameterType().isAssignableFrom(R.class);
}
@Override
public Object beforeBodyWrite(Object body, MethodParameter methodParameter, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
// String类型不能直接包装
if (methodParameter.getGenericParameterType().equals(String.class)) {
ObjectMapper objectMapper = new ObjectMapper();
try {
// 将数据包装在ResultVo里后转换为json串进行返回
return objectMapper.writeValueAsString(R.ok(body));
} catch (JsonProcessingException e) {
throw new RuntimeException();
}
}
// 包装成R返回
return R.ok(body);
}
}
...@@ -3,6 +3,7 @@ package com.link.report.controller.query; ...@@ -3,6 +3,7 @@ package com.link.report.controller.query;
import com.link.report.pojo.request.ReportShareListVo; import com.link.report.pojo.request.ReportShareListVo;
import com.link.report.pojo.response.ReportShareBiListDto; import com.link.report.pojo.response.ReportShareBiListDto;
import com.link.report.service.ReportShareService; import com.link.report.service.ReportShareService;
import com.sfa.common.core.domain.R;
import com.sfa.common.core.web.controller.BaseController; import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.datascope.annotation.DataScope; import com.sfa.common.datascope.annotation.DataScope;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -33,8 +34,9 @@ public class ReportShareQueryController extends BaseController { ...@@ -33,8 +34,9 @@ public class ReportShareQueryController extends BaseController {
// @RequiresPermissions("report:jimu:list") // @RequiresPermissions("report:jimu:list")
@DataScope(deptAlias = "d", userAlias = "u") @DataScope(deptAlias = "d", userAlias = "u")
@GetMapping("/list") @GetMapping("/list")
public List<ReportShareBiListDto> selectList(ReportShareListVo reportShareListVo) { public R<List<ReportShareBiListDto>> selectList(ReportShareListVo reportShareListVo) {
return reportShareService.selectList(reportShareListVo); List<ReportShareBiListDto> reportShareBiListDtos = reportShareService.selectList(reportShareListVo);
return R.ok(reportShareBiListDtos);
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论