yaoyi 3 долоо хоног өмнө
parent
commit
9d923884a3

+ 3 - 2
src/main/java/com/hr/controller/EsignController.java

@@ -3,6 +3,7 @@ package com.hr.controller;
 import com.hr.dto.EsignParmDto;
 import com.hr.dto.EsignReturnDto;
 import com.hr.repository.service.EsignService;
+import com.yy.basedevelop.common.data.BaseReturnDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,7 +27,7 @@ public class EsignController {
      * @return
      */
     @PostMapping("platform")
-    public EsignReturnDto platformSignByPdfStream(@RequestBody EsignParmDto parm){
+    public BaseReturnDto<EsignReturnDto> platformSignByPdfStream(@RequestBody EsignParmDto parm){
         return esignService.platformSignByPdfStream(parm);
     }
 
@@ -37,7 +38,7 @@ public class EsignController {
      * @return
      */
     @PostMapping("hrSign")
-    public EsignReturnDto hrSignByPdfStream(@RequestBody EsignParmDto parm){
+    public BaseReturnDto<EsignReturnDto> hrSignByPdfStream(@RequestBody EsignParmDto parm){
         return esignService.hrSignByPdfStream(parm);
     }
 

+ 3 - 2
src/main/java/com/hr/repository/service/EsignService.java

@@ -2,6 +2,7 @@ package com.hr.repository.service;
 
 import com.hr.dto.EsignParmDto;
 import com.hr.dto.EsignReturnDto;
+import com.yy.basedevelop.common.data.BaseReturnDto;
 
 /**
  * @author yaoy
@@ -14,7 +15,7 @@ public interface EsignService {
      * @param parm
      * @return
      */
-    public EsignReturnDto platformSignByPdfStream(EsignParmDto parm);
+    public BaseReturnDto<EsignReturnDto> platformSignByPdfStream(EsignParmDto parm);
 
 
     /***
@@ -22,5 +23,5 @@ public interface EsignService {
      * @param parm
      * @return
      */
-    public EsignReturnDto hrSignByPdfStream(EsignParmDto parm);
+    public BaseReturnDto<EsignReturnDto> hrSignByPdfStream(EsignParmDto parm);
 }

+ 12 - 8
src/main/java/com/hr/repository/service/impl/EsignServiceImpl.java

@@ -34,6 +34,7 @@ import com.timevale.esign.paas.tech.bean.request.SignFilePdfParam;
 import com.timevale.esign.paas.tech.bean.result.FileDigestSignResult;
 import com.timevale.esign.paas.tech.client.ServiceClient;
 import com.timevale.esign.paas.tech.enums.SignType;
+import com.yy.basedevelop.common.data.BaseReturnDto;
 import com.yy.basedevelop.common.util.OSSUtil;
 import esign.utils.exception.SuperException;
 import freemarker.ext.beans.BeansWrapper;
@@ -118,7 +119,7 @@ public class EsignServiceImpl implements EsignService {
      * @return
      */
     @Override
-    public EsignReturnDto platformSignByPdfStream(EsignParmDto parm) {
+    public BaseReturnDto<EsignReturnDto> platformSignByPdfStream(EsignParmDto parm) {
         checkParm(parm);
         EsignReturnDto esignReturnDto = new EsignReturnDto();
         try {
@@ -343,16 +344,17 @@ public class EsignServiceImpl implements EsignService {
 
         }
         catch (Exception eex){
-            esignReturnDto.setMsg(eex.getMessage());
+
             log.error("Esign平台自身签署程序异常",eex);
+            return BaseReturnDto.error(eex.getMessage());
         }
 
 
-        return esignReturnDto;
+        return BaseReturnDto.success(esignReturnDto);
     }
 
 
-    public EsignReturnDto hrSignByPdfStream(EsignParmDto dto) {
+    public BaseReturnDto<EsignReturnDto> hrSignByPdfStream(EsignParmDto dto) {
         checkParm(dto);
         EsignReturnDto esignReturnDto = new EsignReturnDto();
         try {
@@ -513,11 +515,12 @@ public class EsignServiceImpl implements EsignService {
 
 
         }catch (Exception e){
-            esignReturnDto.setMsg(e.getMessage());
+
             log.error("生成签章pdf文件处理异常",e);
+            return BaseReturnDto.error(e.getMessage());
         }
 
-        return esignReturnDto;
+        return BaseReturnDto.success(esignReturnDto);
 
     }
 
@@ -1515,9 +1518,10 @@ public class EsignServiceImpl implements EsignService {
 
             EsignServiceImpl impl=new EsignServiceImpl();
             try {
-                EsignReturnDto rt=impl.hrSignByPdfStream(file);
+                BaseReturnDto<EsignReturnDto> rt=impl.hrSignByPdfStream(file);
 //                EsignReturnDto rt=impl.platformSignByPdfStream(file);
-                System.out.println(rt.getOssurl());
+                EsignReturnDto rrr=rt.getData();
+                System.out.println(rt.getData().getOssurl());
             } catch (Exception e) {
 //            throw new RuntimeException(e);
                 e.printStackTrace();