From a67506723c8c8e6f0d223b864eaa69423a2710a8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 11 Mar 2021 16:48:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 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
new file mode 100644
index 0000000..3876ddb
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -0,0 +1,54 @@
+package org.springblade.jfpt.parcel.controller;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+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.*;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @title 包裹控制层
+ * @author arsn
+ * @time 2021-03-10
+ */
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("parcel/parcel")
+public class ParcelController {
+
+ private final ParcelService parcelService;
+
+ /**
+ * 获取违禁包裹统计数据,远程调用接口
+ * @param conditionVo 查询条件对象 状态码 0:本天 1:本周 2:本月
+ * @param response 返回作用域
+ * @return
+ */
+ @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