取消部门接口权限校验
This commit is contained in:
gy b
+43
-4
@@ -299,7 +299,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
|
||||
caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
|
||||
caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
// 新增日志
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.ARBITRATED_SEAL,"");
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATED_SEAL, "");
|
||||
|
||||
return AjaxResult.success("签名成功,案件状态已改为待仲裁文书用印");
|
||||
}
|
||||
@@ -310,7 +310,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
|
||||
caseApplication.setCaseStatus(CaseApplicationConstants.CASE_ARCHIVED);
|
||||
caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
// 新增日志
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_ARCHIVED,"");
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_ARCHIVED, "");
|
||||
|
||||
return AjaxResult.success("归档成功,案件状态已改为已归档");
|
||||
}
|
||||
@@ -343,19 +343,58 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
|
||||
}
|
||||
}
|
||||
}
|
||||
//发送邮件
|
||||
sendCaseEmail(caseApplication1, appEmail, resEmail);
|
||||
// 新增日志
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_FILING,"");
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_FILING, "");
|
||||
|
||||
return AjaxResult.success("仲裁文书送达成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过邮件发送裁决书文件
|
||||
*
|
||||
* @param caseApplication1
|
||||
* @param appEmail
|
||||
* @param resEmail
|
||||
*/
|
||||
private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
|
||||
List<File> fileList = new ArrayList<>();
|
||||
File file = null;
|
||||
// List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
|
||||
// if (caseAttachList != null && caseAttachList.size() > 0) {
|
||||
// for (CaseAttach caseAttach : caseAttachList) {
|
||||
// if (caseAttach.getAnnexType() == 3) {
|
||||
// String annexPath = caseAttach.getAnnexPath();
|
||||
// String path = "/home/ruoyi/" + annexPath;
|
||||
// String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
|
||||
String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
|
||||
file = new File(path);
|
||||
fileList.add(file);
|
||||
System.out.println("文件长度:" + file.length());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
if (file != null) {
|
||||
JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
|
||||
try {
|
||||
// emailOutUtil.sendMessageCarryFile(appEmail, "裁决书", "您好，审核后的裁决书在附件中请查阅", file, "hjbjava@163.com", javaMailSender);
|
||||
emailOutUtil.sendMessageCarryFiles(appEmail, "裁决书", "您好，审核后的裁决书在附件中请查阅", fileList, "lmj1549843951@163.com", javaMailSender);
|
||||
} catch (Exception e) {
|
||||
System.out.println("邮件发送失败++++++++++++++++++++++++++++++++");
|
||||
System.out.println(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult stamp(CaseApplication caseApplication) {
|
||||
//更改案件状态(暂时)
|
||||
caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
|
||||
caseApplicationMapper.submitCaseApplication(caseApplication);
|
||||
// 新增日志
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.ARBITRATION_DELIVERY,"");
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATION_DELIVERY, "");
|
||||
|
||||
return AjaxResult.success("用印成功,案件状态已改为待仲裁文书送达");
|
||||
}
|
||||
|
||||
+115
-114
@@ -716,120 +716,121 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
|
||||
Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
|
||||
if(agreeOrNotCheck.intValue()==1){//同意审核
|
||||
try {
|
||||
//获取当前案件的裁决书
|
||||
CaseApplication caseApplication2 = caseApplicationService.selectCaseApplication(caseApplication);
|
||||
List<CaseAttach> caseAttachList = caseApplication2.getCaseAttachList();
|
||||
if (caseAttachList != null && caseAttachList.size() > 0) {
|
||||
for (CaseAttach caseAttach : caseAttachList) {
|
||||
if (caseAttach.getAnnexType() == 3) {
|
||||
String annexPath = caseAttach.getAnnexPath();
|
||||
//String path = "/home/ruoyi/" + annexPath;
|
||||
String path ="D:\\home\\仲裁裁决书模板.docx";
|
||||
//获取文件上传地址
|
||||
EsignHttpResponse response = SaaSAPIFileUtils.getUploadUrl(path);
|
||||
String body = response.getBody();
|
||||
if (body != null){
|
||||
JSONObject jsonObject = JSONObject.parseObject(body);
|
||||
String fileId = jsonObject.getJSONObject("data").getString("fileId");
|
||||
String fileUploadUrl = jsonObject.getJSONObject("data").getString("fileUploadUrl");
|
||||
//上传文件流
|
||||
EsignHttpResponse response1 = SaaSAPIFileUtils.uploadFile(fileUploadUrl, path);
|
||||
JSONObject jsonObject1 = JSONObject.parseObject(response1.getBody());
|
||||
if (jsonObject1.getIntValue("errCode")==0){
|
||||
//查看文件上传状态
|
||||
Thread.sleep(5000);
|
||||
EsignHttpResponse response2 = SaaSAPIFileUtils.getFileStatus(fileId);
|
||||
JSONObject jsonObject2 = JSONObject.parseObject(response2.getBody());
|
||||
JSONObject data = jsonObject2.getJSONObject("data");
|
||||
int fileStatus =data.getIntValue("fileStatus");
|
||||
if (fileStatus == 2 || fileStatus == 5){
|
||||
String fileName = data.getString("fileName");
|
||||
//上传成功,获取文件签名印章位置
|
||||
SealSignRecord sealSignRecord = new SealSignRecord();
|
||||
sealSignRecord.setFileid(fileId);
|
||||
EsignHttpResponse positions = SignAward.getPositions(sealSignRecord);
|
||||
Gson gson = new Gson();
|
||||
JsonObject positionsJsonObject = gson.fromJson(positions.getBody(), JsonObject.class);
|
||||
JsonObject positionsData = positionsJsonObject.getAsJsonObject("data");
|
||||
String keywordPositions = positionsData.get("keywordPositions").getAsString();
|
||||
//发起签署
|
||||
sealSignRecord.setFilename(fileName);
|
||||
String arbitratorId = caseApplication2.getArbitratorId();
|
||||
if (arbitratorId!=null){
|
||||
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(arbitratorId));
|
||||
if (sysUser == null){
|
||||
return rows;
|
||||
}
|
||||
sealSignRecord.setPensonAccount(sysUser.getPhonenumber());
|
||||
sealSignRecord.setPensonName(sysUser.getNickName());
|
||||
}
|
||||
sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
|
||||
sealSignRecord.setOrgnizeNamePsnAccount("秦桃则");
|
||||
sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
|
||||
sealSignRecord.setOrgnizeNamePsnAccount("17691338406");
|
||||
sealSignRecord.setOrgnizeNamepsnName("韩超勃");
|
||||
//解析文件签名印章位置
|
||||
JSONArray jsonArray = JSONArray.parseArray(keywordPositions);
|
||||
for (int i = 0; i < jsonArray.size(); i++) {
|
||||
JSONObject jsonObject3 = jsonArray.getJSONObject(i);
|
||||
String keyword = jsonObject3.getString("keyword");
|
||||
if (keyword.equals("仲裁员")){
|
||||
//签名
|
||||
JSONArray positionsArray = jsonObject3.getJSONArray("positions");
|
||||
// 遍历 positionsArray 中的每个元素
|
||||
for (int j = 0; j < positionsArray.size(); j++){
|
||||
JSONObject positionObj = positionsArray.getJSONObject(j);
|
||||
int pageNum = positionObj.getIntValue("pageNum");
|
||||
sealSignRecord.setPositionPagepsn(String.valueOf(pageNum));
|
||||
JSONArray coordinatesArray = positionObj.getJSONArray("coordinates");
|
||||
JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
|
||||
double positionX = coordinateObj.getDoubleValue("positionX");
|
||||
double positionY = coordinateObj.getDoubleValue("positionY");
|
||||
sealSignRecord.setPositionXpsn(positionX);
|
||||
sealSignRecord.setPositionYpsn(positionY);
|
||||
}
|
||||
}else {
|
||||
//用印
|
||||
JSONArray positionsArray = jsonObject3.getJSONArray("positions");
|
||||
// 遍历 positionsArray 中的每个元素
|
||||
for (int j = 0; j < positionsArray.size(); j++) {
|
||||
JSONObject positionObj = positionsArray.getJSONObject(j);
|
||||
int pageNum = positionObj.getIntValue("pageNum");
|
||||
sealSignRecord.setPositionPageorg(String.valueOf(pageNum));
|
||||
JSONArray coordinatesArray = positionObj.getJSONArray("coordinates");
|
||||
JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
|
||||
double positionX = coordinateObj.getDoubleValue("positionX");
|
||||
double positionY = coordinateObj.getDoubleValue("positionY");
|
||||
sealSignRecord.setPositionXorg(positionX);
|
||||
sealSignRecord.setPositionYorg(positionY);
|
||||
}
|
||||
}
|
||||
}
|
||||
EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord);
|
||||
JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
|
||||
if (jsonObject1.getIntValue("code")==0){
|
||||
//获取签署流程ID
|
||||
JSONObject data1 = jsonObject3.getJSONObject("data");
|
||||
String signFlowId = data1.getString("signFlowId");
|
||||
//保存案件id,文件id,文件名称.流程id到签署用印记录表里
|
||||
sealSignRecord.setCaseAppliId(caseApplication.getId());
|
||||
sealSignRecord.setSignFlowid(signFlowId);
|
||||
sealSignRecord.setSignFlowStatus(1);//待签名
|
||||
sealSignRecordMapper.insertSealSignRecord(sealSignRecord);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (EsignDemoException e) {
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
//TODO 取消一下注释
|
||||
// try {
|
||||
// //获取当前案件的裁决书
|
||||
// CaseApplication caseApplication2 = caseApplicationService.selectCaseApplication(caseApplication);
|
||||
// List<CaseAttach> caseAttachList = caseApplication2.getCaseAttachList();
|
||||
// if (caseAttachList != null && caseAttachList.size() > 0) {
|
||||
// for (CaseAttach caseAttach : caseAttachList) {
|
||||
// if (caseAttach.getAnnexType() == 3) {
|
||||
// String annexPath = caseAttach.getAnnexPath();
|
||||
// String path = "/home/ruoyi/" + annexPath;
|
||||
//// String path ="D:\\home\\仲裁裁决书模板.docx";
|
||||
// //获取文件上传地址
|
||||
// EsignHttpResponse response = SaaSAPIFileUtils.getUploadUrl(path);
|
||||
// String body = response.getBody();
|
||||
// if (body != null){
|
||||
// JSONObject jsonObject = JSONObject.parseObject(body);
|
||||
// String fileId = jsonObject.getJSONObject("data").getString("fileId");
|
||||
// String fileUploadUrl = jsonObject.getJSONObject("data").getString("fileUploadUrl");
|
||||
// //上传文件流
|
||||
// EsignHttpResponse response1 = SaaSAPIFileUtils.uploadFile(fileUploadUrl, path);
|
||||
// JSONObject jsonObject1 = JSONObject.parseObject(response1.getBody());
|
||||
// if (jsonObject1.getIntValue("errCode")==0){
|
||||
// //查看文件上传状态
|
||||
// Thread.sleep(5000);
|
||||
// EsignHttpResponse response2 = SaaSAPIFileUtils.getFileStatus(fileId);
|
||||
// JSONObject jsonObject2 = JSONObject.parseObject(response2.getBody());
|
||||
// JSONObject data = jsonObject2.getJSONObject("data");
|
||||
// int fileStatus =data.getIntValue("fileStatus");
|
||||
// if (fileStatus == 2 || fileStatus == 5){
|
||||
// String fileName = data.getString("fileName");
|
||||
// //上传成功,获取文件签名印章位置
|
||||
// SealSignRecord sealSignRecord = new SealSignRecord();
|
||||
// sealSignRecord.setFileid(fileId);
|
||||
// EsignHttpResponse positions = SignAward.getPositions(sealSignRecord);
|
||||
// Gson gson = new Gson();
|
||||
// JsonObject positionsJsonObject = gson.fromJson(positions.getBody(), JsonObject.class);
|
||||
// JsonObject positionsData = positionsJsonObject.getAsJsonObject("data");
|
||||
// String keywordPositions = positionsData.get("keywordPositions").getAsString();
|
||||
// //发起签署
|
||||
// sealSignRecord.setFilename(fileName);
|
||||
// String arbitratorId = caseApplication2.getArbitratorId();
|
||||
// if (arbitratorId!=null){
|
||||
// SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(arbitratorId));
|
||||
// if (sysUser == null){
|
||||
// return rows;
|
||||
// }
|
||||
// sealSignRecord.setPensonAccount(sysUser.getPhonenumber());
|
||||
// sealSignRecord.setPensonName(sysUser.getNickName());
|
||||
// }
|
||||
// sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
|
||||
// sealSignRecord.setOrgnizeNamePsnAccount("秦桃则");
|
||||
// sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
|
||||
// sealSignRecord.setOrgnizeNamePsnAccount("17691338406");
|
||||
// sealSignRecord.setOrgnizeNamepsnName("韩超勃");
|
||||
// //解析文件签名印章位置
|
||||
// JSONArray jsonArray = JSONArray.parseArray(keywordPositions);
|
||||
// for (int i = 0; i < jsonArray.size(); i++) {
|
||||
// JSONObject jsonObject3 = jsonArray.getJSONObject(i);
|
||||
// String keyword = jsonObject3.getString("keyword");
|
||||
// if (keyword.equals("仲裁员")){
|
||||
// //签名
|
||||
// JSONArray positionsArray = jsonObject3.getJSONArray("positions");
|
||||
// // 遍历 positionsArray 中的每个元素
|
||||
// for (int j = 0; j < positionsArray.size(); j++){
|
||||
// JSONObject positionObj = positionsArray.getJSONObject(j);
|
||||
// int pageNum = positionObj.getIntValue("pageNum");
|
||||
// sealSignRecord.setPositionPagepsn(String.valueOf(pageNum));
|
||||
// JSONArray coordinatesArray = positionObj.getJSONArray("coordinates");
|
||||
// JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
|
||||
// double positionX = coordinateObj.getDoubleValue("positionX");
|
||||
// double positionY = coordinateObj.getDoubleValue("positionY");
|
||||
// sealSignRecord.setPositionXpsn(positionX);
|
||||
// sealSignRecord.setPositionYpsn(positionY);
|
||||
// }
|
||||
// }else {
|
||||
// //用印
|
||||
// JSONArray positionsArray = jsonObject3.getJSONArray("positions");
|
||||
// // 遍历 positionsArray 中的每个元素
|
||||
// for (int j = 0; j < positionsArray.size(); j++) {
|
||||
// JSONObject positionObj = positionsArray.getJSONObject(j);
|
||||
// int pageNum = positionObj.getIntValue("pageNum");
|
||||
// sealSignRecord.setPositionPageorg(String.valueOf(pageNum));
|
||||
// JSONArray coordinatesArray = positionObj.getJSONArray("coordinates");
|
||||
// JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
|
||||
// double positionX = coordinateObj.getDoubleValue("positionX");
|
||||
// double positionY = coordinateObj.getDoubleValue("positionY");
|
||||
// sealSignRecord.setPositionXorg(positionX);
|
||||
// sealSignRecord.setPositionYorg(positionY);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord);
|
||||
// JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
|
||||
// if (jsonObject1.getIntValue("code")==0){
|
||||
// //获取签署流程ID
|
||||
// JSONObject data1 = jsonObject3.getJSONObject("data");
|
||||
// String signFlowId = data1.getString("signFlowId");
|
||||
// //保存案件id,文件id,文件名称.流程id到签署用印记录表里
|
||||
// sealSignRecord.setCaseAppliId(caseApplication.getId());
|
||||
// sealSignRecord.setSignFlowid(signFlowId);
|
||||
// sealSignRecord.setSignFlowStatus(1);//待签名
|
||||
// sealSignRecordMapper.insertSealSignRecord(sealSignRecord);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (EsignDemoException e) {
|
||||
// e.printStackTrace();
|
||||
// } catch (InterruptedException e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
caseApplication.setCaseStatus(CaseApplicationConstants.SIGN_ARBITRATION);
|
||||
// 新增日志
|
||||
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.SIGN_ARBITRATION,"");
|
||||
|
||||
Reference in New Issue
Block a user