|
@@ -1,17 +1,12 @@
|
|
package com.dgtly.wxportal.controller;
|
|
package com.dgtly.wxportal.controller;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.dgtly.common.annotation.ApiPassToken;
|
|
import com.dgtly.common.annotation.ApiPassToken;
|
|
-import com.dgtly.common.config.Global;
|
|
|
|
import com.dgtly.common.config.ServerConfig;
|
|
import com.dgtly.common.config.ServerConfig;
|
|
-import com.dgtly.common.constant.Constants;
|
|
|
|
import com.dgtly.common.core.controller.ApiBaseController;
|
|
import com.dgtly.common.core.controller.ApiBaseController;
|
|
import com.dgtly.common.core.domain.AjaxResult;
|
|
import com.dgtly.common.core.domain.AjaxResult;
|
|
import com.dgtly.common.core.domain.ParameterObject;
|
|
import com.dgtly.common.core.domain.ParameterObject;
|
|
-import com.dgtly.system.domain.AssRelcustomerinfo;
|
|
|
|
import com.dgtly.system.domain.CustomersExt;
|
|
import com.dgtly.system.domain.CustomersExt;
|
|
import com.dgtly.system.domain.SysUser;
|
|
import com.dgtly.system.domain.SysUser;
|
|
-import com.dgtly.system.domain.SysUserExt;
|
|
|
|
import com.dgtly.system.service.IAssRelcustomerinfoService;
|
|
import com.dgtly.system.service.IAssRelcustomerinfoService;
|
|
import com.dgtly.system.service.ICustomersExtService;
|
|
import com.dgtly.system.service.ICustomersExtService;
|
|
import com.dgtly.system.service.ISysUserExtService;
|
|
import com.dgtly.system.service.ISysUserExtService;
|
|
@@ -20,16 +15,12 @@ import com.dgtly.wxportal.config.ESignConfig;
|
|
import com.dgtly.wxportal.domain.ESignUpPDFModal;
|
|
import com.dgtly.wxportal.domain.ESignUpPDFModal;
|
|
import com.dgtly.wxportal.domain.OrderFile;
|
|
import com.dgtly.wxportal.domain.OrderFile;
|
|
import com.dgtly.wxportal.service.*;
|
|
import com.dgtly.wxportal.service.*;
|
|
-import com.dgtly.wxportal.utils.ESign.ESignUrl;
|
|
|
|
-import com.dgtly.wxportal.utils.file.fileDownloadUtil;
|
|
|
|
-import com.sun.org.apache.xpath.internal.operations.Bool;
|
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
-import org.apache.tomcat.util.digester.ArrayStack;
|
|
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.scheduling.annotation.Async;
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
@@ -37,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
-import java.util.List;
|
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -49,6 +39,7 @@ import java.util.Map;
|
|
@RequestMapping("eSign")
|
|
@RequestMapping("eSign")
|
|
@RestController
|
|
@RestController
|
|
@ApiPassToken
|
|
@ApiPassToken
|
|
|
|
+@Slf4j
|
|
public class EsignController extends ApiBaseController {
|
|
public class EsignController extends ApiBaseController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -374,7 +365,7 @@ public class EsignController extends ApiBaseController {
|
|
}else {//没有注册
|
|
}else {//没有注册
|
|
/*首先根据user.getLoginName()查询E签宝是否存在此账户*/
|
|
/*首先根据user.getLoginName()查询E签宝是否存在此账户*/
|
|
String accountId = eSignService.getAccountIdByThirdId(user.getLoginName());
|
|
String accountId = eSignService.getAccountIdByThirdId(user.getLoginName());
|
|
- System.out.println("查询E签宝accountId:"+accountId);
|
|
|
|
|
|
+ log.info("查询E签宝accountId:"+accountId);
|
|
SysUser euser = new SysUser();
|
|
SysUser euser = new SysUser();
|
|
if( accountId != null ){
|
|
if( accountId != null ){
|
|
/*保存已注册信息*/
|
|
/*保存已注册信息*/
|
|
@@ -483,7 +474,7 @@ public class EsignController extends ApiBaseController {
|
|
}else {//未注册
|
|
}else {//未注册
|
|
/*首先根据customersExt.getChainsCode()查询E签宝是否存在此账户*/
|
|
/*首先根据customersExt.getChainsCode()查询E签宝是否存在此账户*/
|
|
String orgId = eSignService.getOrgIdByThirdId(customersExt.getChainsCode());
|
|
String orgId = eSignService.getOrgIdByThirdId(customersExt.getChainsCode());
|
|
- System.out.println("查询E签宝orgId:"+orgId);
|
|
|
|
|
|
+ log.info("查询E签宝orgId:"+orgId);
|
|
CustomersExt ecustomersExt=null;
|
|
CustomersExt ecustomersExt=null;
|
|
if(orgId!=null){
|
|
if(orgId!=null){
|
|
ecustomersExt = customersExtService.selectCustomersExtById(user.getSysUserExt().getOrgCode());
|
|
ecustomersExt = customersExtService.selectCustomersExtById(user.getSysUserExt().getOrgCode());
|