From e646b0033376f56e00443c06c89b831d85f47f17 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Fri, 19 Apr 2024 09:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BC=9A=E8=AE=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mscase/MsVideoConferenceController.java | 10 ++++++++-- .../domain/vo/mscase/MsCaseApplicationReq.java | 4 ++++ .../mscase/impl/MsCaseApplicationServiceImpl.java | 15 +++++++++------ .../mscase/impl/MsSignSealServiceImpl.java | 2 +- .../com/ruoyi/wisdomarbitrate/utils/SmsUtils.java | 5 +++-- .../mscase/MsCaseApplicationMapper.xml | 6 ++++++ 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java index 7d47ad6..02b28f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.AnnexTypeEnum; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; @@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.util.Objects; /** * 视频会议控制层 @@ -31,6 +33,7 @@ import javax.validation.Valid; * @Date 2024/01/8 * @Version V1.0 */ +@CrossOrigin(origins = "*") @RestController @RequestMapping("/video") public class MsVideoConferenceController extends BaseController { @@ -71,6 +74,10 @@ public class MsVideoConferenceController extends BaseController { // officeFlag,fileName为annexPath JSONArray jsonArray = caseApplicationService.uploadOnlyOffice(fileName,caseId); if(jsonArray!=null && jsonArray.size() > 0) { + // 先删除之前的附件 + if(Objects.equals(annexType, AnnexTypeEnum.MEDIATE_BOOK.getCode())) { + msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseId, annexType); + } MsCaseAttach caseAttach=null; for (Object obj : jsonArray) { JSONObject jsonObject = (JSONObject) obj; @@ -125,8 +132,7 @@ public class MsVideoConferenceController extends BaseController { .useId(SecurityUtils.getUserId()) .useAccount(SecurityUtils.getUsername()) .build(); - // 先删除之前的附件 - msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseId,annexType); + msCaseAttachMapper.save(caseAttach); return caseAttach.getAnnexId(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java index db8600d..07df6e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java @@ -120,6 +120,10 @@ public class MsCaseApplicationReq { */ private Integer roleType; private Long userId; + /** + * 案件id + */ + private Long caseId; /** * 是否需要用印，0-不需要，1-需要 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index f86a633..ccc5de2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -1710,7 +1710,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { sendMailRecord.setMailContent(sendContent); sendMailRecord.setMailName(subject); sendMailRecord.setSendTime(new Date()); - sendMailRecord.setCreateBy(SecurityUtils.getUsername()); +// sendMailRecord.setCreateBy(SecurityUtils.getUsername()); sendMailRecord.setCreateTime(new Date()); sendMailRecord.setMailSubject(subject); sendMailRecord.setMailFromAddress(emailFrom); @@ -2132,13 +2132,14 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { msCaseApplicationMapper.updateByPrimaryKeySelective(application); // 根据案件id查询案件 MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(application.getId()); + caseApplication.setHearDate(application.getHearDate()); long l = System.currentTimeMillis(); ExecutorService executor = ThreadUtil.createThreadPool(); CompletableFuture.runAsync(() -> { // 发送开庭短信 if (CollectionUtil.isNotEmpty(vo.getHerDates())) { - List affiliates = selectAffliatesByCaseId(application.getId()); - caseApplication.setHearDate(application.getHearDate()); + List affiliates = selectAffliatesByCaseId(caseApplication.getId()); + // 申请人发送开庭日期短信 sendHearDateSms(caseApplication, affiliates); @@ -2157,9 +2158,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { meditorAffliate.setEmail(sysUser.getEmail()); String roomUuid = null; // 线上调解 - if (StrUtil.isNotEmpty(application.getMediationMethod()) && application.getMediationMethod().equals("1")) { + if (StrUtil.isNotEmpty(caseApplication.getMediationMethod()) && caseApplication.getMediationMethod().equals("1")) { // 获取短信链接uuid - MeetingInfoVO meetingInfoVO = MeetingInfoVO.builder().userId(sysUser.getUserId()).userName(sysUser.getUserName()).caseId(application.getId()).roomId(application.getRoomId()).build(); + MeetingInfoVO meetingInfoVO = MeetingInfoVO.builder().userId(sysUser.getUserId()).userName(sysUser.getUserName()).caseId(caseApplication.getId()).roomId(caseApplication.getRoomId()).build(); roomUuid = shortMessageService.buildMeetingInfoRecord(meetingInfoVO); // 短信模板：2130103 线上调解时间和会议通知 尊敬的用户，您的{2}线上开庭时间为{3}，会议链接https://txroom.xayunmei.com/#/home?{4}，请点击链接参加会议，如非本人操作，请忽略本短信. @@ -3196,7 +3197,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { affiliateBase = new MsCaseAffiliateBase(); } affiliateBase.setApplicant(affiliate); - applicantName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA); + if(!applicantName.toString().contains(affiliate.getName()+Constants.CN_SPLIT_COMMA)) { + applicantName.append(affiliate.getName()).append(Constants.CN_SPLIT_COMMA); + } break; case 2: if(affiliateBase==null){ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index 261a5ae..60f6c4b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -1176,7 +1176,7 @@ public class MsSignSealServiceImpl implements MsSignSealService { sendMailRecord.setSendTime(new Date()); sendMailRecord.setMailSubject("签署后的调解书"); sendMailRecord.setFileIds(fileId!=null?fileId.toString():null); - sendMailRecord.setCreateBy(SecurityUtils.getUsername()); +// sendMailRecord.setCreateBy(SecurityUtils.getUsername()); sendMailRecord.setCreateTime(new Date()); sendMailRecord.setMailFromAddress(emailFrom); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SmsUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SmsUtils.java index 97dfd51..90bbcc1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SmsUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SmsUtils.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.json.JSONObject; import com.ruoyi.common.enums.SMSStatusEnum; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ThreadUtil; import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam; import com.ruoyi.system.domain.entity.sms.MsSmsTemplate; @@ -122,7 +121,7 @@ public class SmsUtils { smsSendRecord.setSendTime(new Date()); smsSendRecord.setPhone(phone); smsSendRecord.setCreateTime(new Date()); - smsSendRecord.setCreateBy(SecurityUtils.getUsername()); +// smsSendRecord.setCreateBy(SecurityUtils.getUsername()); // SendSmsRequest request = new SendSmsRequest(phone, template.getTemplateId(), templateParamSet, application.getId()); req.setPhoneNumberSet(new String[]{"+86" + phone}); req.setTemplateId(template.getTemplateId()); @@ -151,6 +150,8 @@ public class SmsUtils { recordParam.setParamValue(paramValue); recordParams.add(recordParam); } +// recordParamMapper.batchInsert(recordParams); +// shortMessageService.insertShortMessageHistoryRecord(smsSendRecord,recordParams); ExecutorService executor = ThreadUtil.createThreadPool(); CompletableFuture.runAsync(() -> { recordParamMapper.batchInsert(recordParams); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml index 5117d4d..ff0f35a 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml @@ -70,6 +70,9 @@ AND c.case_flow_id = #{req.caseFlowId} + + AND c.id = #{req.caseId} + AND c.case_num = #{req.caseNum} @@ -141,6 +144,9 @@ AND c.case_flow_id = #{req.caseFlowId} + + AND c.id = #{req.caseId} + AND c.case_num = #{req.caseNum} -- 2.54.0