From 3879ce28b68fae13b86f49c639ad38bdf8ed9332 Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 14 Oct 2025 14:25:59 +0800 Subject: [PATCH] bug --- .../ruoyi-admin/src/main/resources/application-prod.yml | 2 +- .../main/java/org/dromara/common/utils/AsyncUtil.java | 3 ++- .../controller/app/SubConstructionUserAppController.java | 3 +-- .../contractor/service/ISubConstructionUserService.java | 5 +++-- .../service/impl/SubConstructionUserServiceImpl.java | 9 ++++++--- .../design/service/impl/DesVolumeFileServiceImpl.java | 9 ++++++--- .../java/org/dromara/job/inspection/InspectionJob.java | 5 +++-- .../project/service/impl/BusAttendanceServiceImpl.java | 3 +-- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml index 404b8d6b..41f67e9e 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml @@ -179,7 +179,7 @@ sms: # 配置源类型用于标定配置来源(interface,yaml) config-type: yaml # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 - restricted: true + restricted: false # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 minute-max: 1 # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/AsyncUtil.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/AsyncUtil.java index fecea7cf..3dc5eb45 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/AsyncUtil.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/AsyncUtil.java @@ -10,6 +10,7 @@ import org.dromara.sms4j.core.factory.SmsFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import java.util.LinkedHashMap; import java.util.List; @Component @@ -21,7 +22,7 @@ public class AsyncUtil { public void sendSms(List mobileList, String config) { SmsBlend smsBlend = SmsFactory.getSmsBlend(config); for (String mobile : mobileList) { - SmsResponse smsResponse = smsBlend.sendMessage(mobile, (String) null); + SmsResponse smsResponse = smsBlend.sendMessage(mobile, new LinkedHashMap()); if (!smsResponse.isSuccess()) { log.error("验证码短信发送异常 => {}", smsResponse); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java index 608437be..77026685 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java @@ -3,7 +3,6 @@ package org.dromara.contractor.controller.app; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotNull; import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -136,7 +135,7 @@ public class SubConstructionUserAppController { @Log(title = "施工人员", businessType = BusinessType.OTHER) @PostMapping("/face/comparison") public R faceComparison(@RequestParam("file") MultipartFile file) { - return R.ok(constructionUserService.faceComparison(file)); + return R.ok(constructionUserService.faceComparison(file,null )); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java index 12ade3eb..47a8872b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java @@ -213,10 +213,11 @@ public interface ISubConstructionUserService extends IService longs = roleService.selectRoleIdsByName("项目经理"); + ArrayList longs = new ArrayList<>(); + List longs1 = roleService.selectRoleIdsByName("项目经理"); + longs.addAll(longs1); longs.add(1961028169115197442L); List sysUsers = userService.selectUserByRoleIdsAndProjectId(longs, byId.getProjectId()); @@ -693,9 +695,10 @@ public class DesVolumeFileServiceImpl extends ServiceImpl longs = roleService.selectRoleIdsByName("项目经理"); + ArrayList longs = new ArrayList<>(); + List longs1 = roleService.selectRoleIdsByName("项目经理"); + longs.addAll(longs1); longs.add(1961028169115197442L); - List sysUsers = userService.selectUserByRoleIdsAndProjectId(longs, byId.getProjectId()); asyncUtil.sendSms(sysUsers.stream().map(SysUser::getPhonenumber).toList(), "config5"); asyncUtil.sendSse(sysUsers.stream().map(SysUser::getUserId).toList(), "有新的蓝图审批完成"); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/inspection/InspectionJob.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/inspection/InspectionJob.java index 54da9726..cbedf9c1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/inspection/InspectionJob.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/inspection/InspectionJob.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Component; import java.time.LocalDate; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; @Slf4j @@ -62,7 +63,7 @@ public class InspectionJob { if (phonenumber == null) { continue; } - SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, (String) null); + SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, new LinkedHashMap()); if (!smsResponse.isSuccess()) { log.error("验证码短信发送异常 => {}", smsResponse); } @@ -105,7 +106,7 @@ public class InspectionJob { if (phonenumber == null) { continue; } - SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, (String) null); + SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, new LinkedHashMap()); if (!smsResponse.isSuccess()) { log.error("验证码短信发送异常 => {}", smsResponse); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java index 4ef733aa..f741558c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java @@ -15,7 +15,6 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -356,7 +355,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl