|
|
@@ -31,6 +31,8 @@ import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.pdfbox.pdmodel.PDDocument;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.springblade.business.entity.ArchiveFile;
|
|
|
+import org.springblade.business.entity.Task;
|
|
|
import org.springblade.business.feign.TaskClient;
|
|
|
import org.springblade.business.vo.TaskApprovalVO;
|
|
|
import org.springblade.common.constant.CommonConstant;
|
|
|
@@ -39,13 +41,14 @@ import org.springblade.common.utils.CommonUtil;
|
|
|
import org.springblade.common.utils.SnowFlakeUtil;
|
|
|
import org.springblade.core.oss.model.BladeFile;
|
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
|
+import org.springblade.core.secure.utils.SecureUtil;
|
|
|
+import org.springblade.core.tool.utils.DateUtil;
|
|
|
import org.springblade.core.tool.utils.FileUtil;
|
|
|
+import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
import org.springblade.evisa.redissionUtil.DistributedRedisLock;
|
|
|
import org.springblade.evisa.service.EVisaService;
|
|
|
-import org.springblade.evisa.vo.EVisaMakeSealVO;
|
|
|
-import org.springblade.evisa.vo.EVisaTaskApprovalVO;
|
|
|
-import org.springblade.evisa.vo.SealPdfVO;
|
|
|
-import org.springblade.evisa.vo.SealStrategyVO;
|
|
|
+import org.springblade.evisa.utils.PDFUtils;
|
|
|
+import org.springblade.evisa.vo.*;
|
|
|
import org.springblade.manager.entity.ContractInfo;
|
|
|
import org.springblade.manager.entity.SignPfxFile;
|
|
|
import org.springblade.manager.feign.ContractClient;
|
|
|
@@ -57,6 +60,8 @@ import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
|
|
|
import org.springframework.http.converter.HttpMessageConverter;
|
|
|
import org.springframework.http.converter.StringHttpMessageConverter;
|
|
|
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
+import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.mock.web.MockMultipartFile;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
@@ -70,10 +75,7 @@ import javax.imageio.stream.ImageOutputStream;
|
|
|
import java.awt.image.BufferedImage;
|
|
|
import java.io.*;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.Iterator;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
@AllArgsConstructor
|
|
|
@@ -400,22 +402,6 @@ public class EVisaServiceImpl implements EVisaService {
|
|
|
return NOT_PFX_OR_FILE;
|
|
|
}
|
|
|
|
|
|
- /*//获取任务对应表格的电签配置
|
|
|
- List<JSONObject> eVisaConfigList = this.taskClient.queryBusinessTableEVisaConfig(task.getParallelProcessInstanceId(), task.getUserId(), "false");
|
|
|
- if (eVisaConfigList == null || eVisaConfigList.size() == 0) {
|
|
|
- //没有电签配置，默认当前任务为不签字审批，返回成功
|
|
|
- RedisTemplate.delete("sign-" + task.getFormDataId());
|
|
|
- return SUCCESS + "@@@@" + taskFile.getApprovalFileList().get(0).getFileUrl();
|
|
|
- }
|
|
|
-
|
|
|
- //获取当前用户的证书信息
|
|
|
- List<SignPfxFile> userPfxList = this.signPfxClient.querySignPfxByUserIdOrContractId(task.getUserId().toString(), "");
|
|
|
- if (userPfxList == null || userPfxList.size() <= 0) {
|
|
|
- //没有签章，不执行电签
|
|
|
- RedisTemplate.delete("sign-" + task.getFormDataId());
|
|
|
- return NOT_PFX_OR_FILE;
|
|
|
- }*/
|
|
|
-
|
|
|
//上锁
|
|
|
//if (DistributedRedisLock.acquire(task.getUserId().toString(), batch)) {
|
|
|
try {
|
liuyc