From d966574e1c35a3511f87ffd8f819ac5ebbe117ab Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 12 三月 2024 10:37:31 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
/dev/null | 74 ------------------
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java | 40 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java | 46 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java | 21 +++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java | 36 +++++++++
5 files changed, 143 insertions(+), 74 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java
new file mode 100644
index 0000000..a7576c2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto.fdd;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2024/3/6
+ **/
+@Data
+public class FddTemplateDto extends PageDto {
+
+ /** 妯℃澘绫诲瀷锛歞oc:鏂囨。妯℃澘/sign:绛剧讲妯℃澘 */
+ private String type;
+ /** 妯℃澘ID */
+ private String templateId;
+ /** 绛剧讲妯℃澘ID */
+ private String signTemplateId;
+ /** 鏂囨。妯℃澘ID */
+ private String docTemplateId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java
deleted file mode 100644
index 01bc49b..0000000
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.hz.his.feign.service.platform;
-
-import com.hx.resultTool.Result;
-import com.hz.his.dto.PageDto;
-import com.hz.his.dto.fdd.FddDto;
-import com.hz.his.dto.marketing.MarketActivityDto;
-import com.hz.his.dto.user.UserTreatRecordDto;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 娉曞ぇ澶ervice
- * @USER: fhx
- * @DATE: 2023/8/2
- **/
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd")
-public interface SPhipFddService {
-
- /** 鏌ヨ鐢ㄦ埛娉曞ぇ澶у姛鑳芥巿鏉冩暟鎹� */
- @PostMapping(value = "/fdd/userFddAuthData")
- Result userFddAuthData(@RequestBody FddDto dto);
-
- /** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
- @PostMapping(value = "/fdd/authUrl")
- Result fddAuthUrl(@RequestBody FddDto dto);
-
- /** 鎺堟潈鍚屾剰鍏嶉獙璇佺缃� */
- @PostMapping(value = "/fdd/authFreeVisa")
- Result authFreeVisa(@RequestBody FddDto dto);
-
- /** 娉曞ぇ澶х缃叉ā鏉垮垪琛� */
- @PostMapping(value = "/fdd/signTemplateList")
- Result signTemplateList(@RequestBody PageDto dto);
-
- /** 鑾峰彇妯℃澘棰勮閾炬帴 */
- @PostMapping(value = "/fdd/getTemplatePreviewUrl")
- Result getTemplatePreviewUrl(@RequestBody FddDto dto);
-
- /** 鍙戣捣娌荤枟鍚屾剰涔︾缃蹭换鍔� */
- @PostMapping(value = "/fdd/template/signTask")
- Result templateSignTask(@RequestBody FddDto dto);
-
- /** 鑾峰彇绛剧讲浠诲姟鍙備笌浜洪摼鎺� to codeNo */
- @PostMapping(value = "/fdd/getSignTaskActorUrlToCodeNo")
- Result getSignTaskActorUrlToCodeNo(@RequestBody FddDto dto);
-
- /** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
- @RequestMapping(value="/fdd/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
- , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
-
- /** 澶勬柟鍗� - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
- @RequestMapping(value="/fdd/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
- , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
-
- /** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
- @RequestMapping("/cancelSignTask")
- Result cancelSignTask(@RequestBody FddDto dto);
-
- /** 鑾峰彇绛剧讲浠诲姟鏂囦欢涓嬭浇鍦板潃 */
- @PostMapping(value = "/fdd/getSignTaskFileUrl")
- Result getSignTaskFileUrl(@RequestBody FddDto dto);
-
- /** 鏌ヨ涓汉绛惧悕鍒楄〃 */
- @RequestMapping("/fdd/getPersonalSealList")
- Result getPersonalSealList(@RequestBody FddDto dto);
-
- /** 鑾峰彇绛惧悕璁剧疆鍏嶉獙璇佺閾炬帴 */
- @RequestMapping("/fdd/getPersonalSealFreeSignUrl")
- Result getPersonalSealFreeSignUrl(@RequestBody FddDto dto);
-}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java
new file mode 100644
index 0000000..76b6456
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java
@@ -0,0 +1,40 @@
+package com.hz.his.feign.service.platform.fdd;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
+import com.hz.his.dto.marketing.MarketActivityDto;
+import com.hz.his.dto.user.UserTreatRecordDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 娉曞ぇ澶ф巿鏉冨姛鑳絪ervice
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd")
+public interface SPhipFddService {
+
+ /** 鏌ヨ鐢ㄦ埛娉曞ぇ澶у姛鑳芥巿鏉冩暟鎹� */
+ @PostMapping(value = "/fdd/userFddAuthData")
+ Result userFddAuthData(@RequestBody FddDto dto);
+
+ /** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
+ @PostMapping(value = "/fdd/authUrl")
+ Result fddAuthUrl(@RequestBody FddDto dto);
+
+ /** 鎺堟潈鍚屾剰鍏嶉獙璇佺缃� */
+ @PostMapping(value = "/fdd/authFreeVisa")
+ Result authFreeVisa(@RequestBody FddDto dto);
+
+ /** 鏌ヨ涓汉绛惧悕鍒楄〃 */
+ @RequestMapping("/fdd/getPersonalSealList")
+ Result getPersonalSealList(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛惧悕璁剧疆鍏嶉獙璇佺閾炬帴 */
+ @RequestMapping("/fdd/getPersonalSealFreeSignUrl")
+ Result getPersonalSealFreeSignUrl(@RequestBody FddDto dto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
new file mode 100644
index 0000000..8f369c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -0,0 +1,46 @@
+package com.hz.his.feign.service.platform.fdd;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 娉曞ぇ澶х缃蹭换鍔ervice
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd-sign-task")
+public interface SPhipFddSignTaskService {
+
+
+ /** 鍙戣捣妯℃澘绛剧讲浠诲姟 */
+ @PostMapping(value = "/fdd/sign/task/template/signTask")
+ Result templateSignTask(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛剧讲浠诲姟鍙備笌浜洪摼鎺� to codeNo */
+ @PostMapping(value = "/fdd/sign/task/getSignTaskActorUrlToCodeNo")
+ Result getSignTaskActorUrlToCodeNo(@RequestBody FddDto dto);
+
+ /** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
+ @RequestMapping(value="/fdd/sign/task/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
+ , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
+
+ /** 澶勬柟鍗� - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
+ @RequestMapping(value="/fdd/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
+ , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
+
+ /** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
+ @RequestMapping("/fdd/sign/task/cancelSignTask")
+ Result cancelSignTask(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛剧讲浠诲姟鏂囦欢涓嬭浇鍦板潃 */
+ @PostMapping(value = "/fdd/sign/task/getSignTaskFileUrl")
+ Result getSignTaskFileUrl(@RequestBody FddDto dto);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java
new file mode 100644
index 0000000..cc5f68e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java
@@ -0,0 +1,36 @@
+package com.hz.his.feign.service.platform.fdd;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
+import com.hz.his.dto.fdd.FddTemplateDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 娉曞ぇ澶фā鏉跨鐞唖ervice
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd-template")
+public interface SPhipFddTemplateService {
+
+ /** 娉曞ぇ澶х缃叉ā鏉垮垪琛� */
+ @PostMapping(value = "/fdd/template/signTemplateDetail")
+ Result signTemplateList(@RequestBody FddTemplateDto dto);
+
+ /** 鑾峰彇妯℃澘棰勮閾炬帴 */
+ @PostMapping(value = "/fdd/template/getTemplatePreviewUrl")
+ Result getTemplatePreviewUrl(@RequestBody FddTemplateDto dto);
+
+ /** 绛剧讲浠诲姟妯℃澘璇︽儏 */
+ @PostMapping(value = "/fdd/template/signTemplateDetail")
+ Result signTemplateDetail(@RequestBody FddTemplateDto dto);
+
+ /** 鏂囨。妯℃澘璇︽儏 */
+ @PostMapping(value = "/fdd/template/docTemplateDetail")
+ Result docTemplateDetail(@RequestBody FddTemplateDto dto);
+
+}
--
Gitblit v1.8.0