From ab2a6f7e77b504a82de22dc2b8dd987564ed77f5 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 26 九月 2023 17:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
/dev/null | 46 -----------
phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java | 135 +++++++++++++++++++++++++++++++++
phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java | 1
phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java | 1
4 files changed, 135 insertions(+), 48 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
index 7ce42de..e7b6a14 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
@@ -1,7 +1,6 @@
package com.hz.his.dto;
import com.hz.his.dto.common.DCommonDto;
-import com.hz.his.dto.common.OperateDto;
import lombok.Data;
/**
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
index 141973a..4270eba 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
@@ -1,7 +1,6 @@
package com.hz.his.dto;
import com.hz.his.dto.common.DCommonDto;
-import com.hz.his.dto.common.OperateDto;
import lombok.Data;
/**
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java
deleted file mode 100644
index dbcf98a..0000000
--- a/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hz.his.dto.common;
-
-import lombok.Data;
-
-/**
- * @author fwq
- */
-@Data
-public class OperateDto {
- /**鎿嶄綔浜烘爣璇�*/
- String operateId;
- /**鎿嶄綔浜哄悕绉�*/
- String operateMan;
-
-}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java
deleted file mode 100644
index 92513a9..0000000
--- a/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.hz.his.dto.common;
-
-import java.util.Date;
-
-/**
- * @author fwq
- * 鏃堕棿鎵╁睍绫�
- */
-public class TimeDto {
-
- private String timeString;
-
- private Date timeDate;
-
- public TimeDto(String timeString) {
- this.timeString = timeString;
- }
-
- public TimeDto(Date timeDate) {
- this.timeDate = timeDate;
- }
-
- public TimeDto() {
- }
-
- public TimeDto(String timeString, Date timeDate) {
- this.timeString = timeString;
- this.timeDate = timeDate;
- }
-
- public String getTimeString() {
- return timeString;
- }
-
- public void setTimeString(String timeString) {
- this.timeString = timeString;
- }
-
- public Date getTimeDate() {
- return timeDate;
- }
-
- public void setTimeDate(Date timeDate) {
- this.timeDate = timeDate;
- }
-}
diff --git a/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
new file mode 100644
index 0000000..53985c7
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
@@ -0,0 +1,135 @@
+package com.hz.his.feign.download;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.*;
+import com.hz.his.dto.user.DUserChangeLogDto;
+import com.hz.his.dto.user.DUserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * PHIS-涓嬭浇涓績
+ */
+@FeignClient(name="phi-download-service",path = "/phis-download",contextId = "d-phi-download")
+public interface DFileDownloadService {
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-棰勭害鏁版嵁*/
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍖荤敓鎺掔彮*/
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒�*/
+ @PostMapping(value = "/report/export/coupon/list")
+ Result exportCoupon(@RequestBody DCouponDto dCouponDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒哥爜*/
+ @PostMapping(value = "/report/export/coupon/number/list")
+ Result exportCouponNumber(@RequestBody DCouponDto dCouponDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒掓墸璁板綍*/
+ @PostMapping(value = "/report/export/deduction/list")
+ Result exportDeduction(@RequestBody DDeductionDto dDeductionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍛樺伐鏁版嵁*/
+ @PostMapping(value = "/report/export/employee/list")
+ Result exportEmployee(@RequestBody DEmployeeDto dEmployeeDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍛樺伐瑙掕壊鏁版嵁*/
+ @PostMapping(value = "/report/export/employee/role/list")
+ Result exportEmployeeRole(@RequestBody DEmployeeDto dEmployeeDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-姒傝璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/list")
+ Result exportOrder(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鏄庣粏璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/detail/list")
+ Result exportOrderDetail(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鑽璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/drug/list")
+ Result exportOrderDrug(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鏀舵璁板綍*/
+ @PostMapping(value = "/report/export/pay/detail/list")
+ Result exportPayDetail(@RequestBody DPayDetailDto dPayDetailDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰鍒嗙被*/
+ @PostMapping(value = "/report/export/project/type/list")
+ Result exportProjectType(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰SKU*/
+ @PostMapping(value = "/report/export/project/sku/list")
+ Result exportProjectSku(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰SPU*/
+ @PostMapping(value = "/report/export/project/spu/list")
+ Result exportProjectSpu(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-棰勭害椤圭洰*/
+ @PostMapping(value = "/report/export/project/sku/appoint/list")
+ Result exportProjectSkuAppoint(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-閫�娆捐褰�*/
+ @PostMapping(value = "/report/export/refund/list")
+ Result exportRefund(@RequestBody DRefundDto dRefundDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-娌荤枟閫氱煡鍗�*/
+ @PostMapping(value = "/report/export/treat/list")
+ Result exportTreat(@RequestBody DTreatSingleDto dTreatSingleDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-瀵煎尰璁㈠崟*/
+ @PostMapping(value = "/report/export/guide/visit/order/list")
+ Result exportGuideOrder(@RequestBody DVisitOrderDto dVisitOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒拌璁板綍*/
+ @PostMapping(value = "/report/export/visit/record/list")
+ Result exportVisitRecord(@RequestBody DVisitRecordDto dVisitRecordDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍥炶璁板綍*/
+ @PostMapping(value = "/report/export/return/visit/list")
+ Result exportReturnVisit(@RequestBody DReturnVisitDto dReturnVisitDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒濊瘖鍗′俊鎭�*/
+ @PostMapping(value = "/report/export/user/first/treat/card/list")
+ Result exportFirstTreatCard(@RequestBody DFirstTreatCardDto dFirstTreatCardDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-璁惧*/
+ @PostMapping(value = "/report/export/device/list")
+ Result exportDevice(@RequestBody DDeviceDto dDeviceDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍌ㄥ�奸噾鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/store/list")
+ Result exportStore(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-澧炲�奸噾鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/increment/list")
+ Result exportIncrement(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-绉垎鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/integral/list")
+ Result exportIntegral(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-閫氳瘽璁板綍*/
+ @PostMapping(value = "/report/export/tel/log/list")
+ Result exportTelLog(@RequestBody DTelLogDto dTelLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-绛夌骇鍙樺寲*/
+ @PostMapping(value = "/report/export/user/change/log/level/list")
+ Result exportLevelChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤鹃棶鍙樺寲*/
+ @PostMapping(value = "/report/export/user/change/log/adviser/list")
+ Result exportAdviserChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐘舵�佸彉鍖�*/
+ @PostMapping(value = "/report/export/user/change/log/status/list")
+ Result exportStatusChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鎶曡瘔璁板綍*/
+ @PostMapping(value = "/report/export/complaint/list")
+ Result exportComplaint(@RequestBody DComplaintDto dComplaintDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍜ㄨ璁板綍*/
+ @PostMapping(value = "/report/export/consultation/list")
+ Result exportConsultation(@RequestBody DConsultationDto dConsultationDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-淇冮攢*/
+ @PostMapping(value = "/report/export/promotion/list")
+ Result exportPromotion(@RequestBody DPromotionDto dPromotionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍗￠」*/
+ @PostMapping(value = "/report/export/card/list")
+ Result exportCard(@RequestBody DCardDto dCardDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-娲诲姩*/
+ @PostMapping(value = "/report/export/activity/list")
+ Result exportActivity(@RequestBody DActivityDto dActivityDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢ㄦ埛鏁版嵁*/
+ @PostMapping(value = "/report/export/user/list")
+ Result exportUser(@RequestBody DUserDto dUserDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-杞禒鏁版嵁*/
+ @PostMapping(value = "/report/export/user/turn/list")
+ Result exportTurn(@RequestBody DTurnDto dTurnDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍟嗗搧-鑽搧鏁版嵁*/
+ @PostMapping(value = "/report/export/consumables/list")
+ Result exportConsumables(@RequestBody DConsumablesDto dConsumablesDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢靛瓙澶勬柟*/
+ @PostMapping(value = "/report/export/treat/prescription/list")
+ Result exportPrescription(@RequestBody DPrescriptionDto dPrescriptionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢靛瓙鐥呭巻*/
+ @PostMapping(value = "/report/export/treat/medical/list")
+ Result exportMedical(@RequestBody DMedicalRecordDto dMedicalRecordDto);
+
+
+
+}
--
Gitblit v1.8.0