Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev
This commit was merged in pull request #234.
This commit is contained in:
Gitea
+15
-12
@@ -102,25 +102,28 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
|
||||
}
|
||||
List<DeptIdentify> deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify);
|
||||
DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0);
|
||||
Integer isUse = deptIdentifyselect.getIsUse();
|
||||
if (isUse == 0) { //机构为未启用状态
|
||||
Integer identifyStatus = deptIdentifyselect.getIdentifyStatus();
|
||||
if (identifyStatus == 0) {
|
||||
if (identifyStatus != 1) {
|
||||
return AjaxResult.error("这个认证数据未进行认证，不能启用");
|
||||
} else {
|
||||
}
|
||||
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("启用成功");
|
||||
}
|
||||
}
|
||||
} else { //机构为已启用状态
|
||||
deptIdentifyselect.setIsUse(0);
|
||||
int i = deptIdentifyMapper.updateDeptIdentify(deptIdentifyselect);
|
||||
if (i > 0) {
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return AjaxResult.error();
|
||||
}
|
||||
|
||||
|
||||
+101
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 定时查询印章审核状态
|
||||
*/
|
||||
|
||||
@@ -32,6 +32,7 @@ public class SignAward {
|
||||
|
||||
SealSignRecord sealSignRecord = new SealSignRecord();
|
||||
|
||||
|
||||
/* 发起签署*/
|
||||
// EsignHttpResponse createByFile = createByFile(sealSignRecord);
|
||||
// JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class);
|
||||
@@ -119,7 +120,10 @@ public class SignAward {
|
||||
// }
|
||||
|
||||
// System.out.println(signFlowDetailJsonObject);
|
||||
|
||||
DeptIdentify deptIdentify = new DeptIdentify();
|
||||
deptIdentify.setAuthFlowId("OF-2b4e8f043408003c");
|
||||
EsignHttpResponse deptIdentifyInfo = getDeptIdentifyInfo(deptIdentify);
|
||||
System.out.println(deptIdentifyInfo);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1459,7 +1459,7 @@
|
||||
where id = #{id}
|
||||
</update>
|
||||
<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=")">
|
||||
#{caseId}
|
||||
</foreach>
|
||||
|
||||
@@ -114,7 +114,9 @@
|
||||
<if test="legalPerName != null and legalPerName != ''">legal_per_name = #{legalPerName},</if>
|
||||
<if test="legalPerPhone != null and legalPerPhone != ''">legal_per_phone = #{legalPerPhone},</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>
|
||||
|
||||
</set>
|
||||
<where>
|
||||
<if test="id != null">
|
||||
|
||||
Reference in New Issue
Block a user