合同模板调试

ruoyi-api/src/main/java/com/ruoyi/api/controller/common/CommonController.java

@@ -32,6 +32,7 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.util.Base64;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 公共管理
@@ -81,7 +82,9 @@ public class CommonController extends AbstractApiController {
     })
     @RepeatSubmit()
     @PostMapping("/uploadBase")
-    public R<SysOss> uploadBase(@RequestParam("image") String image, @RequestParam("fileName") String fileName) {
+    public R<SysOss> uploadBase(@RequestBody Map<String, String> params) {
+        String image = params.get("image");
+        String fileName = params.get("fileName");
         if (StringUtils.isEmpty(image)) {
             throw new ServiceException("图片数据不能为空");
         }

ruoyi-business/src/main/java/com/ruoyi/agent/domain/bo/AgentApplyBo.java

@@ -173,6 +173,7 @@ public class AgentApplyBo extends BaseEntity {
     /**
      * 手写签名
      */
+    @FilePathValue
     @ApiModelProperty(value = "手写签名", required = true)
     @NotBlank(message = "手写签名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String signImage;

ruoyi-business/src/main/java/com/ruoyi/agent/domain/bo/AgentBo.java

@@ -176,6 +176,7 @@ public class AgentBo extends BaseEntity {
     /**
      * 手写签名
      */
+    @FilePathValue
     private String signImage;
 
     private BillType billType;

ruoyi-business/src/main/java/com/ruoyi/agent/domain/vo/AgentApplyVo.java

@@ -182,6 +182,7 @@ public class AgentApplyVo {
     /**
      * 手写签名
      */
+    @FilePathValue
     @ExcelProperty(value = "手写签名")
     @ApiModelProperty("手写签名")
     private String signImage;

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -207,6 +207,10 @@ public class AgentServiceImpl implements IAgentService {
         eReq.setIdentityCard(platformInfoVo.getUscCode());//统一社会信用代码
         eReq.setEmail(platformInfoVo.getEmail()); //在君子签注册认证的邮箱
         eReq.setSearchKey("甲方（盖章）");//关键字定位签字位置
+        JSONObject epReqExtend = new JSONObject();
+        epReqExtend.set("fixX", 20);
+        epReqExtend.set("fixY", -100);
+        eReq.setSearchConvertExtend(epReqExtend.toString());
         eReq.setSignLevel(0);
         eReq.setNoNeedVerify(1);
         eReq.setServerCaAuto(1);//当前签约方自动签署
@@ -224,6 +228,10 @@ public class AgentServiceImpl implements IAgentService {
         } else {
             sReq.setSearchKey("乙方（盖章或签字）");//关键字定位签字位置
         }
+        JSONObject sReqExtend = new JSONObject();
+        sReqExtend.set("fixX", -20);
+        sReqExtend.set("fixY", -120);
+        sReq.setSearchConvertExtend(sReqExtend.toString());
         sReq.setNoNeedVerify(1); //取消签约前短信校验
         sReq.setServerCaAuto(1);//是否使用自动签署完成，0或null不使用，1自动(当且只当合同处理方式为部份自动或收集批量签时有效)
         sReq.setSignLevel(1);//签字类型，标准图形章或公章:0标准图形章,1公章或手写,2公章手写或手写,3个人方形标准章（用户类型是个人且姓名2-4个字符生效，其他情况默认使用系统标准图形章）
@@ -256,6 +264,10 @@ public class AgentServiceImpl implements IAgentService {
             spReq.setIdentityCard(parentAgent.getIdCard());//身份证号
             spReq.setMobile(parentAgent.getPhone()); //手机号
             spReq.setSearchKey("乙方（签名）");//关键字定位签字位置
+            JSONObject spReqExtend = new JSONObject();
+            spReqExtend.set("fixX", -20);
+            spReqExtend.set("fixY", -20);
+            spReq.setSearchConvertExtend(spReqExtend.toString());
             spReq.setNoNeedVerify(1); //取消签约前短信校验
             spReq.setServerCaAuto(1);//是否使用自动签署完成，0或null不使用，1自动(当且只当合同处理方式为部份自动或收集批量签时有效)
             spReq.setSignLevel(1);//签字类型，标准图形章或公章:0标准图形章,1公章或手写,2公章手写或手写,3个人方形标准章（用户类型是个人且姓名2-4个字符生效，其他情况默认使用系统标准图形章）
@@ -266,7 +278,6 @@ public class AgentServiceImpl implements IAgentService {
             templateParams.set("phone", agent.getPhone());
         }
         Date date = new Date();
-        templateParams.set("signDate", DateUtils.parseDateToStr("yyyy年MM月dd日", date));
         templateParams.set("signExpireDate", DateUtils.parseDateToStr("yyyy年MM月dd日", DateUtils.addYears(date, 1)));
         //构建请求参数
         Map<String, Object> params = new HashMap<>();

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessApplyBo.java

@@ -327,6 +327,7 @@ public class BusinessApplyBo extends BaseEntity {
     /**
      * 签名
      */
+    @FilePathValue
     @ApiModelProperty(value = "签名", required = true)
     @NotBlank(message = "签名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String signImage;

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessBo.java

@@ -375,6 +375,7 @@ public class BusinessBo extends BaseEntity {
     @ApiModelProperty(value = "余额")
     private BigDecimal balance;
 
+    @FilePathValue
     @ApiModelProperty(value = "手写签名")
     private String signImage;
 

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessApplyVo.java

@@ -350,6 +350,7 @@ public class BusinessApplyVo {
     /**
      * 签名
      */
+    @FilePathValue
     @ApiModelProperty(value = "签名", required = true)
     private String signImage;
 }

ruoyi-tool/src/main/java/com/ruoyi/tool/service/JzqService.java

@@ -36,26 +36,10 @@ public class JzqService {
         //构建请求参数
         Map<String, Object> params = new HashMap<>();
         params.put("identityCard", identityCard);
-        // 解码Base64
-        String base64Data = signImgFile.split(",", 2)[1];
-        byte[] imageBytes = Base64.getDecoder().decode(base64Data);
-        Path tempFile = null;
-        try {
-            tempFile = Files.createTempFile("sign", ".png");
-            Files.write(tempFile, imageBytes);
-            params.put("signImgFile", new FileBody(tempFile.toFile()));
-            ResultInfo<Void> ri = requestUtils.doPost(jzqProperties.getUploadPersSign(), params);
-            log.info("上传个人自定义印章图片：{}", ri.isSuccess());
-            return ri.isSuccess();
-        } catch (Exception e) {
-            //不处理
-        } finally {
-            // 使用后删除临时文件（重要！）
-            if (tempFile != null) {
-                tempFile.toFile().deleteOnExit();
-            }
-        }
-        return false;
+        params.put("signImgFile", filePathSplicingUtil.getPrefix() + signImgFile);
+        ResultInfo<Void> ri = requestUtils.doPost(jzqProperties.getUploadPersSign(), params);
+        log.info("上传个人自定义印章图片：{}", ri.getMsg());
+        return ri.isSuccess();
     }
 
     /**
@@ -70,7 +54,7 @@ public class JzqService {
         params.put("idenFront", filePathSplicingUtil.getPrefix() + idenFront);
         params.put("idenReverse", filePathSplicingUtil.getPrefix() + idenReverse);
         ResultInfo<String> ri = requestUtils.doPost(jzqProperties.getCloudCertiPerInfo(), params);
-        log.info("个人证书申请资料上传：{}", ri.isSuccess());
+        log.info("个人证书申请资料上传：{}", ri.getMsg());
         return ri.isSuccess();
     }