From 59f57d0a99d677ed4e341f413267612df7fb6bb9 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 09 十一月 2023 10:01:03 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java | 16 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java | 25 ++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 20 ++++++++++
3 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
new file mode 100644
index 0000000..5a07d54
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class UserReportDto {
+ /**鍛樺伐鏍囪瘑*/
+ private String userId;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
new file mode 100644
index 0000000..a3c2d8b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class UserReportListDto {
+
+ private List<UserReportDto> list;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
new file mode 100644
index 0000000..3ee2464
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.CxjReportReqDto;
+import com.hz.his.dto.report.UserReportListDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 鐢ㄦ埛鏁版嵁
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-user-data")
+public interface BiUserService {
+
+ /**
+ * 鎴愪氦鐜伴噾
+ */
+ @PostMapping("/admin/user/report/cash/money")
+ Result cashTotalList(@RequestBody UserReportListDto userReportListDto);
+
+
+}
--
Gitblit v1.8.0