整合最新的代码 #90
+2
-2
@@ -101,7 +101,7 @@ public class CaseApplicationController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* 查询签名链接
|
* 查询签名链接
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
|
// @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
|
||||||
@PostMapping("/selectSignUrl")
|
@PostMapping("/selectSignUrl")
|
||||||
public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
|
public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
|
||||||
SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
|
SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
|
||||||
@@ -111,7 +111,7 @@ public class CaseApplicationController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* 查询用印链接
|
* 查询用印链接
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
|
// @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
|
||||||
@PostMapping("/selectSealUrl")
|
@PostMapping("/selectSealUrl")
|
||||||
public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
|
public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
|
||||||
SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
|
SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ public class CaseArbitrateController extends BaseController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping("/method")
|
@PutMapping("/method")
|
||||||
@PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
|
// @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
|
||||||
public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
|
public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
|
||||||
,Integer opinion){
|
,Integer opinion){
|
||||||
return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
|
return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ public class CaseLogRecordController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* 查询案件日志列表
|
* 查询案件日志列表
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('caseLog:list')")
|
// @PreAuthorize("@ss.hasPermi('caseLog:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(CaseLogRecord caseLogRecord)
|
public TableDataInfo list(CaseLogRecord caseLogRecord)
|
||||||
{
|
{
|
||||||
|
|||||||
+10
-10
@@ -364,20 +364,20 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
|
|||||||
private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
|
private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
|
||||||
List<File> fileList = new ArrayList<>();
|
List<File> fileList = new ArrayList<>();
|
||||||
File file = null;
|
File file = null;
|
||||||
// List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
|
List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
|
||||||
// if (caseAttachList != null && caseAttachList.size() > 0) {
|
if (caseAttachList != null && caseAttachList.size() > 0) {
|
||||||
// for (CaseAttach caseAttach : caseAttachList) {
|
for (CaseAttach caseAttach : caseAttachList) {
|
||||||
// if (caseAttach.getAnnexType() == 3) {
|
if (caseAttach.getAnnexType() == 3) {
|
||||||
// String annexPath = caseAttach.getAnnexPath();
|
String annexPath = caseAttach.getAnnexPath();
|
||||||
// String path = "/home/ruoyi/" + annexPath;
|
String path = "/home/ruoyi/" + annexPath;
|
||||||
// String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
|
// String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
|
||||||
String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
|
// String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
|
||||||
file = new File(path);
|
file = new File(path);
|
||||||
fileList.add(file);
|
fileList.add(file);
|
||||||
System.out.println("文件长度:" + file.length());
|
System.out.println("文件长度:" + file.length());
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
if (file != null) {
|
if (file != null) {
|
||||||
JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
|
JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
|
||||||
try {
|
try {
|
||||||
|
|||||||
+55
-23
@@ -3,8 +3,6 @@ package com.ruoyi.wisdomarbitrate.service.impl;
|
|||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
@@ -14,31 +12,26 @@ import com.ruoyi.common.annotation.DataScope;
|
|||||||
import com.ruoyi.common.constant.CaseApplicationConstants;
|
import com.ruoyi.common.constant.CaseApplicationConstants;
|
||||||
import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
|
import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
|
||||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||||
|
|
||||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||||
|
|
||||||
import com.ruoyi.common.exception.EsignDemoException;
|
import com.ruoyi.common.exception.EsignDemoException;
|
||||||
import com.ruoyi.common.exception.ServiceException;
|
import com.ruoyi.common.exception.ServiceException;
|
||||||
import com.ruoyi.common.utils.SignAward;
|
|
||||||
import com.ruoyi.common.utils.bean.SealSignRecord;
|
|
||||||
|
|
||||||
import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
|
|
||||||
import com.ruoyi.system.mapper.SysUserMapper;
|
|
||||||
import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
|
|
||||||
import com.ruoyi.common.utils.DateUtils;
|
import com.ruoyi.common.utils.DateUtils;
|
||||||
import com.ruoyi.common.utils.SmsUtils;
|
import com.ruoyi.common.utils.SmsUtils;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.common.utils.bean.BeanUtils;
|
import com.ruoyi.common.utils.bean.BeanUtils;
|
||||||
|
import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
|
||||||
import com.ruoyi.system.mapper.SysDeptMapper;
|
import com.ruoyi.system.mapper.SysDeptMapper;
|
||||||
|
import com.ruoyi.system.mapper.SysUserMapper;
|
||||||
import com.ruoyi.wisdomarbitrate.domain.*;
|
import com.ruoyi.wisdomarbitrate.domain.*;
|
||||||
import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
|
import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
|
||||||
import com.ruoyi.wisdomarbitrate.mapper.*;
|
import com.ruoyi.wisdomarbitrate.mapper.*;
|
||||||
import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
|
import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
|
||||||
|
import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
|
||||||
|
import com.ruoyi.wisdomarbitrate.utils.SignAward;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -76,7 +69,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
private static final Pattern TELEPHONE_REGX = Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
|
private static final Pattern TELEPHONE_REGX = Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CaseApplication> selectCaseApplicationList(CaseApplication caseApplication) {
|
public List<CaseApplication> selectCaseApplicationList(CaseApplication caseApplication) {
|
||||||
return caseApplicationMapper.selectCaseApplicationList(caseApplication);
|
return caseApplicationMapper.selectCaseApplicationList(caseApplication);
|
||||||
@@ -150,6 +142,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取自动编码
|
* 获取自动编码
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -302,9 +295,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
if (StrUtil.isNotEmpty(caseAffiliateselect.getName()) && deptMap.containsKey(caseAffiliateselect.getName())) {
|
if (StrUtil.isNotEmpty(caseAffiliateselect.getName()) && deptMap.containsKey(caseAffiliateselect.getName())) {
|
||||||
caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
|
caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
|
||||||
}
|
}
|
||||||
applicantName.append(caseAffiliateselect.getName()).append(",");;
|
applicantName.append(caseAffiliateselect.getName()).append(",");
|
||||||
} else if (identityType == 2) {
|
} else if (identityType == 2) {
|
||||||
respondentName.append(caseAffiliateselect.getName()).append(",");;
|
respondentName.append(caseAffiliateselect.getName()).append(",");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
caseApplicationselect.setApplicantName(applicantName.toString());
|
caseApplicationselect.setApplicantName(applicantName.toString());
|
||||||
@@ -425,6 +418,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 导入校验
|
* 导入校验
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
@@ -445,6 +439,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验被申请人代理信息
|
* 校验被申请人代理信息
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @param failureMsg
|
* @param failureMsg
|
||||||
*/
|
*/
|
||||||
@@ -474,6 +469,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验被申请人信息
|
* 校验被申请人信息
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @param failureMsg
|
* @param failureMsg
|
||||||
*/
|
*/
|
||||||
@@ -514,6 +510,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验申请人代理信息
|
* 校验申请人代理信息
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @param failureMsg
|
* @param failureMsg
|
||||||
*/
|
*/
|
||||||
@@ -543,6 +540,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验申请人主题信息
|
* 校验申请人主题信息
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @param failureMsg
|
* @param failureMsg
|
||||||
*/
|
*/
|
||||||
@@ -581,6 +579,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验基本字段
|
* 校验基本字段
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @param failureMsg
|
* @param failureMsg
|
||||||
*/
|
*/
|
||||||
@@ -890,7 +889,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
if (StrUtil.isNotEmpty(caseAffiliateselect.getName()) && deptMap.containsKey(caseAffiliateselect.getName())) {
|
if (StrUtil.isNotEmpty(caseAffiliateselect.getName()) && deptMap.containsKey(caseAffiliateselect.getName())) {
|
||||||
caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
|
caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
|
||||||
}
|
}
|
||||||
applicantName.append(caseAffiliateselect.getName()).append(",");;
|
applicantName.append(caseAffiliateselect.getName()).append(",");
|
||||||
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
caseApplicationselect.setApplicantName(applicantName.toString());
|
caseApplicationselect.setApplicantName(applicantName.toString());
|
||||||
@@ -902,6 +902,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 给被申请人发送房间号短信
|
* 给被申请人发送房间号短信
|
||||||
|
*
|
||||||
* @param messageVO
|
* @param messageVO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -926,6 +927,43 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
return "短信发送成功";
|
return "短信发送成功";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SealSignRecord selectSignUrl(CaseApplication caseApplication) throws EsignDemoException {
|
||||||
|
SealSignRecord sealSignRecord = new SealSignRecord();
|
||||||
|
sealSignRecord.setCaseAppliId(caseApplication.getId());
|
||||||
|
Gson gson = new Gson();
|
||||||
|
List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(sealSignRecord);
|
||||||
|
SealSignRecord sealSignRecordReslt = new SealSignRecord();
|
||||||
|
if (sealSignRecords != null && sealSignRecords.size() > 0) {
|
||||||
|
SealSignRecord sealSignRecordselect = sealSignRecords.get(0);
|
||||||
|
EsignHttpResponse signUrl = SignAward.signUrl(sealSignRecordselect);
|
||||||
|
JsonObject signUrlJsonObject = gson.fromJson(signUrl.getBody(), JsonObject.class);
|
||||||
|
JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
|
||||||
|
String url = signUrlData.get("url").getAsString();
|
||||||
|
sealSignRecordReslt.setSignUrl(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
return sealSignRecordReslt;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SealSignRecord selectSealUrl(CaseApplication caseApplication) throws EsignDemoException {
|
||||||
|
SealSignRecord sealSignRecord = new SealSignRecord();
|
||||||
|
sealSignRecord.setCaseAppliId(caseApplication.getId());
|
||||||
|
Gson gson = new Gson();
|
||||||
|
List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(sealSignRecord);
|
||||||
|
SealSignRecord sealSignRecordReslt = new SealSignRecord();
|
||||||
|
if (sealSignRecords != null && sealSignRecords.size() > 0) {
|
||||||
|
SealSignRecord sealSignRecordselect = sealSignRecords.get(0);
|
||||||
|
EsignHttpResponse signUrl = SignAward.usesealUrl(sealSignRecordselect);
|
||||||
|
JsonObject signUrlJsonObject = gson.fromJson(signUrl.getBody(), JsonObject.class);
|
||||||
|
JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
|
||||||
|
String url = signUrlData.get("url").getAsString();
|
||||||
|
sealSignRecordReslt.setSealUrl(url);
|
||||||
|
}
|
||||||
|
return sealSignRecordReslt;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public int pendTralSure(CaseApplication caseApplication) {
|
public int pendTralSure(CaseApplication caseApplication) {
|
||||||
@@ -1008,7 +1046,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public int pendingAppointArbotrar(CaseApplication caseApplication) {
|
public int pendingAppointArbotrar(CaseApplication caseApplication) {
|
||||||
@@ -1040,7 +1077,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew, Map<String, Long> deptMap) {
|
private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew, Map<String, Long> deptMap) {
|
||||||
// 申请人信息
|
// 申请人信息
|
||||||
CaseAffiliate caseAffiliate = new CaseAffiliate();
|
CaseAffiliate caseAffiliate = new CaseAffiliate();
|
||||||
@@ -1061,6 +1097,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置申请人的组织机构
|
* 设置申请人的组织机构
|
||||||
|
*
|
||||||
* @param caseAffiliate
|
* @param caseAffiliate
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
*/
|
*/
|
||||||
@@ -1068,7 +1105,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
private void setApplicantOrganization(CaseAffiliate caseAffiliate, CaseApplication caseApplication, Map<String, Long> deptMap) {
|
private void setApplicantOrganization(CaseAffiliate caseAffiliate, CaseApplication caseApplication, Map<String, Long> deptMap) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 将组织机构id设为申请人名称
|
// 将组织机构id设为申请人名称
|
||||||
if (deptMap.containsKey(caseApplication.getName())) {
|
if (deptMap.containsKey(caseApplication.getName())) {
|
||||||
caseAffiliate.setName(String.valueOf(deptMap.get(caseApplication.getName())));
|
caseAffiliate.setName(String.valueOf(deptMap.get(caseApplication.getName())));
|
||||||
@@ -1093,6 +1129,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 组装被申请人信息
|
* 组装被申请人信息
|
||||||
|
*
|
||||||
* @param caseApplication
|
* @param caseApplication
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -1134,7 +1171,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
Gson gson = new Gson();
|
Gson gson = new Gson();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SealSignRecord sealSignRecord = new SealSignRecord();
|
SealSignRecord sealSignRecord = new SealSignRecord();
|
||||||
sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
|
sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
|
||||||
EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
|
EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
|
||||||
@@ -1186,8 +1222,4 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user