From 01c8b63b7ca172bd28ebccbaacf0afabcef501eb Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 5 Jan 2024 18:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CommonController.java | 4 +- .../controller/system/SysLoginController.java | 4 +- .../CaseNumRuleController.java | 7 +- .../{ => dept}/DeptIdentifyController.java | 13 +- .../IdentityAuthenticationController.java | 6 +- .../WeChatUserController.java | 11 +- .../{ => mscase}/CaseLogRecordController.java | 6 +- .../SendMailRecordController.java | 7 +- .../common/core/domain/entity/SysUser.java | 12 + .../ruoyi/system/mapper/SysUserMapper.java | 7 +- .../ruoyi/system/service/ISysUserService.java | 2 +- .../wisdomarbitrate/domain/Adjudication.java | 188 ----- .../domain/ArbitrateRecord.java | 76 -- .../wisdomarbitrate/domain/Arbitrator.java | 123 ---- .../wisdomarbitrate/domain/CaseAffiliate.java | 353 ---------- .../domain/CaseApplication.java | 421 ----------- .../domain/CaseApplicationPay.java | 23 - .../domain/CaseEvidenceDirectory.java | 60 -- .../ruoyi/wisdomarbitrate/domain/CaseIds.java | 9 - .../domain/CasePaymentRecord.java | 45 -- .../domain/TemplateManual.java | 33 - .../domain/dto/CaseApplicationLogDTO.java | 255 ------- .../domain/dto/CaseConfirmPayDTO.java | 29 - .../domain/dto/CaseEvidenceDTO.java | 49 -- .../domain/dto/CasePayDTO.java | 42 -- .../{ => dto/casenumrule}/CaseNumRule.java | 2 +- .../domain/{ => dto/dept}/DeptIdentify.java | 2 +- .../domain/{ => dto/dept}/SealManage.java | 2 +- .../miniprogress}/IdentityAuthentication.java | 2 +- .../mscase}/BatchCaseApplication.java | 2 +- .../domain/{ => dto/mscase}/CaseAttach.java | 2 +- .../{ => dto/mscase}/CaseLogRecord.java | 2 +- .../dto/{ => mscase}/MsCaseLogRecordDTO.java | 2 +- .../{ => dto/mscase}/ReservedConference.java | 2 +- .../{ => dto/mscase}/SealSignRecord.java | 2 +- .../{ => dto/sendrecord}/SendMailRecord.java | 2 +- .../{ => dto/sendrecord}/SmsSendRecord.java | 2 +- .../domain/{ => dto/template}/FatchRule.java | 2 +- .../{ => dto/template}/TemplateManage.java | 3 +- .../domain/vo/ArchivesDetailVO.java | 24 - .../wisdomarbitrate/domain/vo/BookSendVO.java | 26 - .../domain/vo/CaseDetailVO.java | 67 -- .../domain/vo/CaseEvidenceDirectoryVO.java | 200 ------ .../domain/vo/CaseEvidenceVO.java | 40 -- .../domain/vo/CasePayListVO.java | 26 - .../domain/vo/CompareCaseVO.java | 37 - .../domain/vo/LogisticsInfoVO.java | 16 - .../wisdomarbitrate/domain/vo/SealListVO.java | 35 - .../domain/vo/SendRoomNoMessageVO.java | 29 - .../wisdomarbitrate/domain/vo/ToDoCount.java | 34 - .../domain/vo/UpdateSubmitVO.java | 38 - .../domain/vo/{ => base}/StringIdsReq.java | 2 +- .../vo/{ => miniprogress}/WeChatUserVO.java | 5 +- .../domain/vo/{ => mscase}/ColumnValue.java | 2 +- .../vo/{ => mscase}/ReservedConferenceVO.java | 2 +- .../vo/{ => template}/TemplateFatchRule.java | 2 +- .../{ => casenumrule}/CaseNumRuleMapper.java | 4 +- .../mapper/{ => dept}/DeptIdentifyMapper.java | 4 +- .../mapper/{ => dept}/SealManageMapper.java | 4 +- .../IdentityAuthenticationMapper.java | 5 +- .../{ => miniprogress}/WeChatUserMapper.java | 4 +- .../{ => mscase}/CaseAttachLogMapper.java | 4 +- .../mapper/{ => mscase}/CaseAttachMapper.java | 4 +- .../{ => mscase}/CaseLogRecordMapper.java | 6 +- .../{ => mscase}/ColumnValueLogMapper.java | 4 +- .../{ => mscase}/ColumnValueMapper.java | 5 +- .../ReservedConferenceMapper.java | 4 +- .../SendMailRecordMapper.java | 5 +- .../{ => sendrecord}/SmsRecordMapper.java | 4 +- .../{ => template}/FatchRuleMapper.java | 8 +- .../TemplateFatchRuleMapper.java | 4 +- .../{ => template}/TemplateManageMapper.java | 5 +- .../ICaseNumRuleService.java | 4 +- .../impl/CaseNumRuleServiceImpl.java | 9 +- .../{ => dept}/IDeptIdentifyService.java | 11 +- .../service/impl/DeptIdentifyServiceImpl.java | 652 ------------------ .../IdentityAuthenticationService.java | 4 +- .../{ => miniprogress}/WeChatUserService.java | 7 +- .../IdentityAuthenticationServiceImpl.java | 11 +- .../impl/WeChatUserServiceImpl.java | 10 +- .../{ => mscase}/ICaseLogRecordService.java | 4 +- .../service/{ => mscase}/VideoService.java | 6 +- .../impl/CallBackHandleServiceImpl.java | 2 +- .../impl/CaseLogRecordServiceImpl.java | 8 +- .../ISendMailRecordService.java | 4 +- .../impl/SendMailRecordServiceImpl.java | 9 +- .../wisdomarbitrate/utils/CaseLogUtils.java | 4 +- .../ruoyi/wisdomarbitrate/utils/OCRUtils.java | 8 +- .../wisdomarbitrate/utils/SignAward.java | 6 +- .../resources/generator/config.properties | 10 +- .../resources/mapper/system/SysUserMapper.xml | 20 +- .../{ => casenumrule}/CaseNumRuleMapper.xml | 4 +- .../{ => dept}/DeptIdentifyMapper.xml | 2 +- .../{ => dept}/SealManageMapper.xml | 2 +- .../IdentityAuthenticationMapper.xml | 2 +- .../{ => miniprogress}/WeChatUserMapper.xml | 4 +- .../{ => mscase}/CaseAttachLogMapper.xml | 8 +- .../{ => mscase}/CaseAttachMapper.xml | 8 +- .../{ => mscase}/CaseLogRecordMapper.xml | 4 +- .../{ => mscase}/ColumnValueLogMapper.xml | 4 +- .../{ => mscase}/ColumnValueMapper.xml | 4 +- .../{ => mscase}/ReservedConferenceMapper.xml | 4 +- .../{ => sendrecord}/SendMailRecordMapper.xml | 2 +- .../{ => sendrecord}/SmsRecordMapper.xml | 2 +- .../{ => template}/FatchRuleMapper.xml | 4 +- .../TemplateFatchRuleMapper.xml | 4 +- .../{ => template}/TemplateManageMapper.xml | 2 +- tkgenerator/pom.xml | 2 +- .../resources/generator/config.properties | 10 +- 109 files changed, 195 insertions(+), 3139 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/{ => casenumrule}/CaseNumRuleController.java (88%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/{ => dept}/DeptIdentifyController.java (94%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/{ => miniprogress}/IdentityAuthenticationController.java (86%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/{ => miniprogress}/WeChatUserController.java (82%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/{ => mscase}/CaseLogRecordController.java (83%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/{ => sendrecord}/SendMailRecordController.java (79%) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Adjudication.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplicationPay.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseIds.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CasePaymentRecord.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManual.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseApplicationLogDTO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseConfirmPayDTO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CasePayDTO.java rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/casenumrule}/CaseNumRule.java (90%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/dept}/DeptIdentify.java (96%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/dept}/SealManage.java (93%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/miniprogress}/IdentityAuthentication.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/mscase}/BatchCaseApplication.java (90%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/mscase}/CaseAttach.java (95%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/mscase}/CaseLogRecord.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/{ => mscase}/MsCaseLogRecordDTO.java (95%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/mscase}/ReservedConference.java (95%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/mscase}/SealSignRecord.java (96%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/sendrecord}/SendMailRecord.java (97%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/sendrecord}/SmsSendRecord.java (93%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/template}/FatchRule.java (94%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/{ => dto/template}/TemplateManage.java (88%) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ArchivesDetailVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/BookSendVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseDetailVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CasePayListVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CompareCaseVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/LogisticsInfoVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SealListVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/UpdateSubmitVO.java rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/{ => base}/StringIdsReq.java (86%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/{ => miniprogress}/WeChatUserVO.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/{ => mscase}/ColumnValue.java (92%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/{ => mscase}/ReservedConferenceVO.java (94%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/{ => template}/TemplateFatchRule.java (81%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => casenumrule}/CaseNumRuleMapper.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => dept}/DeptIdentifyMapper.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => dept}/SealManageMapper.java (72%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => miniprogress}/IdentityAuthenticationMapper.java (66%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => miniprogress}/WeChatUserMapper.java (80%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => mscase}/CaseAttachLogMapper.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => mscase}/CaseAttachMapper.java (91%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => mscase}/CaseLogRecordMapper.java (67%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => mscase}/ColumnValueLogMapper.java (84%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => mscase}/ColumnValueMapper.java (83%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => mscase}/ReservedConferenceMapper.java (86%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => sendrecord}/SendMailRecordMapper.java (57%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => sendrecord}/SmsRecordMapper.java (78%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => template}/FatchRuleMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => template}/TemplateFatchRuleMapper.java (77%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/{ => template}/TemplateManageMapper.java (68%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => casenumrule}/ICaseNumRuleService.java (74%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => casenumrule}/impl/CaseNumRuleServiceImpl.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => dept}/IDeptIdentifyService.java (87%) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => miniprogress}/IdentityAuthenticationService.java (85%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => miniprogress}/WeChatUserService.java (55%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => miniprogress}/impl/IdentityAuthenticationServiceImpl.java (96%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => miniprogress}/impl/WeChatUserServiceImpl.java (93%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => mscase}/ICaseLogRecordService.java (64%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => mscase}/VideoService.java (83%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => mscase}/impl/CallBackHandleServiceImpl.java (93%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => mscase}/impl/CaseLogRecordServiceImpl.java (86%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => sendrecord}/ISendMailRecordService.java (55%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/{ => sendrecord}/impl/SendMailRecordServiceImpl.java (64%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => casenumrule}/CaseNumRuleMapper.xml (97%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => dept}/DeptIdentifyMapper.xml (98%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => dept}/SealManageMapper.xml (97%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => miniprogress}/IdentityAuthenticationMapper.xml (97%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => miniprogress}/WeChatUserMapper.xml (93%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => mscase}/CaseAttachLogMapper.xml (93%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => mscase}/CaseAttachMapper.xml (94%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => mscase}/CaseLogRecordMapper.xml (96%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => mscase}/ColumnValueLogMapper.xml (94%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => mscase}/ColumnValueMapper.xml (94%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => mscase}/ReservedConferenceMapper.xml (89%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => sendrecord}/SendMailRecordMapper.xml (96%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => sendrecord}/SmsRecordMapper.xml (97%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => template}/FatchRuleMapper.xml (97%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => template}/TemplateFatchRuleMapper.xml (92%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/{ => template}/TemplateManageMapper.xml (97%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index e325a15..9bd9ef5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.CaseAttach; -import com.ruoyi.wisdomarbitrate.mapper.CaseAttachMapper; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; +import com.ruoyi.wisdomarbitrate.mapper.mscase.CaseAttachMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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 ebed683..3465b57 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 @@ -4,8 +4,8 @@ import java.util.List; import java.util.Set; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.service.miniprogress.IdentityAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseNumRuleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/casenumrule/CaseNumRuleController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseNumRuleController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/casenumrule/CaseNumRuleController.java index 7d453ca..e6d0ceb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseNumRuleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/casenumrule/CaseNumRuleController.java @@ -1,11 +1,10 @@ -package com.ruoyi.web.controller.wisdomarbitrate; +package com.ruoyi.web.controller.wisdomarbitrate.casenumrule; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.wisdomarbitrate.domain.CaseNumRule; -import com.ruoyi.wisdomarbitrate.domain.TemplateManual; -import com.ruoyi.wisdomarbitrate.service.ICaseNumRuleService; +import com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule; +import com.ruoyi.wisdomarbitrate.service.casenumrule.ICaseNumRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java index 47b916a..4c6e05a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java @@ -1,12 +1,13 @@ -package com.ruoyi.web.controller.wisdomarbitrate; -import cn.hutool.core.util.StrUtil; +package com.ruoyi.web.controller.wisdomarbitrate.dept; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.EsignDemoException; -import com.ruoyi.wisdomarbitrate.domain.*; -import com.ruoyi.wisdomarbitrate.domain.vo.SealListVO; -import com.ruoyi.wisdomarbitrate.service.IDeptIdentifyService; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; +import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage; +import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage; +import com.ruoyi.wisdomarbitrate.service.dept.IDeptIdentifyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -130,7 +131,7 @@ public class DeptIdentifyController extends BaseController { * @return */ @PostMapping("/insertTemplate") - public AjaxResult insertTemplate(TemplateManage templateManage,@RequestParam("file") MultipartFile file){ + public AjaxResult insertTemplate(TemplateManage templateManage, @RequestParam("file") MultipartFile file){ return deptIdentifyService.insertTemplate(templateManage,file); } /** 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/miniprogress/IdentityAuthenticationController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/IdentityAuthenticationController.java index 8e5f347..b8fbd93 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/miniprogress/IdentityAuthenticationController.java @@ -1,11 +1,11 @@ -package com.ruoyi.web.controller.wisdomarbitrate; +package com.ruoyi.web.controller.wisdomarbitrate.miniprogress; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.service.miniprogress.IdentityAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java index 9f5f6f7..d964817 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java @@ -1,17 +1,14 @@ -package com.ruoyi.web.controller.wisdomarbitrate; +package com.ruoyi.web.controller.wisdomarbitrate.miniprogress; import cn.hutool.core.util.StrUtil; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO; -import com.ruoyi.wisdomarbitrate.service.WeChatUserService; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.domain.vo.miniprogress.WeChatUserVO; +import com.ruoyi.wisdomarbitrate.service.miniprogress.WeChatUserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/CaseLogRecordController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/CaseLogRecordController.java index 9f936c4..fffd0ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/CaseLogRecordController.java @@ -1,9 +1,9 @@ -package com.ruoyi.web.controller.wisdomarbitrate; +package com.ruoyi.web.controller.wisdomarbitrate.mscase; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.service.mscase.ICaseLogRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/sendrecord/SendMailRecordController.java similarity index 79% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/sendrecord/SendMailRecordController.java index 30abad2..3d7e397 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/sendrecord/SendMailRecordController.java @@ -1,10 +1,9 @@ -package com.ruoyi.web.controller.wisdomarbitrate; +package com.ruoyi.web.controller.wisdomarbitrate.sendrecord; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.domain.SendMailRecord; -import com.ruoyi.wisdomarbitrate.service.ISendMailRecordService; +import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord; +import com.ruoyi.wisdomarbitrate.service.sendrecord.ISendMailRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index c7e0d81..7bb48c0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -69,6 +69,10 @@ public class SysUser extends BaseEntity @DictConvert(targetField = "sexName",dictType = "sys_user_sex") private String sex; private String sexName; + /** 专长 */ + @Excel(name = "专长") + private String specialty; + /** 用户头像 */ private String avatar; @@ -153,6 +157,14 @@ public class SysUser extends BaseEntity this.sexName = sexName; } + public String getSpecialty() { + return specialty; + } + + public void setSpecialty(String specialty) { + this.specialty = specialty; + } + public void setDeptId(Long deptId) { this.deptId = deptId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index e23c18f..cb99895 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -2,7 +2,6 @@ package com.ruoyi.system.mapper; import java.util.List; -import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import org.apache.ibatis.annotations.Param; import com.ruoyi.common.core.domain.entity.SysUser; @@ -21,11 +20,7 @@ public interface SysUserMapper */ public List selectUserList(SysUser sysUser); - /** - * 查询仲裁员角色下的用户 - * @return - */ - public List selectUserListByAdRole(Arbitrator arbitrator); + /** * 根据条件分页查询已配用户角色列表 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 5e17118..3caaea3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -4,7 +4,7 @@ import java.util.List; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.wisdomarbitrate.domain.Arbitrator; + /** * 用户 业务层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Adjudication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Adjudication.java deleted file mode 100644 index 75eb96e..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Adjudication.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import lombok.Data; - -@Data -public class Adjudication { - /** - * 申请人姓名 - */ - private String appName; - /** - * 申请人性别 - */ - private String appSex; - /** - * 申请人身份证号码 - */ - private String appIDNo; - /** - * 申请人住所 - */ - private String appAddress; - - /** - * 申请人代理人姓名 - */ - private String appAgentName; - /** - * 申请人代理人身份证 - */ - private String appAgentIDNo; - /** - * 被申请人姓名 - */ - private String resName; - /** - * 被申请人性别 - */ - private String resSex; - /** - * 被申请人身份证号码 - */ - private String resIDNo; - /** - * 被申请人住所 - */ - private String resAddress; - - /** - * 被申请人代理人姓名 - */ - private String resAgentName; - /** - * 被申请人代理人身份证 - */ - private String resAgentIDNo; - - /** - * 案件名称 - */ - private String caseName; - - /** - * 仲裁员名称 - */ - private String arbitratorName; - /** - * 开庭年 - */ - private String hearYear; - /** - * 开庭月 - */ - private String hearMonths; - /** - * 开庭日 - */ - private String hearDay; - - /** - * 申请人具体仲裁请求 - */ - private String appArbitrationClaims; - - /** - * 申请人证据名称 - */ - private String appEvidenceName; - - /** - * 申请人拟证事实 - */ - private String appProveFacts; - /** - * 被申请人对申请人答辩内容 - */ - private String resDefenseContentToApp; - - /** - * 被申请人具体仲裁请求 - */ - private String resArbitrationClaims; - /** - * 被申请人证据名称 - */ - private String resEvidenceName; - /** - * 被申请人拟证事实 - */ - private String resProveFacts; - /** - * 申请人对被申请人答辩内容 - */ - private String appDefenseContentToRes; - /** - * 第三人答辩内容 - */ - private String thirdDefenseContent; - /** - * 第三人证据名称 - */ - private String thirdEvidenceName; - /** - * 第三人拟证事实 - */ - private String thirdProveFacts; - /** - * 申请人对第三人答辩内容 - */ - private String appDefenseContentToThird; - /** - * 被申请人对第三人答辩内容 - */ - private String resDefenseContentToThird; - /** - * 证据认定 - */ - private String evidenDetermi; - /** - * 认定事实 - */ - private String factDetermi; - /** - * 综上所述 - */ - private String caseSketch; - /** - * 本庭认为 - */ - private String arbitrateThink; - /** - * 裁决如下 - */ - private String rulingFollows; - /** - * 法律条款 - */ - private String legalProvisions; - /** - * 首席仲裁 - */ - private String umpire; - /** - * 仲裁员1 - */ - private String arbitratorName1; - /** - * 仲裁员2 - */ - private String arbitratorName2; - /** - * 年 - */ - private String year; - /** - * 月 - */ - private String months; - /** - * 日 - */ - private String day; - /** - * 书记员 - */ - private String clerk; - -} 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 deleted file mode 100644 index eed8844..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.ruoyi.common.core.domain.BaseEntity; -import lombok.Data; - -@Data -public class ArbitrateRecord extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** ID */ - private Long id; - /** 案件申请id */ - private Long caseAppliId; - /** 证据认定 */ - private String evidenDetermi; - /** 认定事实 */ - private String factDetermi; - /** 综上所述 */ - private String caseSketch; - /** 本庭认为 */ - private String arbitrateThink; - /** 裁决如下 */ - private String rulingFollows; - /** 核验裁决书意见 */ - private String verificaOpinion; - /** 审核裁决书意见 */ - private String checkOpinion; - /** 仲裁员审核裁决书意见 */ - private String arbitraCheckOpinion; - /** 裁决书附件id */ - private Integer annexId; - - /** 被申请人是否缺席 */ - private Integer isAbsence; - /** 被申请人质证意见 */ - private String responCrossOpin; - /** 申请人质证意见 */ - private String applicaCrossOpin; - /** 申请人是否缺席 */ - private Integer appliIsAbsen; - /** 被申请人质证意见 */ - private String responDefenOpini; - /** - * 本案争议焦点 - */ - private String caseFocus; - /** - * 本案事实 - */ - private String caseFacts; - /** - * 被申请人对上述材料的质证意见 - */ - private String respondentOpinion; - /** - * 申请人对上述材料的质证意见 - */ - private String applicantOpinion; - - /** - * 立案审查驳回原因 - */ - private String caseCheckReject; - /** - * 仲裁员确认裁决书驳回 - */ - private String arbitrateReject; - /** - * 部门长确认裁决书驳回 - */ - private String deptorReject; - - - - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java deleted file mode 100644 index 4e73c8d..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/Arbitrator.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.ruoyi.common.core.domain.BaseEntity; - -import java.util.List; - -public class Arbitrator extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** ID */ - private Long id; - /** 仲裁员姓名 */ - private String arbitratorName; - /** 职称 */ - private String title; - /** 职业 */ - private String career; - /** 专业分类 */ - private String professiClassifi; - /** 学历 */ - private String education; - /** 所在地区 */ - private String area; - /** 联系电话 */ - private String telephone; - - List idList; - - public List getIdList() { - return idList; - } - - public void setIdList(List idList) { - this.idList = idList; - } - - public String getArbitratorName() { - return arbitratorName; - } - - public void setArbitratorName(String arbitratorName) { - this.arbitratorName = arbitratorName; - } - - /** 当前案件数量 */ - private int currentCaseNum; - /** 已结案数量 */ - private int closedCaseNum; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCareer() { - return career; - } - - public void setCareer(String career) { - this.career = career; - } - - public String getProfessiClassifi() { - return professiClassifi; - } - - public void setProfessiClassifi(String professiClassifi) { - this.professiClassifi = professiClassifi; - } - - public String getEducation() { - return education; - } - - public void setEducation(String education) { - this.education = education; - } - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getTelephone() { - return telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; - } - - public int getCurrentCaseNum() { - return currentCaseNum; - } - - public void setCurrentCaseNum(int currentCaseNum) { - this.currentCaseNum = currentCaseNum; - } - - public int getClosedCaseNum() { - return closedCaseNum; - } - - public void setClosedCaseNum(int closedCaseNum) { - this.closedCaseNum = closedCaseNum; - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java deleted file mode 100644 index 6e154e1..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java +++ /dev/null @@ -1,353 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import java.util.Date; - -public class CaseAffiliate extends BaseEntity { - private static final long serialVersionUID = 1L; - /** ID */ - @Excel(name = "ID", cellType = Excel.ColumnType.NUMERIC, prompt = "ID") - private Long id; - /** 案件申请id */ - private Long caseAppliId; - /** - * 案件申请日志id - */ - private Long caseAppliLogId; - /** 身份类型 */ - private int identityType; - /** 姓名 */ - @Excel(name = "姓名") - private String name; - /** - * 申请机构id - */ - private String applicationOrganId; - /** - * 申请机构名称 - */ - private String applicationOrganName; - - /** - * 法定代表人 - */ - private String compLegalPerson; - /** - * 邮箱 - */ - private String email; - /** - * 法定代表人职位 - */ - private String compLegalperPost; - /** - * 被申请人性别 - */ - private String responSex; - /** - * 被申请人出生年月日 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date responBirth; - /** - * 版本号 - */ - private Integer version; - /** - * 改变的字段 - */ - private String changeColumn; - - /** - * 代理人邮箱 - */ - private String agentEmail; - - public String getAgentEmail() { - return agentEmail; - } - - public void setAgentEmail(String agentEmail) { - this.agentEmail = agentEmail; - } - - public String getChangeColumn() { - return changeColumn; - } - - public void setChangeColumn(String changeColumn) { - this.changeColumn = changeColumn; - } - - public Long getCaseAppliLogId() { - return caseAppliLogId; - } - - public void setCaseAppliLogId(Long caseAppliLogId) { - this.caseAppliLogId = caseAppliLogId; - } - - public Integer getVersion() { - return version; - } - - public void setVersion(Integer version) { - this.version = version; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Date getResponBirth() { - return responBirth; - } - - public void setResponBirth(Date responBirth) { - this.responBirth = responBirth; - } - - - public String getCompLegalPerson() { - return compLegalPerson; - } - - public void setCompLegalPerson(String compLegalPerson) { - this.compLegalPerson = compLegalPerson; - } - - public String getCompLegalperPost() { - return compLegalperPost; - } - - public void setCompLegalperPost(String compLegalperPost) { - this.compLegalperPost = compLegalperPost; - } - - public String getResponSex() { - return responSex; - } - - public void setResponSex(String responSex) { - this.responSex = responSex; - } - - /** 身份证号 */ - @Excel(name = "身份证号") - private String identityNum; - /** 单位电话 */ - @Excel(name = "单位电话") - private String workTelphone; - /** 联系电话 */ - @Excel(name = "联系电话") - private String contactTelphone; - /** 联系地址 */ - @Excel(name = "联系地址") - private String contactAddress; - /** 住所 */ - @Excel(name = "住所") - private String residenAffili; - /** 申请人代理人职称 */ - @Excel(name = "申请人代理人职称") - private String appliAgentTitle; - - public String getResidenAffili() { - return residenAffili; - } - - public void setResidenAffili(String residenAffili) { - this.residenAffili = residenAffili; - } - - public String getAppliAgentTitle() { - return appliAgentTitle; - } - - public void setAppliAgentTitle(String appliAgentTitle) { - this.appliAgentTitle = appliAgentTitle; - } - - /** 单位地址 */ - @Excel(name = "单位地址") - private String workAddress; - - /** 代理人姓名 */ - @Excel(name = "代理人姓名") - private String nameAgent; - /** 身份证号 */ - @Excel(name = "代理人身份证号") - private String identityNumAgent; - /** 联系电话 */ - @Excel(name = "代理人联系电话") - private String contactTelphoneAgent; - /** 联系地址 */ - @Excel(name = "代理人联系地址") - private String contactAddressAgent; - - /** 送达电子邮件 */ - private String sendEmail; - private String userId; - private String applicantAgentUserId; - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getApplicantAgentUserId() { - return applicantAgentUserId; - } - - public void setApplicantAgentUserId(String applicantAgentUserId) { - this.applicantAgentUserId = applicantAgentUserId; - } - - /** 快递单号 */ - private String trackNum; - - public String getApplicationOrganId() { - return applicationOrganId; - } - - public void setApplicationOrganId(String applicationOrganId) { - this.applicationOrganId = applicationOrganId; - } - - public String getApplicationOrganName() { - return applicationOrganName; - } - - public void setApplicationOrganName(String applicationOrganName) { - this.applicationOrganName = applicationOrganName; - } - - public String getSendEmail() { - return sendEmail; - } - - public void setSendEmail(String sendEmail) { - this.sendEmail = sendEmail; - } - - public String getTrackNum() { - return trackNum; - } - - public void setTrackNum(String trackNum) { - this.trackNum = trackNum; - } - - public String getNameAgent() { - return nameAgent; - } - - public void setNameAgent(String nameAgent) { - this.nameAgent = nameAgent; - } - - public String getIdentityNumAgent() { - return identityNumAgent; - } - - public void setIdentityNumAgent(String identityNumAgent) { - this.identityNumAgent = identityNumAgent; - } - - public String getContactTelphoneAgent() { - return contactTelphoneAgent; - } - - public void setContactTelphoneAgent(String contactTelphoneAgent) { - this.contactTelphoneAgent = contactTelphoneAgent; - } - - public String getContactAddressAgent() { - return contactAddressAgent; - } - - public void setContactAddressAgent(String contactAddressAgent) { - this.contactAddressAgent = contactAddressAgent; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getCaseAppliId() { - return caseAppliId; - } - - public void setCaseAppliId(Long caseAppliId) { - this.caseAppliId = caseAppliId; - } - - public int getIdentityType() { - return identityType; - } - - public void setIdentityType(int identityType) { - this.identityType = identityType; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getIdentityNum() { - return identityNum; - } - - public void setIdentityNum(String identityNum) { - this.identityNum = identityNum; - } - - public String getWorkTelphone() { - return workTelphone; - } - - public void setWorkTelphone(String workTelphone) { - this.workTelphone = workTelphone; - } - - public String getContactTelphone() { - return contactTelphone; - } - - public void setContactTelphone(String contactTelphone) { - this.contactTelphone = contactTelphone; - } - - public String getContactAddress() { - return contactAddress; - } - - public void setContactAddress(String contactAddress) { - this.contactAddress = contactAddress; - } - - public String getWorkAddress() { - return workAddress; - } - - public void setWorkAddress(String workAddress) { - this.workAddress = workAddress; - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java deleted file mode 100644 index 8239489..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ /dev/null @@ -1,421 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import lombok.Data; - -import com.ruoyi.wisdomarbitrate.domain.vo.ColumnValue; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -@Data -public class CaseApplication extends BaseEntity { - private static final long serialVersionUID = 1L; - /** - * 查询案件时区分是否待办案件，0待办案件，1已办案件 - */ - private String selectCaseStatus; - - /** ID */ - private Long id; - /** 案件名称 */ - @Excel(name = "案件名称") - private String caseName; - /** 案件编号 */ -// @Excel(name = "案件编号") - private String caseNum; - /** 案件标的 */ - @Excel(name = "案件标的") - private BigDecimal caseSubjectAmount; - /** - * 模板id - */ - private Long templateId; - - - - /** 立案日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date registerDate; - /** 仲裁方式 */ - private Integer arbitratMethod; - /** - * 是否导入，0手动录入，1导入，默认0 - */ - private Integer importFlag; - /** 仲裁方式名称 */ - private String arbitratMethodName; - - /** 案件状态 */ - private Integer caseStatus; - - /** 申请人是否书面审理 */ - private Integer applicantIsWrittenHear; - - /** 被申请人是否书面审理 */ - private Integer respondentIsWrittenHear; - /** 开庭方式是否一致 */ - private Integer arbitraMethodIssame; - /** 仲裁方式说明 */ - private String arbitratMethodIllustrate; - - - /** 案件申请表ID */ - private Long caseAppliId; - - /** 开庭日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date hearDate; - - /** 借款开始日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "借款开始日期") - private Date loanStartDate; - /** 借款结束日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "借款结束日期") - private Date loanEndDate; - /** 合同编号 */ - @Excel(name = "合同编号") - private String contractNumber; - /** 申请人主张欠本金 */ - @Excel(name = "申请人主张欠本金") - private BigDecimal claimPrinciOwed; - /** 申请人主张欠利息 */ - @Excel(name = "申请人主张欠利息") - private BigDecimal claimInterestOwed; - /** 申请人主张违约金 */ - @Excel(name = "申请人主张违约金") - private BigDecimal claimLiquidDamag; - /** 申请人请求仲裁庭裁决 */ - @Excel(name = "申请人请求仲裁庭裁决",width = 36) - private String requestRule; - - /** 是否财产保全申请 */ - @Excel(name = "是否财产保全申请",width = 26,combo= {"是","否"},readConverterExp = "0=否,1=是") - private Integer properPreser; - /** 申请人仲裁请求及事实和理由 */ - @Excel(name = "申请人仲裁请求及事实和理由",width = 36) - private String arbitratClaims; - /** 仲裁应缴费用 */ - private BigDecimal feePayable; - - /** 开始在线视频时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginVideoDate; - /** 在线视频人员 */ - private String onlineVideoPerson; - - /** 仲裁员id */ - private String arbitratorId; - /** 仲裁员名称 */ - private String arbitratorName; - - /** 案件描述 */ - private String caseDescribe; - /** 裁决书URL */ - private String filearbitraUrl; - - /** 是否同意组庭 */ - private Integer isAgreePendTral; - - /** 是否有异议需要举证 */ - private Integer objectionAddEviden; - /** 是否需要开庭审理 */ - private Integer openCourtHear; - - /** 是否仲裁反请求 */ - private Integer adjudicaCounter; - /** - * 仲裁反请求原因 - */ - private String adjudicaCounterReason; - - /** 被申请人是否缺席 */ - private Integer isAbsence; - /** 是否管辖异议申请 */ - private Integer objectiJuris; - /** 被申请人质证意见 */ - private String responCrossOpin; - /** 被申请人的答辩意见 */ - private String responDefenOpini; - /** 申请人是否缺席 */ - private Integer appliIsAbsen; - - /** 申请人质证意见 */ - private String applicaCrossOpin; - - /** 支付状态 */ - private Integer paymentStatus; - - /** 支付状态描述 */ - private String paymentStatusName; - /** - * 支付方式code，0线上支付，1线下支付 - */ - private Integer payTypeCode; - /** - * 支付方式name，0线上支付，1线下支付 - */ - private String payTypeName; - - - /** - * 缴费凭证 - */ - private List payOrderList; - // 导入校验失败信息 - private StringBuilder errorMsg; - /** - * 是否锁定，0-否，1-是 - */ - private Integer lockStatus; - /** 案件状态名称 */ - private String caseStatusName; - /** 是否同意审核 */ - private Integer agreeOrNotCheck; - /** 申请人名称 */ - private String applicantName; - /** 被申请人名称 */ - private String respondentName; - /** - * 用户身份证号 - */ - private String idCard; - /** - * 用户id - */ - private String userId; - /** - * 登录用户用户名 - */ - private String loginUserName; - private List deptIds; - /** - * 部门长状态 - */ - private List deptHeadStatus; - /** - * 代理人角色有关部门 - */ - private List agentDeptIds; - /** - * 财务状态 - */ - private Integer financeStatus; - /** - * 是否是被申请人，仲裁员,部门长，财务，代理人，0-否，1-是 - */ - private Integer isOtherRole; - /** - * 案件日志id - */ - private Long caseLogId; - /** 仲裁结果 */ - private String caseResult; - /** 是否指派仲裁员 */ - private int pendingAppointArbotrar; - /** 案件关联人信息 */ - private List caseAffiliates; - - /** 案件仲裁员 */ - private List arbitrators; - - private List caseStatusList; - - private List annexTypeList; - - private Integer annexType; - /** - * 案件附件列表 - */ - private List caseAttachList; - - /** 仲裁记录 */ - private ArbitrateRecord arbitrateRecord; - - /** 身份类型 */ -// @Excel(name = "身份类型") - private int identityType; - /** - * 申请人主体信息 - */ - /** 姓名 */ - @Excel(name = "申请人主体信息-申请人(机构)",width = 26) - private String name; - /** 身份证号 */ - @Excel(name = "申请人主体信息-代码",width = 26) - private String identityNum; - /** 申请人主体信息-法定代表人 */ - @Excel(name = "申请人主体信息-法定代表人",width = 26) - private String compLegalPerson; - /** 申请人主体信息-法定代表人 */ - @Excel(name = "申请人主体信息-法定代表人职位",width = 26) - private String compLegalperPost; - /** - * 申请人主体信息-申请人(机构)id - */ - private String nameId; - - /** 联系电话 */ - @Excel(name = "申请人主体信息-联系电话",width = 26) - private String contactTelphone; - /** 联系地址 */ - @Excel(name = "申请人主体信息-联系地址",width = 26) - private String contactAddress; - /** 单位电话 */ - @Excel(name = "申请人主体信息-单位电话",width = 26) - private String workTelphone; - /** 单位地址 */ - @Excel(name = "申请人主体信息-单位地址",width = 26) - private String workAddress; - - /** 申请人住所 */ - @Excel(name = "申请人主体信息-住所",width = 26) - private String residenAffiliAppli; - - /** 申请人邮箱 */ - @Excel(name = "申请人主体信息-邮箱",width = 26) - private String email; - /** 代理人姓名 */ - @Excel(name = "申请人主体信息-代理人姓名",width = 26) - private String nameAgent; - /** 身份证号 */ - @Excel(name = "申请人主体信息-代理人身份证号",width = 26) - private String identityNumAgent; - - /** 联系电话 */ - @Excel(name = "申请人主体信息-代理人联系电话",width = 26) - private String contactTelphoneAgent; - /** 联系地址 */ - @Excel(name = "申请人主体信息-代理人联系地址",width = 26) - private String contactAddressAgent; - /** 申请人代理人职称 */ - @Excel(name = "申请人主体信息-代理人职称",width = 26) - private String appliAgentTitle; - /** - * 被申请人主体信息 - */ - /** 姓名 */ - @Excel(name = "被申请人主体信息-申请人姓名",width = 26) - private String debtorName; - /** 身份证号 */ - @Excel(name = "被申请人主体信息-身份证号",width = 26) - private String debtorIdentityNum; - /** 被申请人主体信息-性别 */ - @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,1=女") - private String responSex; - /** 被申请人主体信息-出生年月日 */ - @Excel(name = "被申请人主体信息-出生年月日",width = 26) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date responBirth; - /** 联系电话 */ - @Excel(name = "被申请人主体信息-联系电话",width = 26) - private String debtorContactTelphone; - /** 联系地址 */ - @Excel(name = "被申请人主体信息-联系地址",width = 26) - private String debtorContactAddress; - /** 被申请人住所 */ - @Excel(name = "被申请人主体信息-住所",width = 26) - private String residenAffiliRespon; - /** 单位电话 */ - @Excel(name = "被申请人主体信息-单位电话",width = 26) - private String debtorWorkTelphone; - /** 单位地址 */ - @Excel(name = "被申请人主体信息-单位地址",width = 26) - private String debtorWorkAddress; - /** 邮箱 */ - @Excel(name = "被申请人主体信息-邮箱",width = 26) - private String debtorEmail; - - /** 代理人姓名 */ - @Excel(name = "被申请人主体信息-代理人姓名",width = 26) - private String debtorNameAgent; - /** 身份证号 */ - @Excel(name = "被申请人主体信息-代理人身份证号",width = 26) - private String debtorIdentityNumAgent; - /** 联系电话 */ - @Excel(name = "被申请人主体信息-代理人联系电话",width = 26) - private String debtorContactTelphoneAgent; - /** 联系地址 */ - @Excel(name = "被申请人主体信息-代理人联系地址",width = 26) - private String debtorContactAddressAgent; - /** - * 申请机构id - */ - private String applicationOrganId; - /** - * 版本号 - */ - private Integer version; - /** - * 修改案件的提交状态，0-未提交，1-已提交，2-同意，3-拒绝，4-撤销 - */ - private Integer updateSubmitStatus; - /** 合同名称 */ - private String contractName; - /** - * 事实和理由 - */ - private String facts; - /** - * 合同甲方 - */ - private String partyA; - /** - * 利率 - */ - private String interestRate; - /** - * 待还金额 - */ - private String outstandingMoney; - /** - * 调解达成协议内容 - */ - private String mediationAgreement; - /** - * 金融消费纠纷基本情况 - */ - private String disputes; - /** - * 贷款类型 - */ - private String loanType; - /** - * 贷款期限 - */ - private String loanTerm; - /** - * 本案争议焦点 - */ - private String caseFocus; - /** - * 本案事实 - */ - private String caseFacts; - /** - * 被申请人对上述材料的质证意见 - */ - private String respondentOpinion; - /** - * 申请人对上述材料的质证意见 - */ - private String applicantOpinion; - /** - * 批号 - */ - private Integer batchNumber; - /** - * 自定义字段 - */ - private List columnValues; - /** - * 待办状态，0待办，1已办 - */ - private Integer pendingStatus; - /** e签宝流程id */ - private String signFlowId;; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplicationPay.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplicationPay.java deleted file mode 100644 index 7e85b3c..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplicationPay.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.ruoyi.common.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class CaseApplicationPay { - /** 案件编号 */ - private String caseNum; - /** 案件标的 */ - private BigDecimal caseSubjectAmount; - /** 仲裁应缴费用 */ - private BigDecimal feePayable; - /** 案件状态 */ - private Integer caseStatus; - /**申请人 */ - private String caseAppName; - /**被申请人 */ - private String caseResName; - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java deleted file mode 100644 index 57c29de..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.ruoyi.common.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.ArrayList; -import java.util.List; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CaseEvidenceDirectory extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * id - */ - private Long id; - - /** - * 父id - */ - private Long parentId; - - /** - * 证据名称 - */ - private String evidenceName; - - /** - * 附件id - */ - private Integer annexId; - - /** - * 级数 - */ - private Integer series; - - /** - * 案件id - */ - private Long caseId; - - /** 子目录 */ - private List children = new ArrayList<>(); - - /** - * 附件名称 - */ - private String annexName; - /** - * 附件路径 - */ - private String annexPath; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseIds.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseIds.java deleted file mode 100644 index f7d9696..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseIds.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import lombok.Data; - -import java.util.List; -@Data -public class CaseIds { - private List ids; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CasePaymentRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CasePaymentRecord.java deleted file mode 100644 index 74f1f77..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CasePaymentRecord.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; -import lombok.Data; - -import java.util.Date; - -@Data -public class CasePaymentRecord { - private static final long serialVersionUID = 1L; - /** - * 主键 - */ - private Integer id; - /** - * 案件id - */ - private Long caseId; - /** - * 订单号 - */ - private String orderNumber; - /** - * 支付状态(0未支付,1已支付) - */ - private Integer paymentStatus; - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date paymentTime; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - /** - * 支付方式 0线上支付，1线下支付 - */ - private Integer payType; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManual.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManual.java deleted file mode 100644 index 82fa6e4..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManual.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain; - -import com.ruoyi.common.core.domain.BaseEntity; -import lombok.Data; - -@Data -public class TemplateManual { - /** - * ID - */ - private Long id; - - /** - * 模板名称 - */ - private String name; - - /** - * 模板内容，用{}作为占位符动态替换其内容 - */ - private String content; - - /** - * 模板类型，1-裁决内容，2-调解协议，3-金融消费纠纷基本情况 - */ - private Integer type; - - /** - * 删除标志（0代表存在 2代表删除） - */ - private Integer delFlag; - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseApplicationLogDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseApplicationLogDTO.java deleted file mode 100644 index b66aa79..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseApplicationLogDTO.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.dto; - -import lombok.Data; - -import java.util.Date; - -/** - * @author wangqiong - * @description 案件日志 - * @date 2023-11-17 14:01 - */ -@Data -public class CaseApplicationLogDTO { - private static final long serialVersionUID = 1L; - - /** - * id - */ - private Long id; - - /** - * 案件编号 - */ - private String caseNum; - - /** - * 案件标的 - */ - private Double caseSubjectAmount; - - /** - * 立案日期 - */ - private Date registerDate; - - /** - * 仲裁方式，视频仲裁（1）、书面仲裁（2） - */ - private Long arbitratMethod; - - /** - * 案件状态，立案申请（0）、待立案审查（1）、 待缴费（2）、待缴费确认（3）、 待案件质证（4）、 - */ - private Integer caseStatus; - - /** - * 开庭日期 - */ - private Date hearDate; - - /** - * 申请人仲裁请求及事实和理由 - */ - private String arbitratClaims; - - /** - * 借款开始日期 - */ - private Date loanStartDate; - - /** - * 借款结束日期 - */ - private Date loanEndDate; - - /** - * 申请人主张欠本金 - */ - private Double claimPrinciOwed; - - /** - * 申请人主张欠利息 - */ - private Double claimInterestOwed; - - /** - * 申请人主张违约金 - */ - private Double claimLiquidDamag; - - /** - * 仲裁应缴费用 - */ - private Double feePayable; - - /** - * 开始在线视频时间 - */ - private Date beginVideoDate; - - /** - * 在线视频人员 - */ - private String onlineVideoPerson; - - /** - * 合同编号 - */ - private String contractNumber; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 创建者 - */ - private String createBy; - - /** - * 仲裁员id - */ - private String arbitratorId; - - /** - * 仲裁员名称 - */ - private String arbitratorName; - - /** - * 已确认组庭的仲裁员id - */ - private String pendedTrialArbitorid; - - /** - * 是否指派仲裁员，1是，2否 - */ - private Integer pendingAppointArbotrar; - - /** - * 案件名称 - */ - private String caseName; - - /** - * 案件描述 - */ - private String caseDescribe; - - /** - * 仲裁结果 - */ - private String caseResult; - - /** - * 是否同意组庭，0否，1是 - */ - private Integer isAgreePendTral; - - /** - * 是否有异议需要举证，1是，0否 - */ - private Integer objectionAddEviden; - - /** - * 是否需要开庭审理，1是，0否 - */ - private Integer openCourtHear; - - /** - * paid_expenses - */ - private Double paidExpenses; - - /** - * 裁决书URL - */ - private String filearbitraUrl; - - /** - * 支付方式（0线上支付，1线下支付） - */ - private String payType; - - /** - * 申请人请求仲裁庭裁决 - */ - private String requestRule; - - /** - * 是否仲裁反请求，1是，0否 - */ - private Integer adjudicaCounter; - - /** - * 是否财产保全申请，1是，0否 - */ - private Integer properPreser; - - /** - * 是否管辖异议申请，1是，0否 - */ - private Integer objectiJuris; - - /** - * 被申请人是否缺席，1是，0否 - */ - private Integer isAbsence; - - /** - * 被申请人质证意见 - */ - private String responCrossOpin; - - /** - * 申请人质证意见 - */ - private String applicaCrossOpin; - - /** - * 被申请人的答辩意见 - */ - private String responDefenOpini; - - /** - * 申请人是否缺席，1是，0否 - */ - private Integer appliIsAbsen; - - /** - * 是否锁定，0-否，1-是 - */ - private Integer lockStatus; - - /** - * 视频会议房间号id，多个用逗号拼接 - */ - private String roomId; - - /** - * 是否导入，0手动录入，1导入，默认0 - */ - private Integer importFlag; - - /** - * 版本号 - */ - private Long version; - - /** - * 修改案件的提交状态，0-未提交，1-已提交，2-同意，3，拒绝 - */ - private Integer updateSubmitStatus; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseConfirmPayDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseConfirmPayDTO.java deleted file mode 100644 index ae00cb0..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseConfirmPayDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.dto; - -import com.ruoyi.wisdomarbitrate.domain.CaseAttach; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * 案件确认缴费传入对象 - */ -@Data -public class CaseConfirmPayDTO { - /** - * 案件ids - */ - @NotNull(message = "案件id不能为空") - private List caseIds; - - /** - * 支付方式 0线上支付，1线下支付 - */ - private Integer payType; - /** - * 缴费凭证 - */ - private List payOrderList; - -} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java deleted file mode 100644 index b412ede..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.dto; - -import com.ruoyi.wisdomarbitrate.domain.Arbitrator; -import lombok.Data; - -import java.util.List; - -/** - * 案件质证传入对象 - */ -@Data -public class CaseEvidenceDTO { - /** - * 案件id - */ - private Long caseId; - - /** - * 是否有异议需要举证,1是，0否 - */ - private Integer objectionAddEviden; - - /** - * 是否需要开庭审理，1是，0否 - */ - private Integer openCourtHear; - - /** - * 是否指派仲裁员,1是，2否 - */ - private Integer pendingAppointArbotrar; - /** 是否仲裁反请求 */ - private Integer adjudicaCounter; - /** - * 仲裁反请求原因 - */ - private String adjudicaCounterReason; - /** 是否管辖异议申请 */ - private Integer objectiJuris; - - /** 被申请人是否书面审理 */ - private Integer respondentIsWrittenHear; - - - /** - * 案件仲裁员 - */ - private List arbitrators; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CasePayDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CasePayDTO.java deleted file mode 100644 index 0c92a68..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CasePayDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.dto; - -import com.ruoyi.wisdomarbitrate.domain.CaseAttach; -import lombok.Data; - -import java.util.List; - -/** - * 案件缴费传入对象 - */ -@Data -public class CasePayDTO { - /** - * 案件id - */ - private List caseIds; - - /** - * 订单金额 单位:分 - */ - private int totalFee; - /** - * 交易类型 native（扫码） / jsapi(小程序) / app / h5 - */ - private String tradeType; - /** - * 支付方式 wxpay(微信) alipay(支付宝) - */ - private String platform; - /** - * 支付方式 0线上支付，1线下支付 - */ - private Integer payType; - /** - * 缴费凭证 - */ - private List payOrderList; - /** - * 批号 - */ - private String batchNumber; -} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseNumRule.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/casenumrule/CaseNumRule.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseNumRule.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/casenumrule/CaseNumRule.java index 327036f..dc2da0a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseNumRule.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/casenumrule/CaseNumRule.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.casenumrule; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/DeptIdentify.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/dept/DeptIdentify.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/DeptIdentify.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/dept/DeptIdentify.java index 3f5df95..bfaf1fe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/DeptIdentify.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/dept/DeptIdentify.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.dept; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/dept/SealManage.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/dept/SealManage.java index 3b835d8..b3fd253 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/dept/SealManage.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.dept; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/miniprogress/IdentityAuthentication.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/miniprogress/IdentityAuthentication.java index 441e2f2..1d85a2a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/miniprogress/IdentityAuthentication.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.miniprogress; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/BatchCaseApplication.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/BatchCaseApplication.java index 72abf5a..923828a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/BatchCaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/BatchCaseApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.mscase; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/CaseAttach.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/CaseAttach.java index e39680a..cc42447 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/CaseAttach.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.mscase; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/CaseLogRecord.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/CaseLogRecord.java index 0441575..44aa075 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/CaseLogRecord.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.mscase; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/MsCaseLogRecordDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/MsCaseLogRecordDTO.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java index 856b657..a09bd66 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/MsCaseLogRecordDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain.dto; +package com.ruoyi.wisdomarbitrate.domain.dto.mscase; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/ReservedConference.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/ReservedConference.java index fad99e3..1be0956 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/ReservedConference.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.mscase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealSignRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/SealSignRecord.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealSignRecord.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/SealSignRecord.java index e4e0267..4fbe6a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealSignRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/SealSignRecord.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.mscase; import com.ruoyi.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/sendrecord/SendMailRecord.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/sendrecord/SendMailRecord.java index de3e11e..5c7e08c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/sendrecord/SendMailRecord.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.sendrecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SmsSendRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/sendrecord/SmsSendRecord.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SmsSendRecord.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/sendrecord/SmsSendRecord.java index 9c36063..ce2d92f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SmsSendRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/sendrecord/SmsSendRecord.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.sendrecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/FatchRule.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/template/FatchRule.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/FatchRule.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/template/FatchRule.java index 34fb7d1..8248437 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/FatchRule.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/template/FatchRule.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.template; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/template/TemplateManage.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/template/TemplateManage.java index 5f342ed..004825c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/template/TemplateManage.java @@ -1,6 +1,7 @@ -package com.ruoyi.wisdomarbitrate.domain; +package com.ruoyi.wisdomarbitrate.domain.dto.template; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; import lombok.Data; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ArchivesDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ArchivesDetailVO.java deleted file mode 100644 index dfe4abc..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ArchivesDetailVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper; -import lombok.Data; - -import java.util.List; - -@Data -public class ArchivesDetailVO { - /** - * 案件信息 - */ - private CaseApplication caseApplication; - /** - * 案件日志信息 - */ - private List caseLogRecordList; - /** - * 快递信息 - */ - private List logisticsInfoVOList; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/BookSendVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/BookSendVO.java deleted file mode 100644 index 790e705..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/BookSendVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class BookSendVO { - /** - * 案件id - * 申请人邮箱 - * 被申请人邮箱 - * 申请人快递编号 - * 被申请人快递编号 - */ - private Long id; - private String appEmail; - private String resEmail; - private String apptrackingNum; - private String restrackingNum; - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseDetailVO.java deleted file mode 100644 index b67c73f..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseDetailVO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.ruoyi.wisdomarbitrate.domain.CaseAttach; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class CaseDetailVO { - /** - * ID - */ - private Long id; - /** - * 案件编号 - */ - private String caseNum; - /** - * 申请人姓名 - */ - private String applicantName; - /** - * 被申请人姓名 - */ - private String respondentName; - /** - * 借款开始日期 - */ - private Date loanStartDate; - /** - * 借款结束日期 - */ - private Date loanEndDate; - /** - * 案件标的 - */ - private BigDecimal caseSubjectAmount; - /** - * 申请人主张欠本金 - */ - private BigDecimal claimPrinciOwed; - /** - * 申请人主张欠利息 - */ - private BigDecimal claimInterestOwed; - /** - * 申请人主张违约金 - */ - private BigDecimal claimLiquidDamag; - - /** - * 证据材料 - */ - private List evidenceMaterialList; - /** - * 当前登录人身份类型 - */ - private Integer identityType; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java deleted file mode 100644 index 51e0d62..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.wisdomarbitrate.domain.CaseEvidenceDirectory; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 目录查询返回类 - */ -public class CaseEvidenceDirectoryVO implements Serializable { - private static final long serialVersionUID = 1L; - /** - * id - */ - private Long id; - /** - * 父id - */ - private Long parentId; - - /** - * 证据名称 - */ - private String evidenceName; - - /** - * 附件id - */ - private Integer annexId; - - /** - * 级数 - */ - private Integer series; - - /** - * 案件id - */ - private Long caseId; - - /** 子目录 */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; - - /** - * 附件名称 - */ - private String annexName; - /** - * 附件路径 - */ - private String annexPath; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private Date createTime; - /** - * 创建者 - */ - private String createBy; - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private Date updateTime; - public CaseEvidenceDirectoryVO(){ - } - - public static long getSerialVersionUID() { - return serialVersionUID; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - public String getEvidenceName() { - return evidenceName; - } - - public void setEvidenceName(String evidenceName) { - this.evidenceName = evidenceName; - } - - public Integer getAnnexId() { - return annexId; - } - - public void setAnnexId(Integer annexId) { - this.annexId = annexId; - } - - public Integer getSeries() { - return series; - } - - public void setSeries(Integer series) { - this.series = series; - } - - public Long getCaseId() { - return caseId; - } - - public void setCaseId(Long caseId) { - this.caseId = caseId; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - public String getAnnexName() { - return annexName; - } - - public void setAnnexName(String annexName) { - this.annexName = annexName; - } - - - public void setAnnexPath(String annexPath) { - this.annexPath = annexPath; - } - - - public CaseEvidenceDirectoryVO(CaseEvidenceDirectory caseEvidenceDirectory) { - this.id = caseEvidenceDirectory.getId(); - this.parentId = caseEvidenceDirectory.getParentId(); - this.evidenceName = caseEvidenceDirectory.getEvidenceName(); - this.annexId = caseEvidenceDirectory.getAnnexId(); - this.series = caseEvidenceDirectory.getSeries(); - this.caseId = caseEvidenceDirectory.getCaseId(); - this.children = caseEvidenceDirectory.getChildren(); - this.createTime = caseEvidenceDirectory.getCreateTime(); - this.createBy = caseEvidenceDirectory.getCreateBy(); - this.updateBy = caseEvidenceDirectory.getUpdateBy(); - this.updateTime = caseEvidenceDirectory.getUpdateTime(); - this.annexName = caseEvidenceDirectory.getAnnexName(); - this.annexPath = caseEvidenceDirectory.getAnnexPath(); - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java deleted file mode 100644 index da1e6f2..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -@Data -public class CaseEvidenceVO { - /** - * 案件id - */ - private Long id; - /** - * 案件编号 - */ - private String caseNum; - /** - * 申请人姓名 - */ - private String applicantName; - /** - * 被申请人姓名 - */ - private String respondentName; - /** - * 案件状态 - */ - private Integer caseStatus; - /** - * 房间号 - */ - private Long roomId; - /** - * 开庭时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date scheduleStartTime; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CasePayListVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CasePayListVO.java deleted file mode 100644 index 6c6263e..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CasePayListVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.CaseApplicationPay; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - -@Data -public class CasePayListVO { - /** - * 订单总金额 - */ - private BigDecimal totalFee; - - /** - * 案件总条数 - */ - private int CaseTotal; - - /** - * 案件订单列表 - */ - private List caseApplicationList; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CompareCaseVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CompareCaseVO.java deleted file mode 100644 index 496318f..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CompareCaseVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * 案件前后对比 - * @author wangqiong - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class CompareCaseVO { - /** - * 该版本前的案件 - */ - private CaseApplication beforeCase; - /** - * 该版本后的案件 - */ - private CaseApplication afterCase; - /** - * 变化字段，多个用,拼接 - */ - private String changeColumn; - /** - * 自定义字段变化字段，多个用,拼接 - */ - private String columnValueChangeColumn; - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/LogisticsInfoVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/LogisticsInfoVO.java deleted file mode 100644 index 480a96a..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/LogisticsInfoVO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import lombok.Data; - -@Data -public class LogisticsInfoVO { - /** - * 案件关联人身份类型 - */ - private Integer identityType; - - /** - * 物流信息 - */ - private String logisticsInfo; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SealListVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SealListVO.java deleted file mode 100644 index 785e10a..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SealListVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - -@Data -public class SealListVO { - /** 主键 */ - private Long id; - /** 印章id */ - private String sealId; - /** 印章名称 */ - private String sealName; - /** - * 印章审核状态(0未通过,1通过) - */ - private Integer sealStatus; - /** - * 印章使用状态(0禁用,1启用) - */ - private Integer isUse; - /** - * 附件id - */ - private Integer annexId; - /** - * 附件路径 - */ - private String annexPath; - /** - * 附件类型 - */ - private Integer annexType; -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java deleted file mode 100644 index d39332a..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.Date; - -/** - * @author wangqiong - * @description 发送房间号短信入参类 - * @date 2023-10-10 15:20 - */ -@Data -public class SendRoomNoMessageVO implements Serializable { - private static final long serialVersionUID = 1L; - @NotNull(message = "案件id不能为空") - private Long id; - @NotEmpty(message = "房间号不能为空") - private String roomNo; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date scheduleStartTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date scheduleEndTime; - - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java deleted file mode 100644 index 7817936..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import lombok.Data; - -/** - * @author wangqiong - * @description 待办数量 - * @date 2023-10-17 09:48 - */ -@Data -public class ToDoCount { - - private int caseApply=0; // 立案申请 - private int caseApplyCheck=0; // 待立案审查 - private int caseApplyPay=0; // 待缴费 - private int caseApplyPayCheck=0; // 待缴费确认 - private int caseApplyEvidence=0; //待案件质证 - private int caseApplyGroupCheck=0; // 待组庭审核 - private int caseApplyGroupConfirm=0; // 待组庭确定 -// private int caseApplyGroupNotice; - private int caseApplyArbitrateWay=0; // 待审核仲裁方式 - private int caseApplyGroupOnline=0; // 待开庭审理 - private int caseApplyGroupOffline=0; // 待书面审理 - private int caseApplyAward=0; // 待生成仲裁文书 - private int caseApplyAwardCheck=0; // 待核验仲裁文书 - private int caseApplyAwardConfirm=0; // 待审核仲裁文书 - private int caseApplyAwardSign=0; // 待仲裁文书签名 - private int caseApplyAwardSeal=0; // 待仲裁文书用印 - private int caseApplyAwardSend=0; // 待仲裁文书送达 - private int caseApplyStored=0; // 待案件归档 - private int caseApplyArchived=0; // 已归档 - private int updateOnlineHearDate=0; // 待修改开庭时间 - private int arbitratorApplyAwardConfirm=0; // 待仲裁员审核仲裁文书 -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/UpdateSubmitVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/UpdateSubmitVO.java deleted file mode 100644 index 5c64d69..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/UpdateSubmitVO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 修改案件提交至秘书 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class UpdateSubmitVO { - /** - * 案件id - */ - private Long caseId; - /** - * 版本号 - */ - private Integer version; - /** - * 修改案件的提交状态，0-未提交，1-已提交，2-撤销，3-同意已修改的案件，4-拒绝已修改的案件，5-同意撤销，6-拒绝撤销 - */ - private Integer updateSubmitStatus; - /** - * 是否同意，0-否，1-是 - */ - private Integer isAgree; - /** - * 拒絕原因 - */ - private String reason; - - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/StringIdsReq.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/base/StringIdsReq.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/StringIdsReq.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/base/StringIdsReq.java index fd651c2..445bc97 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/StringIdsReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/base/StringIdsReq.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; +package com.ruoyi.wisdomarbitrate.domain.vo.base; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/WeChatUserVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/miniprogress/WeChatUserVO.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/WeChatUserVO.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/miniprogress/WeChatUserVO.java index a2b20cc..0a5fe07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/WeChatUserVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/miniprogress/WeChatUserVO.java @@ -1,13 +1,10 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; +package com.ruoyi.wisdomarbitrate.domain.vo.miniprogress; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.Date; -import java.util.List; /** * 微信小程序用户注册登录 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ColumnValue.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ColumnValue.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ColumnValue.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ColumnValue.java index 16bb0c1..0911c45 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ColumnValue.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ColumnValue.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; +package com.ruoyi.wisdomarbitrate.domain.vo.mscase; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ReservedConferenceVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ReservedConferenceVO.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ReservedConferenceVO.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ReservedConferenceVO.java index 75851a9..8a42fde 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ReservedConferenceVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ReservedConferenceVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; +package com.ruoyi.wisdomarbitrate.domain.vo.mscase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/TemplateFatchRule.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/template/TemplateFatchRule.java similarity index 81% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/TemplateFatchRule.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/template/TemplateFatchRule.java index b194085..67a6e71 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/TemplateFatchRule.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/template/TemplateFatchRule.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.domain.vo; +package com.ruoyi.wisdomarbitrate.domain.vo.template; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseNumRuleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casenumrule/CaseNumRuleMapper.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseNumRuleMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casenumrule/CaseNumRuleMapper.java index 26a2a84..2d7ea35 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseNumRuleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casenumrule/CaseNumRuleMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.casenumrule; -import com.ruoyi.wisdomarbitrate.domain.CaseNumRule; +import com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/DeptIdentifyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/DeptIdentifyMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/DeptIdentifyMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/DeptIdentifyMapper.java index cf78b09..1cdbf06 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/DeptIdentifyMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/DeptIdentifyMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.dept; -import com.ruoyi.wisdomarbitrate.domain.DeptIdentify; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealManageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/SealManageMapper.java similarity index 72% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealManageMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/SealManageMapper.java index a071eaf..c3554f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealManageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/SealManageMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.dept; -import com.ruoyi.wisdomarbitrate.domain.SealManage; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/IdentityAuthenticationMapper.java similarity index 66% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/IdentityAuthenticationMapper.java index ae6d869..045e14d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/IdentityAuthenticationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/IdentityAuthenticationMapper.java @@ -1,7 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.miniprogress; -import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; public interface IdentityAuthenticationMapper { int insertIdentityAuthentication(IdentityAuthentication identityAuthentication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/WeChatUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/WeChatUserMapper.java similarity index 80% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/WeChatUserMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/WeChatUserMapper.java index 21bdd5c..16c3c02 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/WeChatUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/WeChatUserMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.miniprogress; -import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO; +import com.ruoyi.wisdomarbitrate.domain.vo.miniprogress.WeChatUserVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachLogMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachLogMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachLogMapper.java index b5d1ca9..a6470f6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.mscase; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.CaseAttach; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachMapper.java index ca3bb75..bd7d877 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.mscase; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.CaseAttach; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java similarity index 67% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java index 45bb433..0817fa8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseLogRecordMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.mscase; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.domain.dto.MsCaseLogRecordDTO; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.MsCaseLogRecordDTO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ColumnValueLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ColumnValueLogMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java index 9c257e0..33cf3d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ColumnValueLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.mscase; -import com.ruoyi.wisdomarbitrate.domain.vo.ColumnValue; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.ColumnValue; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ColumnValueMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java similarity index 83% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ColumnValueMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java index a08899e..fe63ee0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ColumnValueMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java @@ -1,8 +1,7 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.mscase; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.FatchRule; -import com.ruoyi.wisdomarbitrate.domain.vo.ColumnValue; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.ColumnValue; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ReservedConferenceMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ReservedConferenceMapper.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ReservedConferenceMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ReservedConferenceMapper.java index 2dac90b..8c356f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ReservedConferenceMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ReservedConferenceMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.mscase; -import com.ruoyi.wisdomarbitrate.domain.ReservedConference; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.ReservedConference; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SendMailRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/sendrecord/SendMailRecordMapper.java similarity index 57% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SendMailRecordMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/sendrecord/SendMailRecordMapper.java index 1efd2eb..57fd469 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SendMailRecordMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/sendrecord/SendMailRecordMapper.java @@ -1,7 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.sendrecord; -import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; -import com.ruoyi.wisdomarbitrate.domain.SendMailRecord; +import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SmsRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/sendrecord/SmsRecordMapper.java similarity index 78% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SmsRecordMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/sendrecord/SmsRecordMapper.java index e8c4740..1c9f18d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SmsRecordMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/sendrecord/SmsRecordMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.sendrecord; -import com.ruoyi.wisdomarbitrate.domain.SmsSendRecord; +import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/FatchRuleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/FatchRuleMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/FatchRuleMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/FatchRuleMapper.java index b331854..e7d654f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/FatchRuleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/FatchRuleMapper.java @@ -1,9 +1,7 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.template; -import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.FatchRule; -import com.ruoyi.wisdomarbitrate.domain.TemplateManage; + +import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/TemplateFatchRuleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/TemplateFatchRuleMapper.java similarity index 77% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/TemplateFatchRuleMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/TemplateFatchRuleMapper.java index 71c7b31..2022b91 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/TemplateFatchRuleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/TemplateFatchRuleMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.template; -import com.ruoyi.wisdomarbitrate.domain.vo.TemplateFatchRule; +import com.ruoyi.wisdomarbitrate.domain.vo.template.TemplateFatchRule; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/TemplateManageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/TemplateManageMapper.java similarity index 68% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/TemplateManageMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/TemplateManageMapper.java index 1789a90..b1b6d03 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/TemplateManageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/template/TemplateManageMapper.java @@ -1,7 +1,6 @@ -package com.ruoyi.wisdomarbitrate.mapper; +package com.ruoyi.wisdomarbitrate.mapper.template; -import com.ruoyi.wisdomarbitrate.domain.SealManage; -import com.ruoyi.wisdomarbitrate.domain.TemplateManage; +import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseNumRuleService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/casenumrule/ICaseNumRuleService.java similarity index 74% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseNumRuleService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/casenumrule/ICaseNumRuleService.java index 67b26bf..0d39ac3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseNumRuleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/casenumrule/ICaseNumRuleService.java @@ -1,7 +1,7 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.casenumrule; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.CaseNumRule; +import com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseNumRuleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/casenumrule/impl/CaseNumRuleServiceImpl.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseNumRuleServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/casenumrule/impl/CaseNumRuleServiceImpl.java index 754e6dd..bfa9a8f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseNumRuleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/casenumrule/impl/CaseNumRuleServiceImpl.java @@ -1,10 +1,9 @@ -package com.ruoyi.wisdomarbitrate.service.impl; +package com.ruoyi.wisdomarbitrate.service.casenumrule.impl; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.wisdomarbitrate.domain.CaseNumRule; -import com.ruoyi.wisdomarbitrate.mapper.CaseNumRuleMapper; -import com.ruoyi.wisdomarbitrate.service.ICaseNumRuleService; +import com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule; +import com.ruoyi.wisdomarbitrate.mapper.casenumrule.CaseNumRuleMapper; +import com.ruoyi.wisdomarbitrate.service.casenumrule.ICaseNumRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IDeptIdentifyService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/IDeptIdentifyService.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IDeptIdentifyService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/IDeptIdentifyService.java index 93f8d09..d0a94a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IDeptIdentifyService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/IDeptIdentifyService.java @@ -1,13 +1,12 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.dept; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.EsignDemoException; -import com.ruoyi.wisdomarbitrate.domain.DeptIdentify; -import com.ruoyi.wisdomarbitrate.domain.FatchRule; -import com.ruoyi.wisdomarbitrate.domain.SealManage; -import com.ruoyi.wisdomarbitrate.domain.TemplateManage; -import com.ruoyi.wisdomarbitrate.domain.vo.SealListVO; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; +import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage; +import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java deleted file mode 100644 index 93b0698..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java +++ /dev/null @@ -1,652 +0,0 @@ -package com.ruoyi.wisdomarbitrate.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; -import com.google.gson.JsonObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.FileTransformation; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.EsignHttpResponse; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.EsignDemoException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SealUtil; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.wisdomarbitrate.domain.*; -import com.ruoyi.wisdomarbitrate.domain.vo.SealListVO; -import com.ruoyi.wisdomarbitrate.domain.vo.TemplateFatchRule; -import com.ruoyi.wisdomarbitrate.mapper.*; -import com.ruoyi.wisdomarbitrate.service.IDeptIdentifyService; -import com.ruoyi.wisdomarbitrate.utils.SignAward; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.wisdomarbitrate.mapper.TemplateFatchRuleMapper; - -import java.io.File; -import java.io.IOException; -import java.time.LocalDate; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static com.ruoyi.common.utils.PageUtils.startPage; -import static com.ruoyi.common.utils.SecurityUtils.getUsername; - -@Service -public class DeptIdentifyServiceImpl implements IDeptIdentifyService { - - @Autowired - private DeptIdentifyMapper deptIdentifyMapper; - @Autowired - private CaseAttachMapper caseAttachMapper; - @Autowired - private SealManageMapper sealManageMapper; - @Autowired - private SysDeptMapper sysDeptMapper; - @Autowired - private SysUserMapper sysUserMapper; - @Autowired - private TemplateManageMapper templateManageMapper; - @Autowired - private SysUserPostMapper sysUserPostMapper; - @Autowired - private TemplateFatchRuleMapper templateFatchRuleMapper; - @Autowired - private FatchRuleMapper fatchRuleMapper; - @Autowired - private SysDictDataMapper dictDataMapper; - - - @Override - @Transactional - public List selectDeptIdentify(DeptIdentify deptIdentify) { - return deptIdentifyMapper.selectDeptIdentify(deptIdentify); - } - - @Override - @Transactional - public DeptIdentify selectDeptIndefiUrl(DeptIdentify deptIdentify) throws EsignDemoException { - List deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify); - DeptIdentify deptIdentifynew = new DeptIdentify(); - if (deptIdentifysnew != null && deptIdentifysnew.size() > 0) { - Gson gson = new Gson(); - DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0); - EsignHttpResponse identifyUrl = SignAward.deptIdentifyUrl(deptIdentifyselect); - JsonObject signUrlJsonObject = gson.fromJson(identifyUrl.getBody(), JsonObject.class); - int code = signUrlJsonObject.get("code").getAsInt(); - if (code == 0) { - JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data"); - String url = signUrlData.get("authUrl").getAsString(); - //获取本次认证授权流程ID - String authFlowId = signUrlData.get("authFlowId").getAsString(); - deptIdentify.setAuthFlowId(authFlowId); - deptIdentifynew.setIdentifyUrl(url); - deptIdentify.setIdentifyDate(new Date()); - int row = deptIdentifyMapper.updateDeptIdentify(deptIdentify); - } - } - return deptIdentifynew; - } - - @Override - @Transactional - public AjaxResult enableDept(DeptIdentify deptIdentify) { - //参数校验 - if (deptIdentify.getId() == null) { - return AjaxResult.error("请检查参数"); - } - List deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify); - DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0); - Integer identifyStatus = deptIdentifyselect.getIdentifyStatus(); - if (identifyStatus != 1) { - return AjaxResult.error("这个认证数据未进行认证，不能启用"); - } - deptIdentifyselect.setIsUse(1); - int i = deptIdentifyMapper.updateDeptIdentify(deptIdentifyselect); - if (i > 0) { - //把其他认证数据置为未使用 - DeptIdentify deptIdentify2 = new DeptIdentify(); - deptIdentify2.setIsUse(1); - List 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(); - } - - @Override - public AjaxResult sealUpload(Long id, String sealName, MultipartFile file) { - try { - if (file.isEmpty()) { - return AjaxResult.error("请选择要上传的文件"); - } - String filePath = RuoYiConfig.getUploadPath(); - // 上传 - String fileName = FileUploadUtils.upload(filePath, file); - DeptIdentify deptIdentify = new DeptIdentify(); - deptIdentify.setId(id); - List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); - if (deptIdentifies != null && deptIdentifies.size() > 0) { - for (DeptIdentify identify : deptIdentifies) { - //先判断企业用户是否授予资源管理权限 - String authFlowId = identify.getAuthFlowId(); - if (authFlowId == null) { - return AjaxResult.error("改机构尚未认证,不能上传自定义公章"); - } - EsignHttpResponse response1 = SealUtil.queryAuthProcess(authFlowId); - JSONObject jsonObject1 = JSONObject.parseObject(response1.getBody()); - int authorizedStatus = jsonObject1.getJSONObject("data").getIntValue("authorizedStatus"); - if (authorizedStatus == 1) {//授权流程状态 0流程过期失效 1已授权 2授权中 3审批未通过 - String prefix = "/profile"; - int startIndex = fileName.indexOf(prefix); - startIndex += prefix.length(); - String annexPath = "home/ruoyi/uploadPath" + fileName.substring(startIndex); - //创建机构图片印章 - //String annexPath = "D:\\develop\\2.jpg"; - - EsignHttpResponse response = SignAward.createOrgByImage(identify, sealName, annexPath); - JSONObject jsonObject = JSONObject.parseObject(response.getBody()); - int code = jsonObject.getIntValue("code"); - if (code == 0) { //业务码，0表示成功，非0表示异常。 - String sealId = jsonObject.getJSONObject("data").getString("sealId"); - //保存到表里 - SealManage sealManage = new SealManage(); - sealManage.setIdentifyId(identify.getId()); - sealManage.setSealName(sealName); - sealManage.setSealId(sealId); - sealManage.setSealStatus(0); //默认为未审核 - sealManage.setIsUse(0); //默认为禁用 - int i = sealManageMapper.insertSealManage(sealManage); - if (i > 0) { - return AjaxResult.success("上传成功"); - } - } - return AjaxResult.error(jsonObject.getString("message")); - } - return AjaxResult.error("企业用户未授予资源管理权限"); - } - } - } catch (IOException e) { - e.printStackTrace(); - } catch (EsignDemoException e) { - e.printStackTrace(); - } - return AjaxResult.error(); - } - - @Override - public AjaxResult receiveNotify(String body) { - /* 请求Body数据格式如下： - { - "action":"SEAL_AUDIT", - "auditStatus":1, - "psnId":"c7e00294**41e7", - "rejectReason":"", - "sealBizType":"COMMON", - "sealId":"af80ba0f-xx-xx-xx-a2da292d7f7f", - "sealName":"赵四的图片印章", - "statusDescription":"通过" - }*/ - //解析body数据 - try { - JSONObject jsonObject = JSONObject.parseObject(body); - String action = jsonObject.getString("action"); - if (action.equals("SEAL_AUDIT")) { //SEAL_AUDIT表示图片印章审核结果通知 - String auditStatus = jsonObject.getString("auditStatus"); - if (auditStatus.equals("1")) { //图片印章审核结果 1通过 ，0驳回 - //审核通过,拿到印章id和机构账号ID - String orgId = jsonObject.getString("orgId"); - String sealId = jsonObject.getString("sealId"); - //查询指定印章详情（机构） - EsignHttpResponse response = SignAward.getOrgSeal(orgId, sealId); - JSONObject jsonObject1 = JSONObject.parseObject(response.getBody()); - if (jsonObject1.getIntValue("code") == 0) { //业务码，0表示成功，非0表示异常。 - int sealStatus = jsonObject1.getJSONObject("data").getIntValue("sealStatus"); - if (sealStatus == 1) { //印章状态 1已启用，2待审核，3审核不通过，4 挂起 - String sealImageDownloadUrl = jsonObject1.getString("sealImageDownloadUrl"); - 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("-", "") + ".pdf"; - 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(); - } - boolean downLoadFile = FileTransformation.downLoadFileByUrl(sealImageDownloadUrl, 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) { - //将附件id保存到公章管理表里 - Integer annexId1 = caseAttach.getAnnexId(); - SealManage sealManage = new SealManage(); - sealManage.setSealId(sealId); - List selectSealList = sealManageMapper.selectSealList(sealManage); - if (selectSealList != null && selectSealList.size() > 0) { - SealManage sealManage1 = selectSealList.get(0); - sealManage1.setAnnexId(annexId1); - sealManage1.setSealStatus(1); //启用 - sealManageMapper.updateSealManage(sealManage1); - } - } - } - } - } - } - } - } catch (EsignDemoException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - return new AjaxResult(200, "success"); - } - - @Override - public List getSealList(DeptIdentify deptIdentify) { - if (deptIdentify.getId() == null) { - return null; - } - SealManage sealManage = new SealManage(); - sealManage.setIdentifyId(deptIdentify.getId()); - List selectSealList = sealManageMapper.selectSealList(sealManage); - if (selectSealList != null && selectSealList.size() > 0) { - for (SealManage sealManage1 : selectSealList) { - Integer annexId = sealManage1.getAnnexId(); - if (annexId != null) { - //根据附件id查询路径 - CaseAttach caseAttach = caseAttachMapper.queryAnnexById(annexId); - String annexName = caseAttach.getAnnexName(); - String prefix = "/profile"; - int startIndex = annexName.indexOf(prefix); - startIndex += prefix.length(); - String annexPath = "/uploadPath" + annexName.substring(startIndex); - sealManage1.setAnnexPath(annexPath); - } else { - sealManage1.setAnnexPath(null); - } - } - } - return selectSealList; - } - - @Override - public AjaxResult updateSealLockStatus(SealManage sealManage) { - sealManageMapper.updateSealManage(sealManage); - return AjaxResult.success(); - } - - @Override - public AjaxResult insertDeptIdentify(DeptIdentify deptIdentify) { - //参数校验 - String identifyName = deptIdentify.getIdentifyName(); - if (identifyName == null) { - AjaxResult.error("请检查参数是否完整"); - } - Integer identifyType = deptIdentify.getIdentifyType(); - if (identifyType == null) { - deptIdentify.setIdentifyType(1); // 设置机构默认为仲裁机构 - } - deptIdentify.setIdentifyStatus(0); //设置认证状态默认为未认证 - deptIdentify.setIsUse(0); //设置机构默认为未启用 - //将机构名称保存到部门表里 - SysDept sysDept = new SysDept(); - sysDept.setDeptName(identifyName); - sysDept.setParentId(0L); - sysDept.setDeptType(1); - int i1 = sysDeptMapper.insertDept(sysDept); - if (i1 > 0) { - /* //将经办人信息存入到用户表里 - Long deptId = sysDept.getDeptId(); - SysUser sysUser = new SysUser(); - sysUser.setDeptId(deptId); - sysUser.setUserName(deptIdentify.getOperUserName()); - sysUser.setNickName(operName); - sysUser.setPhonenumber(operPhone); - SysUser sysUser1 = sysUserMapper.selectUserByUserName(deptIdentify.getOperUserName()); - if (sysUser1== null) { - sysUserMapper.insertUser(sysUser); - } - Long userId = sysUser.getUserId(); - deptIdentify.setDeptId(deptId); - deptIdentify.setUserId(userId); - List sysUserPosts = new ArrayList<>(); - SysUserPost sysUserPost = new SysUserPost(); - sysUserPost.setUserId(userId); - sysUserPost.setPostId(5L); - sysUserPosts.add(sysUserPost); - sysUserPostMapper.batchUserPost(sysUserPosts);*/ - Long deptId = sysDept.getDeptId(); - deptIdentify.setDeptId(deptId); - } - - int i = deptIdentifyMapper.insertDeptIdentify(deptIdentify); - if (i > 0) { - return AjaxResult.success("新增成功"); - } - return AjaxResult.error(); - } - - @Override - public AjaxResult deleteDeptIdentify(Long id) { - DeptIdentify deptIdentify = new DeptIdentify(); - deptIdentify.setId(id); - deptIdentify.setDelFlag(2); - int i = deptIdentifyMapper.updateDeptIdentify(deptIdentify); - if (i > 0) { - //删除部门表数据 - sysDeptMapper.deleteDeptById(id); - return AjaxResult.success("删除成功"); - } - return AjaxResult.error(); - } - - @Override - public AjaxResult updateDeptIdentify(DeptIdentify deptIdentify) { - Long id = deptIdentify.getId(); - if (id == null) { - return AjaxResult.error(); - } - DeptIdentify deptIdentifyNew = new DeptIdentify(); - deptIdentifyNew.setId(id); - List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentifyNew); - if (deptIdentifies != null && deptIdentifies.size() > 0) { - DeptIdentify deptIdentify1 = deptIdentifies.get(0); - if (deptIdentify1.getIdentifyStatus() == 1) { - return AjaxResult.error("已认证的机构不允许修改"); - } - int i = deptIdentifyMapper.updateDeptIdentify(deptIdentify); - if (i > 0) { - //修改部门表数据 - SysDept sysDept = new SysDept(); - sysDept.setDeptId(deptIdentify1.getDeptId()); - sysDept.setDeptName(deptIdentify.getIdentifyName()); - sysDeptMapper.updateDept(sysDept); - return AjaxResult.success("修改成功"); - } - } - - return null; - } - - @Override - public AjaxResult insertTemplate(TemplateManage templateManage, MultipartFile file) { - //参数校验 - if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null) { - return AjaxResult.error("请检查参数是否完整"); - } - if (templateManage.getTemType() == null) { - templateManage.setTemType(1); //默认模板类型为1(裁决书) - } - try { - String filePath = RuoYiConfig.getUploadPath(); - // 上传 - String fileName = FileUploadUtils.upload(filePath, file); - String prefix = "/profile"; - int startIndex = fileName.indexOf(prefix); - startIndex += prefix.length(); - String annexPath = "uploadPath" + fileName.substring(startIndex); - templateManage.setTemOrigPath(annexPath); - String format = getFileExtension(fileName); - templateManage.setTemFormat(format); - String subFileName = fileName.substring(fileName.lastIndexOf("/") + 1); - templateManage.setFileName(subFileName); - templateManage.setCreateBy(getUsername()); - int i = templateManageMapper.insertTemplateManage(templateManage); - if (i > 0) { - return AjaxResult.success("新增成功"); - } - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - @Override - public AjaxResult updateTemplate(TemplateManage templateManage, MultipartFile file) { - Long id = templateManage.getId(); - if (id == null) { - return AjaxResult.error(); - } - try { - if (file != null && file.getSize() > 0) { - String filePath = RuoYiConfig.getUploadPath(); - // 上传 - String fileName = FileUploadUtils.upload(filePath, file); - String prefix = "/profile"; - int startIndex = fileName.indexOf(prefix); - startIndex += prefix.length(); - String annexPath = "uploadPath" + fileName.substring(startIndex); - templateManage.setTemOrigPath(annexPath); - String subFileName = fileName.substring(fileName.lastIndexOf("/") + 1); - templateManage.setFileName(subFileName); - String format = getFileExtension(fileName); - templateManage.setTemFormat(format); - } - templateManage.setUpdateBy(getUsername()); - int i = templateManageMapper.updateTemplateManage(templateManage); - if (i > 0) { - return AjaxResult.success("修改成功"); - } - } catch (IOException e) { - e.printStackTrace(); - } - return AjaxResult.error(); - } - - @Override - public AjaxResult deleteTemplate(Long id) { - TemplateManage templateManage = new TemplateManage(); - templateManage.setId(id); - templateManage.setDelFlag(2); - int i = templateManageMapper.updateTemplateManage(templateManage); - if (i > 0) { - return AjaxResult.success("删除成功"); - } - return AjaxResult.error(); - } - - @Override - public List getTemplateList(DeptIdentify deptIdentify) { - TemplateManage templateManage = new TemplateManage(); - templateManage.setIdentifyId(deptIdentify.getId()); - List templateManages = templateManageMapper.selectTemplateList(templateManage); - if (templateManages != null && templateManages.size() > 0) { - for (TemplateManage manage : templateManages) { - //根据机构id查询机构名称 - Long identifyId = manage.getIdentifyId(); - if (identifyId != null) { - deptIdentify.setId(identifyId); - List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); - if (deptIdentifies != null && deptIdentifies.size() > 0) { - manage.setIdentifyName(deptIdentifies.get(0).getIdentifyName()); - } - } - } - } - return templateManages; - } - - @Override - public List selectPostUserByDeptId(DeptIdentify deptIdentify) { - List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); - if (deptIdentifies != null && deptIdentifies.size() > 0) { - deptIdentify = deptIdentifies.get(0); - if (deptIdentify.getDeptId() != null) { - //默认查询经办人的 - Long roleId = 106L; - List sysUserList = sysUserMapper.selectRoleUserByDeptId(deptIdentify.getDeptId(), roleId); - return sysUserList; - } - - } - return null; - } - - @Override - public AjaxResult bindHandler(DeptIdentify deptIdentify) { - if (deptIdentify.getId() == null || deptIdentify.getUserId() == null) { - return AjaxResult.error("请检查参数是否完整"); - } - //根据userid查询用户信息 - SysUser sysUser = sysUserMapper.selectUserById(deptIdentify.getUserId()); - if (sysUser != null) { - deptIdentify.setOperName(sysUser.getNickName()); - deptIdentify.setOperPhone(sysUser.getPhonenumber()); - deptIdentify.setOperUserName(sysUser.getUserName()); - deptIdentify.setUserId(deptIdentify.getUserId()); - //更新 - int i = deptIdentifyMapper.updateDeptIdentify(deptIdentify); - if (i > 0) { - return AjaxResult.success("绑定成功"); - } - } - return null; - } - - @Override - public List getFatchRuleByTemplateid(TemplateManage templateManage) { - - FatchRule fatchRule = new FatchRule(); - fatchRule.setTemplateId(templateManage.getId()); - return fatchRuleMapper.selectFatchRuleList(fatchRule); - - } - - @Override - @Transactional - public AjaxResult saveFatchRules(TemplateManage templateManage) { - TemplateFatchRule templateFatchRule = new TemplateFatchRule(); - templateFatchRule.setTemplateId(templateManage.getId()); - templateFatchRuleMapper.deleteTemplateFatchRule(templateManage.getId()); - - List fatchRules = templateManage.getFatchRules(); - - Map columnmap = fatchRules.stream().collect(Collectors.groupingBy(fatchRule -> fatchRule.getColumn(), Collectors.counting())); - Stream columnStream = columnmap.entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey()); - List strlist1 = new ArrayList<>(); - columnStream.forEach(column -> { - strlist1.add(column.toString()); - }); - if(strlist1!=null&&strlist1.size()>0){ - throw new ServiceException("字段' " + String.join(",", strlist1) + " '重复"); - } - - Map columnNamemap = fatchRules.stream().collect(Collectors.groupingBy(fatchRule -> fatchRule.getColumnName(), Collectors.counting())); - Stream columnNameStream = columnNamemap.entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey()); - List strlist2 = new ArrayList<>(); - columnNameStream.forEach(column -> { - strlist2.add(column.toString()); - }); - if(strlist2!=null&&strlist2.size()>0){ - throw new ServiceException("字段' " + String.join(",", strlist2) + " '重复"); - } - - if(fatchRules!=null&&fatchRules.size()>0){ - for (FatchRule fatchRule : fatchRules) { - //保存抓取规则数据 - fatchRuleMapper.insertFatchRule(fatchRule); - //保存模板抓取规则关联关系 - Long fatchRuleId = fatchRule.getId(); - if(fatchRuleId!=null){ - templateFatchRule.setFatchRuleId(fatchRuleId); - templateFatchRuleMapper.insertTemplateFatchRule(templateFatchRule); - } - } - return AjaxResult.success("新增成功"); - } - return AjaxResult.error(); - } - - @Override - public List selectColumnandComment() { - List fatchRules = new ArrayList<>(); - FatchRule fatchRuleselect = new FatchRule(); - fatchRuleselect.setDatabaseName("test_smart_arbitration"); - fatchRules = fatchRuleMapper.selectColumnandComment(fatchRuleselect); - return fatchRules; - } - - @Override - public FatchRule selectColumnbycomment(FatchRule fatchRule) { - fatchRule.setDatabaseName("test_smart_arbitration"); - FatchRule fatchRulesel = fatchRuleMapper.selectColumnbycomment(fatchRule); - return fatchRulesel; - } - - /** - * 根据模板id查询模板字段列表 - * @param templateManage - * @return - */ - @Override - public List getTemplateInfoById(TemplateManage templateManage) { - FatchRule fatchRule = new FatchRule(); - fatchRule.setTemplateId(templateManage.getId()); - List fatchRuleList = fatchRuleMapper.selectFatchRuleList(fatchRule); - if(CollectionUtil.isEmpty(fatchRuleList)){ - fatchRuleList=new ArrayList<>(); - } - List columnNameList = fatchRuleList.stream().map(FatchRule::getColumnName).collect(Collectors.toList()); - // 在系统表中查询案件内置字段 - SysDictData sysDictData = new SysDictData(); - sysDictData.setDictType("case_built_type"); - List dictDataList = dictDataMapper.selectDictDataList(sysDictData); - if(CollectionUtil.isNotEmpty(dictDataList)){ - for (SysDictData dictData : dictDataList) { - if(StrUtil.isEmpty(dictData.getDictLabel())||columnNameList.contains(dictData.getDictLabel())){ - continue; - } - FatchRule rule=new FatchRule(); - rule.setColumn(dictData.getDictValue()); - rule.setColumnName(dictData.getDictLabel()); - fatchRuleList.add(rule); - } - } - - return fatchRuleList; - } - - private String getFileExtension(String fileName) { - int lastDotIndex = fileName.lastIndexOf("."); - if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) { - return fileName.substring(lastDotIndex + 1); - } - return ""; - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/IdentityAuthenticationService.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/IdentityAuthenticationService.java index 1ae0f29..d53b3eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/IdentityAuthenticationService.java @@ -1,8 +1,8 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.miniprogress; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; public interface IdentityAuthenticationService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/WeChatUserService.java similarity index 55% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/WeChatUserService.java index 9d9735f..6d01cdc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/WeChatUserService.java @@ -1,9 +1,8 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.miniprogress; -import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.domain.vo.miniprogress.WeChatUserVO; /** * 微信小程序用户注册登录 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/miniprogress/impl/IdentityAuthenticationServiceImpl.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/impl/IdentityAuthenticationServiceImpl.java index d6e69d7..9a3de7a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/impl/IdentityAuthenticationServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.service.impl; +package com.ruoyi.wisdomarbitrate.service.miniprogress.impl; import cn.hutool.core.codec.Base64; @@ -8,13 +8,10 @@ import cn.hutool.crypto.symmetric.SymmetricCrypto; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.mapper.IdentityAuthenticationMapper; -import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.mapper.miniprogress.IdentityAuthenticationMapper; +import com.ruoyi.wisdomarbitrate.service.miniprogress.IdentityAuthenticationService; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.common.profile.ClientProfile; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/impl/WeChatUserServiceImpl.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/impl/WeChatUserServiceImpl.java index 1256c3c..f4af82a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/impl/WeChatUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.service.impl; +package com.ruoyi.wisdomarbitrate.service.miniprogress.impl; import cn.hutool.core.util.StrUtil; import com.ruoyi.common.constant.CacheConstants; @@ -10,10 +10,10 @@ import com.ruoyi.common.utils.SmsUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO; -import com.ruoyi.wisdomarbitrate.mapper.IdentityAuthenticationMapper; -import com.ruoyi.wisdomarbitrate.service.WeChatUserService; +import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; +import com.ruoyi.wisdomarbitrate.domain.vo.miniprogress.WeChatUserVO; +import com.ruoyi.wisdomarbitrate.mapper.miniprogress.IdentityAuthenticationMapper; +import com.ruoyi.wisdomarbitrate.service.miniprogress.WeChatUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java similarity index 64% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java index f4fcf77..bc8b80a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseLogRecordService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java @@ -1,7 +1,7 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.mscase; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java similarity index 83% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java index c1c8c71..a89349e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java @@ -1,9 +1,7 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.mscase; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; -import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO; -import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.ReservedConferenceVO; import javax.servlet.http.HttpServletRequest; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CallBackHandleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CallBackHandleServiceImpl.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CallBackHandleServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CallBackHandleServiceImpl.java index ad0635f..4b2a204 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CallBackHandleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CallBackHandleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wisdomarbitrate.service.impl; +package com.ruoyi.wisdomarbitrate.service.mscase.impl; import com.ruoyi.CallBackService; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java index 78ff7f5..cc01476 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseLogRecordServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.wisdomarbitrate.service.impl; +package com.ruoyi.wisdomarbitrate.service.mscase.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper; -import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.mapper.mscase.CaseLogRecordMapper; +import com.ruoyi.wisdomarbitrate.service.mscase.ICaseLogRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/sendrecord/ISendMailRecordService.java similarity index 55% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/sendrecord/ISendMailRecordService.java index b0564a6..063dddc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/sendrecord/ISendMailRecordService.java @@ -1,6 +1,6 @@ -package com.ruoyi.wisdomarbitrate.service; +package com.ruoyi.wisdomarbitrate.service.sendrecord; -import com.ruoyi.wisdomarbitrate.domain.SendMailRecord; +import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/SendMailRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/sendrecord/impl/SendMailRecordServiceImpl.java similarity index 64% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/SendMailRecordServiceImpl.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/sendrecord/impl/SendMailRecordServiceImpl.java index 25d9bed..76207f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/SendMailRecordServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/sendrecord/impl/SendMailRecordServiceImpl.java @@ -1,9 +1,8 @@ -package com.ruoyi.wisdomarbitrate.service.impl; +package com.ruoyi.wisdomarbitrate.service.sendrecord.impl; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.domain.SendMailRecord; -import com.ruoyi.wisdomarbitrate.mapper.SendMailRecordMapper; -import com.ruoyi.wisdomarbitrate.service.ISendMailRecordService; +import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord; +import com.ruoyi.wisdomarbitrate.mapper.sendrecord.SendMailRecordMapper; +import com.ruoyi.wisdomarbitrate.service.sendrecord.ISendMailRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java index 64475ac..fc03931 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java @@ -5,8 +5,8 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; +import com.ruoyi.wisdomarbitrate.mapper.mscase.CaseLogRecordMapper; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/OCRUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/OCRUtils.java index b64d55d..9aa18c1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/OCRUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/OCRUtils.java @@ -2,25 +2,19 @@ package com.ruoyi.wisdomarbitrate.utils; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.wisdomarbitrate.domain.FatchRule; -import com.tencentcloudapi.bsca.v20210811.models.LicenseSummary; +import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.common.profile.ClientProfile; import com.tencentcloudapi.common.profile.HttpProfile; import com.tencentcloudapi.ocr.v20181119.OcrClient; import com.tencentcloudapi.ocr.v20181119.models.*; -import org.json.JSONArray; -import org.json.JSONObject; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.*; -import java.util.stream.Collectors; public class OCRUtils { //API的SecretId diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java index d667398..c402fdd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java @@ -9,9 +9,9 @@ import com.ruoyi.common.exception.EsignDemoException; import com.ruoyi.common.utils.EsignApplicaConfig; import com.ruoyi.common.utils.EsignHttpHelper; import com.ruoyi.common.utils.SealUtil; -import com.ruoyi.wisdomarbitrate.domain.vo.StringIdsReq; -import com.ruoyi.wisdomarbitrate.domain.DeptIdentify; -import com.ruoyi.wisdomarbitrate.domain.SealSignRecord; +import com.ruoyi.wisdomarbitrate.domain.vo.base.StringIdsReq; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.SealSignRecord; import java.util.List; import java.util.Map; diff --git a/ruoyi-system/src/main/resources/generator/config.properties b/ruoyi-system/src/main/resources/generator/config.properties index f486d3d..c326d39 100644 --- a/ruoyi-system/src/main/resources/generator/config.properties +++ b/ruoyi-system/src/main/resources/generator/config.properties @@ -1,12 +1,12 @@ jdbc.driverClass=com.mysql.cj.jdbc.Driver -jdbc.url=jdbc:mysql://121.40.189.20:3306/test_smart_arbitration?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true +jdbc.url=jdbc:mysql://121.40.189.20:3306/mediation_system?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true jdbc.user=root jdbc.password=YMzc157# #目标模块项目路径 -targetprojectpath=E:/WorkCode/SH/Mediation-Backend/ruoyi-system +targetprojectpath=D:/ymPro/Mediation-Backend/ruoyi-system #模块名称 -moduleName=diagnosis +moduleName=mscase #表名 -tableName=country +tableName=ms_case_application #主键 -premaryId=CountryId +premaryId=id diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 6a946d5..4b2f4a4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name,u.specialty, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card from ms_sys_user u @@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select * from ms_case_attach_log @@ -71,7 +71,7 @@ - select * from ms_case_attach_log diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachMapper.xml similarity index 94% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachMapper.xml index 7abee19..ae73ba7 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachMapper.xml @@ -2,7 +2,7 @@ - + @@ -43,13 +43,13 @@ - select annex_id,case_appli_id,annex_name,annex_path,annex_type,note,use_id,use_account from ms_case_attach where case_appli_id =#{id} - select annex_id,case_appli_id,annex_name,annex_path,annex_type,note,use_id,use_account from ms_case_attach @@ -86,7 +86,7 @@ - select * from ms_case_attach diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml index 3af330f..c5d8283 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseLogRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml @@ -2,7 +2,7 @@ - + @@ -28,7 +28,7 @@ ) - select cl.case_node caseNode ,cl.case_node_time caseNodeTime ,cl.notes ,cl.id ,cl.case_appli_id caseAppliId, cl.create_by createBy,cl.create_nick_name createNickName,cl.create_time createTime,cl.update_by updateBy,cl.update_time updateTime, CASE cl.case_node when 0 then '立案申请' when 1 then '提交立案申请' when 2 then '立案审查' diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ColumnValueLogMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueLogMapper.xml similarity index 94% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ColumnValueLogMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueLogMapper.xml index 3aa67ea..b4a7aff 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ColumnValueLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueLogMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ColumnValueMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueMapper.xml similarity index 94% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ColumnValueMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueMapper.xml index 1eb2563..e582551 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ColumnValueMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ReservedConferenceMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ReservedConferenceMapper.xml similarity index 89% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ReservedConferenceMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ReservedConferenceMapper.xml index 23abae0..193e69d 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ReservedConferenceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ReservedConferenceMapper.xml @@ -2,7 +2,7 @@ - + insert into ms_reserved_conference( @@ -28,7 +28,7 @@ #{item} - select id, case_id caseId,room_id roomId,schedule_start_time scheduleStartTime,schedule_end_time scheduleEndTime,user_id userId from ms_reserved_conference where case_id=#{caseId} diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml index 7e9439a..acbfbe9 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SmsRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SmsRecordMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SmsRecordMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SmsRecordMapper.xml index d2035ce..0ed8356 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SmsRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SmsRecordMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/FatchRuleMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/FatchRuleMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/FatchRuleMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/FatchRuleMapper.xml index c2f0c6e..85e5fb9 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/FatchRuleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/FatchRuleMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateFatchRuleMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateFatchRuleMapper.xml similarity index 92% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateFatchRuleMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateFatchRuleMapper.xml index 9bf31b6..41f44d0 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateFatchRuleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateFatchRuleMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateManageMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateManageMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml index fd5adb6..798b8bc 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/tkgenerator/pom.xml b/tkgenerator/pom.xml index f21bb5c..46b2da0 100644 --- a/tkgenerator/pom.xml +++ b/tkgenerator/pom.xml @@ -14,7 +14,7 @@ tkgenerator tkmappergenerator - 17 + 11 diff --git a/tkgenerator/src/main/resources/generator/config.properties b/tkgenerator/src/main/resources/generator/config.properties index f486d3d..c326d39 100644 --- a/tkgenerator/src/main/resources/generator/config.properties +++ b/tkgenerator/src/main/resources/generator/config.properties @@ -1,12 +1,12 @@ jdbc.driverClass=com.mysql.cj.jdbc.Driver -jdbc.url=jdbc:mysql://121.40.189.20:3306/test_smart_arbitration?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true +jdbc.url=jdbc:mysql://121.40.189.20:3306/mediation_system?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true jdbc.user=root jdbc.password=YMzc157# #目标模块项目路径 -targetprojectpath=E:/WorkCode/SH/Mediation-Backend/ruoyi-system +targetprojectpath=D:/ymPro/Mediation-Backend/ruoyi-system #模块名称 -moduleName=diagnosis +moduleName=mscase #表名 -tableName=country +tableName=ms_case_application #主键 -premaryId=CountryId +premaryId=id -- 2.54.0