From 6716cdf53d0fe3e0f84fb69b22ec89a1e07d85b5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 11 Mar 2021 14:51:06 +0800
Subject: [PATCH] 包裹数接口返回修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
index e4d86c6..3876ddb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -5,10 +5,7 @@
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.vo.ConditionVo;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -26,18 +23,32 @@
private final ParcelService parcelService;
/**
- * 获取查询条件
- * @param conditionVo 查询条件对象
+ * 获取违禁包裹统计数据，远程调用接口
+ * @param conditionVo 查询条件对象 状态码 0：本天 1：本周 2：本月
* @param response 返回作用域
* @return
*/
- @PostMapping("/parcelKindStatis")
- public R parcelKindStatis(@RequestBody ConditionVo conditionVo, HttpServletResponse response){
+ @GetMapping("/parcelKindStatis")
+ public R parcelKindStatis(ConditionVo conditionVo, HttpServletResponse response){
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
return R.data(parcelService.parcelKindStatis(conditionVo));
}
+ /**
+ * 获取包裹统计数据，远程调用接口获取数据
+ * @param conditionVo 查询条件对象 status 状态码 0：本天 1：本周 2：本月
+ * @param response 返回作用域
+ * @return
+ */
+ @GetMapping("/getParcelStatis")
+ public R getParcelStatis(ConditionVo conditionVo, HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(parcelService.getParcelStatis(conditionVo));
+ }
+
}
--
Gitblit v1.9.3