|
@ -16,6 +16,8 @@ import org.springframework.cloud.sleuth.Tracer;
|
|
|
import org.springframework.http.MediaType;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping(AgreementContants.Agreement.api_common)
|
|
|
@Api(value = "协议相关操作", description = "协议相关操作")
|
|
@ -74,26 +76,24 @@ public class WlyyAgreementController extends EnvelopRestController {
|
|
|
return wlyyAgreementFegin.findByCode(code);
|
|
|
}
|
|
|
|
|
|
//@RequestMapping(value =AgreementContants.Agreement.api_queryPage, method = RequestMethod.GET)
|
|
|
//@ApiOperation(value = "分页获取协议")
|
|
|
//@HystrixCommand(commandProperties = {
|
|
|
// @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
|
|
|
// @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
|
|
|
//public Envelop queryPage(
|
|
|
// @ApiParam(name = "fields", value = "返回的字段,为空返回全部字段", defaultValue = "id,code,parentCode,saasId,name,price,posterPic,remark,type,status")
|
|
|
// @RequestParam(value = "fields", required = false) String fields,
|
|
|
// @ApiParam(name = "filters", value = "过滤器,为空检索所有条件")
|
|
|
// @RequestParam(value = "filters", required = false) String filters,
|
|
|
// @ApiParam(name = "sorts", value = "排序,规则参见说明文档", defaultValue = "+name,+createTime")
|
|
|
// @RequestParam(value = "sorts", required = false) String sorts,
|
|
|
// @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
|
|
|
// @RequestParam(value = "size", required = false) int size,
|
|
|
// @ApiParam(name = "page", value = "页码", defaultValue = "1")
|
|
|
// @RequestParam(value = "page", required = false) int page,
|
|
|
// HttpServletRequest request,
|
|
|
// HttpServletResponse response) throws Exception {
|
|
|
// return wlyyAgreementFegin.queryPage(fields,filters,sorts,size,page,request,response);
|
|
|
//}
|
|
|
@RequestMapping(value =AgreementContants.Agreement.api_queryPage, method = RequestMethod.GET)
|
|
|
@ApiOperation(value = "分页获取协议")
|
|
|
@HystrixCommand(commandProperties = {
|
|
|
@HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
|
|
|
@HystrixProperty(name = "execution.timeout.enabled", value = "false") })
|
|
|
public Envelop queryPage(
|
|
|
@ApiParam(name = "fields", value = "返回的字段,为空返回全部字段", defaultValue = "id,code,parentCode,saasId,name,price,posterPic,remark,type,status")
|
|
|
@RequestParam(value = "fields", required = false) String fields,
|
|
|
@ApiParam(name = "filters", value = "过滤器,为空检索所有条件")
|
|
|
@RequestParam(value = "filters", required = false) String filters,
|
|
|
@ApiParam(name = "sorts", value = "排序,规则参见说明文档", defaultValue = "+name,+createTime")
|
|
|
@RequestParam(value = "sorts", required = false) String sorts,
|
|
|
@ApiParam(name = "size", value = "分页大小", defaultValue = "15")
|
|
|
@RequestParam(value = "size", required = false) int size,
|
|
|
@ApiParam(name = "page", value = "页码", defaultValue = "1")
|
|
|
@RequestParam(value = "page", required = false) int page) throws Exception {
|
|
|
return wlyyAgreementFegin.queryPage(fields,filters,sorts,size,page);
|
|
|
}
|
|
|
|
|
|
|
|
|
@GetMapping(value =AgreementContants.Agreement.api_getList)
|