From 9ab9153464fccb835c3818b1bbe195d5a3cf7252 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 03 七月 2023 10:37:11 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java | 25 ++++++++++++
phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java | 10 +++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 10 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java | 5 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 6 +++
phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java | 12 ++++++
6 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
index 8c82c2f..4403155 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
@@ -12,4 +12,14 @@
/**妗跺悕绉�-鍙笉浼�*/
private String bucketName;
+ private String fileName;
+
+ private String method;
+
+ public FileSignVo() {
+ }
+
+ public FileSignVo(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
index cb909f0..27b5038 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -14,6 +14,10 @@
private Date startTime;
/**寮�鍗曠粨鏉熸椂闂�*/
private Date endTime;
+ /**璁㈠崟鏀粯寮�濮�*/
+ private Date orderPayStartTime;
+ /**璁㈠崟鏀粯缁撴潫*/
+ private Date orderPayEndTime;
/**璁㈠崟鍙�*/
private String orderNo;
/**鎵�灞為棬搴�*/
@@ -24,6 +28,14 @@
private Integer deductionStatus;
/**椤圭洰鍒嗙被*/
private String typeId;
+ /**鍝侀」鍒嗙被*/
+ private String goodsClassify;
+ /**鏈堜唤鏃堕棿*/
+ private String monthTime;
+ /**鏈堜唤鏃堕棿寮�濮�*/
+ private String startMonthTime;
+ /**鏈堜唤鏃堕棿缁撴潫*/
+ private String endMonthTime;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index b927907..5a4670b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -53,6 +53,14 @@
* @return 浣跨敤FileSignReturnVo杞寲
*/
@PostMapping(value = "/cos/signUrl")
- Response downloadFile(@RequestBody FileSignVo fileSignVo);
+ Result signUrl(@RequestBody FileSignVo fileSignVo);
+
+ /**
+ *鐢熸垚涓婁紶绛惧悕
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/policy")
+ Result policy(@RequestBody FileSignVo fileSignVo);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
index 17fc49a..b3e6641 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -21,5 +21,10 @@
@PostMapping("/deduction/surface/list")
Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 鏈墽琛屾槑缁嗗揩鐓у垪琛�
+ */
+ @PostMapping("/deduction/surface/list/data")
+ Result surfaceListData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
index e6207fc..e02dcc3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -34,5 +34,11 @@
@PostMapping(value = "/exp/deduction/surface")
Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 瀵煎嚭鍒掓墸蹇収鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface/data")
+ Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
new file mode 100644
index 0000000..1e05b0b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.cos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OssRecoverVO
+ * @Description cos鐢熸垚绛惧悕杩斿洖vo
+ * @Author wrh
+ * @Date 2023/6/30 17:30
+ * @Version 1.0
+ */
+@Data
+public class OssRecoverVO {
+
+ private String accessid;
+ //绛惧悕
+ private String signature;
+ private String dir;
+ private String host;
+ //杩囨湡鏃堕棿
+ private String expire;
+
+
+
+}
--
Gitblit v1.8.0