SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #234.
This commit is contained in:
hejinbo
2023-11-23 20:17:32 +08:00
committed by Gitea
parent d52cb55443 20d8d2e045
commit 4d93997f53
5 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java
+29 -26
View File
@@ -102,25 +102,28 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
} }
List<DeptIdentify> deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify); List<DeptIdentify> deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify);
DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0); DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0);
Integer isUse = deptIdentifyselect.getIsUse(); Integer identifyStatus = deptIdentifyselect.getIdentifyStatus();
if (isUse == 0) { //机构为未启用状态 if (identifyStatus != 1) {
Integer identifyStatus = deptIdentifyselect.getIdentifyStatus(); return AjaxResult.error("这个认证数据未进行认证，不能启用");
if (identifyStatus == 0) {
return AjaxResult.error("这个认证数据未进行认证，不能启用");
} else {
deptIdentifyselect.setIsUse(1);
int i = deptIdentifyMapper.updateDeptIdentify(deptIdentifyselect);
if (i > 0) {
return AjaxResult.success("启用成功");
}
}
} else { //机构为已启用状态
deptIdentifyselect.setIsUse(0);
int i = deptIdentifyMapper.updateDeptIdentify(deptIdentifyselect);
if (i > 0) {
return AjaxResult.success();
}
} }
deptIdentifyselect.setIsUse(1);
int i = deptIdentifyMapper.updateDeptIdentify(deptIdentifyselect);
if (i > 0) {
//把其他认证数据置为未使用
DeptIdentify deptIdentify2 = new DeptIdentify();
deptIdentify2.setIsUse(1);
List<DeptIdentify> deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify2);
for (DeptIdentify deptIdentify3 : deptIdentifies) {
if (deptIdentify3.equals(deptIdentifyselect)) {
continue;
}
deptIdentify3.setIsUse(0);
deptIdentifyMapper.updateDeptIdentify(deptIdentify3);
}
return AjaxResult.success("启用成功");
}
return AjaxResult.error(); return AjaxResult.error();
} }
@@ -412,7 +415,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
templateManage.setTemOrigPath(annexPath); templateManage.setTemOrigPath(annexPath);
String format = getFileExtension(fileName); String format = getFileExtension(fileName);
templateManage.setTemFormat(format); templateManage.setTemFormat(format);
String subFileName = fileName.substring(fileName.lastIndexOf("/")+1); String subFileName = fileName.substring(fileName.lastIndexOf("/") + 1);
templateManage.setFileName(subFileName); templateManage.setFileName(subFileName);
templateManage.setCreateBy(getUsername()); templateManage.setCreateBy(getUsername());
int i = templateManageMapper.insertTemplateManage(templateManage); int i = templateManageMapper.insertTemplateManage(templateManage);
@@ -441,7 +444,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
startIndex += prefix.length(); startIndex += prefix.length();
String annexPath = "uploadPath" + fileName.substring(startIndex); String annexPath = "uploadPath" + fileName.substring(startIndex);
templateManage.setTemOrigPath(annexPath); templateManage.setTemOrigPath(annexPath);
String subFileName = fileName.substring(fileName.lastIndexOf("/")+1); String subFileName = fileName.substring(fileName.lastIndexOf("/") + 1);
templateManage.setFileName(subFileName); templateManage.setFileName(subFileName);
String format = getFileExtension(fileName); String format = getFileExtension(fileName);
templateManage.setTemFormat(format); templateManage.setTemFormat(format);
@@ -491,14 +494,14 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
} }
@Override @Override
public List<SysUser> selectPostUserByDeptId(DeptIdentify deptIdentify) { public List<SysUser> selectPostUserByDeptId(DeptIdentify deptIdentify) {
List<DeptIdentify> deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); List<DeptIdentify> deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify);
if (deptIdentifies!= null && deptIdentifies.size() > 0) { if (deptIdentifies != null && deptIdentifies.size() > 0) {
deptIdentify = deptIdentifies.get(0); deptIdentify = deptIdentifies.get(0);
if (deptIdentify.getDeptId()!= null) { if (deptIdentify.getDeptId() != null) {
//默认查询经办人的 //默认查询经办人的
Long roleId = 106L; Long roleId = 106L;
List<SysUser> sysUserList = sysUserMapper.selectRoleUserByDeptId(deptIdentify.getDeptId(),roleId); List<SysUser> sysUserList = sysUserMapper.selectRoleUserByDeptId(deptIdentify.getDeptId(), roleId);
return sysUserList; return sysUserList;
} }
@@ -508,12 +511,12 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
@Override @Override
public AjaxResult bindHandler(DeptIdentify deptIdentify) { public AjaxResult bindHandler(DeptIdentify deptIdentify) {
if (deptIdentify.getId()== null||deptIdentify.getUserId()==null) { if (deptIdentify.getId() == null || deptIdentify.getUserId() == null) {
return AjaxResult.error("请检查参数是否完整"); return AjaxResult.error("请检查参数是否完整");
} }
//根据userid查询用户信息 //根据userid查询用户信息
SysUser sysUser = sysUserMapper.selectUserById(deptIdentify.getUserId()); SysUser sysUser = sysUserMapper.selectUserById(deptIdentify.getUserId());
if (sysUser!= null) { if (sysUser != null) {
deptIdentify.setOperName(sysUser.getNickName()); deptIdentify.setOperName(sysUser.getNickName());
deptIdentify.setOperPhone(sysUser.getPhonenumber()); deptIdentify.setOperPhone(sysUser.getPhonenumber());
deptIdentify.setOperUserName(sysUser.getUserName()); deptIdentify.setOperUserName(sysUser.getUserName());
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
+101
View File
@@ -272,6 +272,107 @@ public class FixSelectFlowDetailUtils {
} }
} }
/**
* 定时查询企业认证状态
*
* @throws Exception
*/
@Scheduled(cron = "*/30 * * * * *")
@Transactional
public void fixExecuteSelectDeptIndentify() throws Exception {
Gson gson = new Gson();
DeptIdentify deptIdentify = new DeptIdentify();
deptIdentify.setIdentifyStatus(2);
List<DeptIdentify> deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify);
if (deptIdentifysnew != null && deptIdentifysnew.size() > 0) {
for (int i = 0; i < deptIdentifysnew.size(); i++) {
DeptIdentify deptIdentify1 = deptIdentifysnew.get(i);
String authFlowId = deptIdentify1.getAuthFlowId();
if (authFlowId != null) {
EsignHttpResponse identifyInfo = SignAward.getDeptIdentifyInfo(deptIdentify1);
JsonObject identifyInfoJsonObject = gson.fromJson(identifyInfo.getBody(), JsonObject.class);
int code = identifyInfoJsonObject.get("code").getAsInt();
if (code == 0) {
JsonObject identifyInfoData = identifyInfoJsonObject.getAsJsonObject("data");
int realnameStatus = identifyInfoData.get("realnameStatus").getAsInt();
if (realnameStatus == 1) {
String orgId = identifyInfoData.get("orgId").getAsString();
//查询企业内部印章
EsignHttpResponse response = SignAward.deptIdentifySealList(orgId);
JsonObject jsonObject = gson.fromJson(response.getBody(), JsonObject.class);
int code1 = jsonObject.get("code").getAsInt();
if (code1 == 0) {
JsonObject data = jsonObject.getAsJsonObject("data");
JsonArray seals = data.get("seals").getAsJsonArray();
if (seals.size() > 0) {
for (int j = 0; j < seals.size(); j++) {
//保存印章信息到数据库
JsonObject asJsonObject = seals.get(j).getAsJsonObject();
SealManage sealManage = new SealManage();
String sealName = asJsonObject.get("sealName").toString();
String sealId = asJsonObject.get("sealId").toString();
String url = asJsonObject.get("sealImageDownloadUrl").toString();
LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear());
String month = String.format("%02d", now.getMonthValue());
String day = String.format("%02d", now.getDayOfMonth());
String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
String fileName = UUID.randomUUID().toString().replace("-", "") + ".jpg";
String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName;
String savePath = "/home/ruoyi/uploadPath/upload/";
// 创建日期目录
File saveFolder = new File(saveFolderPath);
if (!saveFolder.exists()) {
saveFolder.mkdirs();
}
String resultFilePath = saveFolderPath + "/" + fileName;
File resultFilePathFile = new File(resultFilePath);
if (!resultFilePathFile.exists()) {
resultFilePathFile.createNewFile();
}
String fileDownloadUrlnew = url.substring(1, url.length() - 1);
boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath);
if (downLoadFile) {
CaseAttach caseAttach = new CaseAttach();
caseAttach.setAnnexType(10); //10代表印章图片
caseAttach.setAnnexPath(savePath);
caseAttach.setAnnexName(saveName);
int i1 = caseAttachMapper.save(caseAttach);
if (i1 > 0) {
//将印章信息保存到公章管理表里
String sealName1 = sealName.substring(1, sealName.length() - 1);
String sealId1 = sealId.substring(1, sealId.length() - 1);
Integer annexId1 = caseAttach.getAnnexId();
sealManage.setAnnexId(annexId1);
sealManage.setSealId(sealId1);
sealManage.setSealName(sealName1);
sealManage.setIdentifyId(deptIdentify1.getId());
sealManage.setSealStatus(1);
sealManage.setIsUse(1);
sealManageMapper.insertSealManage(sealManage);
}
}
}
}
}
//将orgId保存到数据库里
deptIdentify1.setOrgId(orgId);
deptIdentify1.setIdentifyStatus(1);
deptIdentify1.setIsUse(0); //默认机构为未启用
int row = deptIdentifyMapper.updateDeptIdentify(deptIdentify1);
}
}else {
deptIdentify1.setIdentifyStatus(2);
deptIdentifyMapper.updateDeptIdentify(deptIdentify1);
}
}
}
}
}
/** /**
* 定时查询印章审核状态 * 定时查询印章审核状态
*/ */
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java
+5 -1
View File
@@ -32,6 +32,7 @@ public class SignAward {
SealSignRecord sealSignRecord = new SealSignRecord(); SealSignRecord sealSignRecord = new SealSignRecord();
/* 发起签署*/ /* 发起签署*/
// EsignHttpResponse createByFile = createByFile(sealSignRecord); // EsignHttpResponse createByFile = createByFile(sealSignRecord);
// JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class); // JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class);
@@ -119,7 +120,10 @@ public class SignAward {
// } // }
// System.out.println(signFlowDetailJsonObject); // System.out.println(signFlowDetailJsonObject);
DeptIdentify deptIdentify = new DeptIdentify();
deptIdentify.setAuthFlowId("OF-2b4e8f043408003c");
EsignHttpResponse deptIdentifyInfo = getDeptIdentifyInfo(deptIdentify);
System.out.println(deptIdentifyInfo);
} }
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1 -1
View File
@@ -1459,7 +1459,7 @@
where id = #{id} where id = #{id}
</update> </update>
<update id="updatePayType"> <update id="updatePayType">
update case_application set pay_type=#{payDTO.payType} where id in update case_application set pay_type=#{payType} where id in
<foreach item="caseId" collection="caseIds" open="(" separator="," close=")"> <foreach item="caseId" collection="caseIds" open="(" separator="," close=")">
#{caseId} #{caseId}
</foreach> </foreach>
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml
+2
View File
@@ -114,7 +114,9 @@
<if test="legalPerName != null and legalPerName != ''">legal_per_name = #{legalPerName},</if> <if test="legalPerName != null and legalPerName != ''">legal_per_name = #{legalPerName},</if>
<if test="legalPerPhone != null and legalPerPhone != ''">legal_per_phone = #{legalPerPhone},</if> <if test="legalPerPhone != null and legalPerPhone != ''">legal_per_phone = #{legalPerPhone},</if>
<if test="identifyEmail != null and identifyEmail != ''">identify_email = #{identifyEmail},</if> <if test="identifyEmail != null and identifyEmail != ''">identify_email = #{identifyEmail},</if>
<if test="userId != null ">user_id = #{userId},</if>
<if test="authFlowId != null and authFlowId != '' ">auth_flow_id = #{authFlowId}</if> <if test="authFlowId != null and authFlowId != '' ">auth_flow_id = #{authFlowId}</if>
</set> </set>
<where> <where>
<if test="id != null"> <if test="id != null">