From 361f283a15adc231e696fa7b5617a9aefdaebdb1 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Thu, 21 Sep 2023 11:18:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=8B=E6=A1=88=E5=AE=A1=E6=9F=A5?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 16 ++++++++++++++-- .../service/ICaseApplicationService.java | 2 ++ .../impl/CaseApplicationServiceImpl.java | 18 +++++++++++++++++- .../wisdomarbitrate/CaseApplicationMapper.xml | 1 - 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 7eae2a7..d7f04d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -72,10 +72,10 @@ public class CaseApplicationController extends BaseController { } /** - * 提交立案数据 + * 提交立案申请 */ @PreAuthorize("@ss.hasPermi('caseApplication:submit')") - @Log(title = "提交立案数据", businessType = BusinessType.UPDATE) + @Log(title = "提交立案申请", businessType = BusinessType.UPDATE) @PostMapping("/submitCaseApplication") public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication) { @@ -194,6 +194,18 @@ public class CaseApplicationController extends BaseController { return toAjax(caseApplicationService.pendingAppointArbotrar(caseApplication)); } + /** + * 提交立案审查 + */ + @PreAuthorize("@ss.hasPermi('caseApplication:submitCaseApplicationCheck')") + @Log(title = "提交立案审查", businessType = BusinessType.UPDATE) + @PostMapping("/submitCaseApplicationCheck") + public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication) + { + + return toAjax(caseApplicationService.submitCaseApplicationCheck(caseApplication)); + } + diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index 25065ed..4d58d60 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -33,4 +33,6 @@ public interface ICaseApplicationService { int verificationArbitrateRecord(CaseApplication caseApplication); int checkArbitrateRecord(CaseApplication caseApplication); + + int submitCaseApplicationCheck(CaseApplication caseApplication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 912c8a8..973cf69 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -88,7 +88,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Transactional public int submitCaseApplication(CaseApplication caseApplication) { //提交立案申请 - caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT); + caseApplication.setCaseStatus(CaseApplicationConstants.CASE_CHECK); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); return rows; } @@ -287,6 +287,22 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { return rows; } + @Override + @Transactional + public int submitCaseApplicationCheck(CaseApplication caseApplication) { + //提交立案审查 + int rows = 0; + Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck(); + if(agreeOrNotCheck.intValue()==1){//同意审核 + caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT); + rows = caseApplicationMapper.submitCaseApplication(caseApplication); + }else if(agreeOrNotCheck.intValue()==2){//拒绝审核 + caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); + rows = caseApplicationMapper.submitCaseApplication(caseApplication); + } + return rows; + } + @Override @Transactional public int pendTralSure(CaseApplication caseApplication) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 7c9cfbd..8f09ff5 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -110,7 +110,6 @@ #{claimInterestOwed}, #{claimLiquidDamag}, #{feePayable}, - #{paidExpenses}, #{beginVideoDate}, #{onlineVideoPerson}, From 411d0e9ad93c9ff019bc39b09bc6f47f4bd59844 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Thu, 21 Sep 2023 19:25:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 12 ++++ .../IdentityAuthenticationController.java | 10 +-- .../domain/ArbitrateRecord.java | 2 + .../domain/IdentityAuthentication.java | 48 ++++++++++++-- .../mapper/IdentityAuthenticationMapper.java | 9 +++ .../IdentityAuthenticationService.java | 4 +- .../IdentityAuthenticationServiceImpl.java | 65 ++++--------------- .../wisdomarbitrate/ArbitrateRecordMapper.xml | 4 +- .../IdentityAuthenticationMapper.xml | 56 ++++++++++++++++ 9 files changed, 139 insertions(+), 71 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index d959a17..deef3b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system; import java.util.List; import java.util.Set; + +import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +36,8 @@ public class SysLoginController @Autowired private SysPermissionService permissionService; + @Autowired + private IdentityAuthenticationService identityAuthenticationService; /** * 登录方法 @@ -48,6 +53,13 @@ public class SysLoginController String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid()); ajax.put(Constants.TOKEN, token); + +// IdentityAuthentication identityAuthentication = new IdentityAuthentication(); +// identityAuthentication.setUserName(loginBody.getUsername()); +// IdentityAuthentication identityAuthenticationselect = identityAuthenticationService.selectIdentityAuthentication(identityAuthentication); +// ajax.put("certificationStatusName", identityAuthenticationselect.getCertificationStatusName()); +// ajax.put("certificationStatus", identityAuthenticationselect.getCertificationStatus()); + return ajax; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java index b5a9f49..51fafe0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java @@ -18,15 +18,7 @@ public class IdentityAuthenticationController extends BaseController { @Autowired private IdentityAuthenticationService identityAuthenticationService; - /** - * 查询身份证信息 - */ - @PostMapping("/selectIdentityInformation") - public AjaxResult selectIdentityInformation() - { - IdentityAuthentication identityAuthentication = identityAuthenticationService.selectIdentityInformation(); - return success(identityAuthentication); - } + diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java index d5779b8..74c5595 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java @@ -25,6 +25,8 @@ public class ArbitrateRecord extends BaseEntity { private String verificaOpinion; /** 审核裁决书意见 */ private String checkOpinion; + /** 裁决书附件id */ + private Long annexId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java index f279419..12a3f85 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java @@ -19,7 +19,47 @@ public class IdentityAuthentication extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date certificationTime; /** 认证状态 */ - private int certificationStatus; + private Integer certificationStatus; + + public Integer getCertificationStatus() { + return certificationStatus; + } + + public void setCertificationStatus(Integer certificationStatus) { + this.certificationStatus = certificationStatus; + } + + /** 认证状态名称 */ + private String certificationStatusName; + + public String getCertificationStatusName() { + return certificationStatusName; + } + + public void setCertificationStatusName(String certificationStatusName) { + this.certificationStatusName = certificationStatusName; + } + + /** 用户ID */ + private Long userId; + /** 用户账号 */ + private String userName; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } public Long getId() { return id; @@ -53,11 +93,5 @@ public class IdentityAuthentication extends BaseEntity { this.certificationTime = certificationTime; } - public int getCertificationStatus() { - return certificationStatus; - } - public void setCertificationStatus(int certificationStatus) { - this.certificationStatus = certificationStatus; - } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java index 20e5f6f..4800038 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java @@ -1,4 +1,13 @@ package com.ruoyi.wisdomarbitrate.mapper; +import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; +import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; + public interface IdentityAuthenticationMapper { + int insertIdentityAuthentication(IdentityAuthentication identityAuthentication); + IdentityAuthentication selectIdentityAuthentication(IdentityAuthentication identityAuthentication); + + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java index fdab196..06d9b57 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java @@ -5,5 +5,7 @@ import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; public interface IdentityAuthenticationService { - IdentityAuthentication selectIdentityInformation(); + IdentityAuthentication selectIdentityAuthentication(IdentityAuthentication identityAuthentication); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java index 3940c49..18c508a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java @@ -38,62 +38,21 @@ public class IdentityAuthenticationServiceImpl implements IdentityAuthenticatio private static final Logger log = LoggerFactory.getLogger(IdentityAuthenticationServiceImpl.class); + @Override - public IdentityAuthentication selectIdentityInformation() { - /* IdentityAuthentication identityAuthentication = new IdentityAuthentication(); - try{ - Credential credIdentityAuthentication = new Credential(credentialSecretId, credentialSecretKey); - HttpProfile httpProfileIdentityAuthentication = new HttpProfile(); - httpProfileIdentityAuthentication.setEndpoint("ocr.tencentcloudapi.com"); - String imagePathIdentityAuthentication = "本地png/jpg文件的绝对地址"; - InputStream inputStreamIdentityAuthentication = null; - byte[] buffer = null; - //读取图片字节数组 - try { - inputStreamIdentityAuthentication = new FileInputStream(imagePathIdentityAuthentication); - int count = 0; - while (count == 0) { - count = inputStreamIdentityAuthentication.available(); - } - buffer = new byte[count]; - inputStreamIdentityAuthentication.read(buffer); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (inputStreamIdentityAuthentication != null) { - try { - // 关闭inputStream流 - inputStreamIdentityAuthentication.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - String imageBase64IdentityAuthentication = Base64.getEncoder().encodeToString(buffer); - - ClientProfile clientProfileIdentityAuthentication = new ClientProfile(); - clientProfileIdentityAuthentication.setHttpProfile(httpProfileIdentityAuthentication); - OcrClient clientIdentityAuthentication = new OcrClient(credIdentityAuthentication, "ap-shanghai", clientProfileIdentityAuthentication); - RecognizeTableAccurateOCRRequest reqIdentityAuthentication = new RecognizeTableAccurateOCRRequest(); - reqIdentityAuthentication.setImageBase64(imageBase64IdentityAuthentication); - RecognizeTableAccurateOCRResponse respIdentityAuthentication = clientIdentityAuthentication.RecognizeTableAccurateOCR(reqIdentityAuthentication); - String stringRes = RecognizeTableAccurateOCRResponse.toJsonString(respIdentityAuthentication); - JSONObject stringObjectRes = (JSONObject) JSON.parse(stringRes); - JSONObject stringres = (JSONObject) stringObjectRes.get("Response"); - - - identityAuthentication.setName(stringres.get("name").toString()); - identityAuthentication.setIdentityNo(stringres.get("IdNum").toString()); - -// System.out.println(RecognizeTableAccurateOCRResponse.toJsonString(respIdentityAuthentication); - - } catch (TencentCloudSDKException e) { - log.error("身份认证失败", e); + public IdentityAuthentication selectIdentityAuthentication(IdentityAuthentication identityAuthentication) { + IdentityAuthentication identityAuthenticationselect = identityAuthenticationMapper.selectIdentityAuthentication(identityAuthentication); + if(identityAuthenticationselect!=null){ + identityAuthenticationselect.setCertificationStatusName("已身份注册"); + }else { + IdentityAuthentication identityAuthenticationselectnew = new IdentityAuthentication(); + identityAuthenticationselectnew.setCertificationStatusName("未身份注册"); + return identityAuthenticationselectnew; } + return identityAuthenticationselect; - return identityAuthentication;*/ - return null; } + + } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml index c0079c7..795e630 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml @@ -13,6 +13,7 @@ + @@ -54,6 +55,7 @@ ruling_follows = #{rulingFollows}, verifica_opinion = #{verificaOpinion}, check_opinion = #{checkOpinion}, + annex_id = #{annexId}, update_by = #{updateBy}, update_time = sysdate() @@ -63,7 +65,7 @@ + SELECT i.id ,i.name ,i.identity_no ,i.certification_time ,i.certificationStatus ,i.user_id ,i.user_name + from identi_authenti i + + + AND i.user_name = #{userName} + + + AND i.user_id = #{userId} + + + + +