安心签修修改

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/AnXinSignEnterpriseAccountRequest.java

@@ -17,6 +17,9 @@ public class AnXinSignEnterpriseAccountRequest extends AbstractAtsRequest<AnXinS
     /** 账号附属信息*/
     private AnXinEnterpriseTransactorModel enterpriseTransactor;
 
+    /** 是否发送密码短信 0：发送；1：不发送；默认为0*/
+    private Integer notSendPwd;
+
     public AnXinSignEnterpriseAccountRequest() {
         super(AnXinServiceCmd.COMPANYACCOUNT);
     }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/AnXinSignEnterpriseAccountResponse.java

@@ -15,4 +15,7 @@ public class AnXinSignEnterpriseAccountResponse extends AbstractAtsResponse {
 
     /** 账号附属信息*/
     private AnXinEnterpriseTransactorModel enterpriseTransactor;
+
+    /** 是否发送密码短信 0：发送；1：不发送；默认为0*/
+    private Integer notSendPwd;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/AnXinSignPersonalAccountRequest.java

@@ -13,6 +13,9 @@ public class AnXinSignPersonalAccountRequest extends AbstractAtsRequest<AnXinSig
     /** 账号信息*/
     private AnXinPersonModel person;
 
+    /** 是否发送密码短信 0：发送；1：不发送；默认为0*/
+    private Integer notSendPwd;
+
     public AnXinSignPersonalAccountRequest() {
         super(AnXinServiceCmd.PERSONALACCOUNT);
     }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/AnXinSignPersonalAccountResponse.java

@@ -11,4 +11,7 @@ import lombok.Setter;
 public class AnXinSignPersonalAccountResponse extends AbstractAtsResponse {
     /** 账号信息*/
     private AnXinPersonModel person;
+
+    /** 是否发送密码短信 0：发送；1：不发送；默认为0*/
+    private Integer notSendPwd;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/AnXinSignSendShortsRequest.java

@@ -1,22 +1,17 @@
 package cn.com.taiji.core.model.comm.protocol.ats.anXin;
 
 import cn.com.taiji.core.model.comm.protocol.ats.AbstractAtsRequest;
-import cn.com.taiji.core.model.comm.protocol.ats.anXin.model.AnXinSendShortModel;
 import cn.com.taiji.core.model.comm.protocol.ats.anXin.model.AnXinSendShortModels;
-import cn.com.taiji.core.model.comm.protocol.ats.anXin.model.AnXinSendShortsModel;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
 /** 安心签多合同H5签署请求*/
 @Getter
 @Setter
 public class AnXinSignSendShortsRequest extends AbstractAtsRequest<AnXinSignSendShortsResponse> {
 
-    private List<AnXinSendShortModels> sendShortUrls;
+    private AnXinSendShortModels sendShortUrls;
 
     public AnXinSignSendShortsRequest() {
         super(AnXinServiceCmd.SENDSHORSTURL);

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/AnXinSignSendShortsResponse.java

@@ -13,5 +13,5 @@ import java.util.List;
 public class AnXinSignSendShortsResponse extends AbstractAtsResponse {
 
     /** 信息*/
-    private List<AnXinNoticeInfoModel> noticeInfos;
+    private AnXinNoticeInfoModel noticeInfo;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/anXin/model/AnXinSendShortModels.java

@@ -13,6 +13,7 @@ import java.util.List;
 @Getter
 public class AnXinSendShortModels extends BaseEntity {
     /** 签署信息*/
+    @NotNull(message = "签署信息不能为空")
     @Valid
     private List<AnXinSendShortsModel> anXinSendShorts;
 

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/anXin/AnXinServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.Base64;
 import java.util.Map;
 
 @Service
-public class AnXinServiceImpl extends AbstractManager implements AnXinService{
+public class AnXinServiceImpl extends AbstractManager implements AnXinService {
 
     @Override
     public InterfaceResponse post(InterfaceRequest request) throws ServiceHandleException {
@@ -42,12 +42,12 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
 
             final String txCode = request.getMethod();
             String res;
-            Map<String, Object> jsonObject = JsonTools.json2Map(req,String.class, Object.class);
+            Map<String, Object> jsonObject = JsonTools.json2Map(req, String.class, Object.class);
 
             // 判断是否有文件 走不同的请求
             String path = (String) jsonObject.get("filePath");
             if (hasText(path)) {
-                File file = getByFilePath(jsonObject.get("filePath")+"");
+                File file = getByFilePath(jsonObject.get("filePath") + "");
                 res = httpConnector.post("platId/" + Request.PLAT_ID + "/txCode/" + txCode + "/transaction", req, signature, file);
             } else {
                 res = httpConnector.post("platId/" + Request.PLAT_ID + "/txCode/" + txCode + "/transaction", req, signature);
@@ -71,20 +71,22 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
 
             // 解析业务数据
             if (resJson.containsKey("data")) {
-                interfaceResponse.setBizContent(resJson.get("data")+"");
+                interfaceResponse.setBizContent(resJson.get("data") + "");
             }
 
             // 解析错误信息
             if (resJson.containsKey("errorCode")) {
-                interfaceResponse.setErrorCode(resJson.get("errorCode")+"");
-                interfaceResponse.setErrorMessage(resJson.get("errorMessage")+"");
+                interfaceResponse.setErrorCode(resJson.get("errorCode") + "");
+            }
+            if(resJson.containsKey("errorMessage")) {
+                interfaceResponse.setErrorMessage(resJson.get("errorMessage") + "");
             }
 
             return interfaceResponse;
 
         } catch (Exception e) {
             logger.error("处理请求失败", e);
-            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("处理请求失败"+ e);
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("处理请求失败" + e);
         }
     }
 
@@ -96,16 +98,18 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
         String uri = "platId/" + Request.PLAT_ID + "/contractNo/" + contractNo + "/downloading";
         byte[] bytes = httpConnector.getFile(uri);
 
-        // 合同不存在，抛出异常
-        if (CommonUtil.isEmpty(bytes)) {
-            throw new RuntimeException("合同不存在，合同编号: " + contractNo);
-        }
         // 包装响应参数
         InterfaceResponse interfaceResponse = new InterfaceResponse();
+        // 合同不存在，抛出异常
+        if (CommonUtil.isEmpty(bytes)) {
+            interfaceResponse.setErrorCode("0");
+            interfaceResponse.setErrorMessage("合同不存在，合同编号: " + contractNo);
+        }else {
 //        // 使用 Base64 编码二进制数据，以便在文本响应中安全传输
 //        String encodedBytes = Base64.getEncoder().encodeToString(bytes);
 //        interfaceResponse.setBizContent(encodedBytes);
-        interfaceResponse.setFileBytes(bytes);
+            interfaceResponse.setFileBytes(bytes);
+        }
         return interfaceResponse;
     }
 
@@ -121,7 +125,7 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
                 outputStream.write(buffer, 0, bytesRead);
             }
 
-            logger.info("文件已成功保存到本地: {}",localFilePath);
+            logger.info("文件已成功保存到本地: {}", localFilePath);
             return new File(localFilePath);
         } catch (IOException e) {
             logger.error("文件加载失败", e);
@@ -129,7 +133,9 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
         }
     }
 
-    /** 包装请求参数*/
+    /**
+     * 包装请求参数
+     */
     private static String packParam(String req) throws ServiceHandleException {
         Map<String, Object> jsonObject = null;
         String resStr = null;
@@ -140,7 +146,7 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
             jsonObject.put("head", head);
             resStr = JsonTools.toJsonStr(jsonObject);
         } catch (IOException e) {
-            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("处理请求失败"+ e);
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("处理请求失败" + e);
         }
         return resStr;
     }
@@ -191,10 +197,10 @@ public class AnXinServiceImpl extends AbstractManager implements AnXinService{
 
         // 解析错误信息
         if (resJson.containsKey("errorCode")) {
-            interfaceResponse.setErrorCode(resJson.get("errorCode")+"");
-            interfaceResponse.setErrorMessage(resJson.get("errorMessage")+"");
+            interfaceResponse.setErrorCode(resJson.get("errorCode") + "");
+            interfaceResponse.setErrorMessage(resJson.get("errorMessage") + "");
         }
 
-        System.out.println("==>"+interfaceResponse.toJson());
+        System.out.println("==>" + interfaceResponse.toJson());
     }
 }