From ba0f00cf00c2a5c693e9608a56d1f7d032f5e216 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 23 Mar 2021 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 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
index 3876ddb..37ce46c 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
@@ -50,5 +50,48 @@
return R.data(parcelService.getParcelStatis(conditionVo));
}
+ /**
+ * 获取图片地址
+ * @param imgUrl 图片url
+ * @param response
+ * @return
+ */
+ @GetMapping("/getParcelPic")
+ public R getParcelPic(String imgUrl,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.getParcelPic(imgUrl));
+ }
+
+ /**
+ * 获取包裹明细分页数据，远程调用api获取数据
+ * @param conditionVo 请求参数对象
+ * @param response
+ * @return
+ */
+ @GetMapping("/getParcelDetailPage")
+ public R getParcelDetailPage(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.getParcelDetailPage(conditionVo));
+ }
+
+
+ /**
+ * 获取包裹违禁品明细分页数据，远程调用api获取数据
+ * @param conditionVo 请求参数对象
+ * @param response
+ * @return
+ */
+ @GetMapping("/getParcelkindDetailPage")
+ public R getParcelkindDetailPage(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.getParcelkindDetailPage(conditionVo));
+ }
+
}
--
Gitblit v1.9.3