From 65c5d33a21f13e18bfada58c19d094cdee1db3e3 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Tue, 16 Sep 2025 10:01:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E5=B7=B2=E9=A2=84=E7=BA=A6=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=AE=A4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MeetBookingServiceImpl.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index 99fd0112..a0d07cba 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -29,10 +29,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.time.DayOfWeek; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.stream.Collectors; @@ -176,15 +177,16 @@ public class MeetBookingServiceImpl implements IMeetBookingService { @Override public List appointmentIdList(String meetId) { - // 计算当前周的起止时间 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(new Date()); - // 设置为周一 - calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - Date startOfWeek = calendar.getTime(); - // 加6天变为周日 - calendar.add(Calendar.DAY_OF_MONTH, 6); - Date endOfWeek = calendar.getTime(); + // 获取本周一00:00:00 + LocalDateTime startOfWeek = LocalDate.now() + .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) + .atStartOfDay(); + + // 获取本周日23:59:59 + LocalDateTime endOfWeek = LocalDate.now() + .with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)) + .atTime(23, 59, 59, 999000000); + // 构建查询条件 LambdaQueryWrapper bookingLambdaQueryWrapper = new LambdaQueryWrapper<>(); bookingLambdaQueryWrapper.eq(MeetBooking::getMeetId, meetId) @@ -196,7 +198,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { return new ArrayList<>(); } List meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class); - String[] weekStr = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; + String[] weekStr = {"星期一", "星期二", "星期三", "星期四", "星期五", "星期六","星期日"}; List meetBookingWeekList = new ArrayList<>(); SimpleDateFormat df = new SimpleDateFormat("HH"); List residentUnitVolist = residentUnitMapper.selectVoList(); @@ -214,11 +216,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService { .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null); s.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getUserName() : null); } - //设置指定的Date对象不设置默认返回当天的星期 - calendar.setTime(s.getScheduledStarttime()); - //获取当前时间的星期 - int firstDayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); - s.setWeek(weekStr[firstDayOfWeek - 1]); + //设置当天的星期 + s.setWeek(weekStr[LocalDate.now().getDayOfWeek().getValue()-1]); String str = df.format(s.getScheduledStarttime()); int a = Integer.parseInt(str); s.setSlots(a <= 12 ? "上午" : "下午"); -- 2.43.0 From 6932bb4fa96d7914fb005bb3c9912432d8538a11 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Tue, 16 Sep 2025 11:01:37 +0800 Subject: [PATCH 2/5] fix --- .../dromara/property/service/impl/MeetBookingServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index a0d07cba..5b4a7897 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -198,7 +198,6 @@ public class MeetBookingServiceImpl implements IMeetBookingService { return new ArrayList<>(); } List meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class); - String[] weekStr = {"星期一", "星期二", "星期三", "星期四", "星期五", "星期六","星期日"}; List meetBookingWeekList = new ArrayList<>(); SimpleDateFormat df = new SimpleDateFormat("HH"); List residentUnitVolist = residentUnitMapper.selectVoList(); @@ -216,8 +215,6 @@ public class MeetBookingServiceImpl implements IMeetBookingService { .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null); s.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getUserName() : null); } - //设置当天的星期 - s.setWeek(weekStr[LocalDate.now().getDayOfWeek().getValue()-1]); String str = df.format(s.getScheduledStarttime()); int a = Integer.parseInt(str); s.setSlots(a <= 12 ? "上午" : "下午"); -- 2.43.0 From bfada06cfeb58fc67c1d3a96a00b156f298964a8 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Tue, 16 Sep 2025 17:22:43 +0800 Subject: [PATCH 3/5] fix --- .../dromara/property/service/impl/MeetBookingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index 5b4a7897..8acbe055 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -212,7 +212,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { } if (CollUtil.isNotEmpty(remoteUserVos)) { ResidentPersonVo residentPersonVo = remoteUserVos.stream() - .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null); + .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null); s.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getUserName() : null); } String str = df.format(s.getScheduledStarttime()); -- 2.43.0 From 26da3d3eb481b549a62736435c632ee794163024 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Wed, 17 Sep 2025 17:03:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(sis):=20=E4=BF=AE=E5=A4=8D=20E8=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=B8=8A=E4=BC=A0=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/sis/dubbo/RemoteSisAuthServiceImpl.java | 2 +- .../dromara/sis/dubbo/RemoteVisitorServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSisAuthServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSisAuthServiceImpl.java index 19723b59..6c9be2b8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSisAuthServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteSisAuthServiceImpl.java @@ -195,7 +195,7 @@ public class RemoteSisAuthServiceImpl implements RemoteSisAuthService { ApiResp imgResult = e8PlatformApi.uploadFace(imgByte); Assert.isTrue(imgResult.getSuccess(), "图片上传E8平台失败：" + imgResult.getMessage() + "--" + person.getName() + "----" + person.getId()); log.info("e8平台上传照片完成"); - String e8ImgUrl = imgResult.getResult(); + String e8ImgUrl = imgResult.getMessage(); count++; // 图片上传完成步进器+1 log.info("e8同步新建人员"); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java index 4ffdb4d7..a35ae7e5 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java @@ -51,8 +51,9 @@ public class RemoteVisitorServiceImpl implements RemoteVisitorService { byte[] zipByte = imageUtil.compressImageToRequirements(imgByte); - imgUrl = e8PlatformApi.uploadFace(zipByte).getResult(); - Assert.notNull(imgUrl, "e8平台上传访客照片失败"); + ApiResp imgUrlRes = e8PlatformApi.uploadFace(zipByte); + Assert.isTrue(imgUrlRes.getSuccess(), imgUrlRes.getMessage()); + imgUrl = imgUrlRes.getMessage(); } VisitorAddReq req = new VisitorAddReq(); req.setVisitorName(visitor.getVisitorName()); @@ -61,12 +62,11 @@ public class RemoteVisitorServiceImpl implements RemoteVisitorService { req.setVisitorStartTime(visitor.getVisitorStartTime()); req.setVistorEndTime(visitor.getVistorEndTime()); req.setVisitorFaceImg(imgUrl); - ApiResp res = e8PlatformApi.addVisitor(req); - Assert.notNull(res, "e8平台新增访客登记失败"); + ApiResp res = e8PlatformApi.addVisitor(req); + Assert.isTrue(res.getSuccess(), res.getMessage()); return res.getCode() == 0 - ? Map.of("code", 200, "data", - JSONUtil.toBean(JSONUtil.toJsonStr(res.getResult()), VisitorAddRes.class).getId()) + ? Map.of("code", 200, "data", res.getResult().getId()) : Map.of("code", 500, "data", res.getMessage()); } catch (Exception e) { log.info(e.getMessage()); -- 2.43.0 From 7f377d7453680997cfadc5195f51dbb44a209c71 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Wed, 17 Sep 2025 17:04:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(sis):=20=E4=BF=AE=E5=A4=8D=20E8=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=B8=8A=E4=BC=A0=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java index a35ae7e5..0dca5116 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteVisitorServiceImpl.java @@ -1,7 +1,6 @@ package org.dromara.sis.dubbo; import cn.hutool.core.lang.Assert; -import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -- 2.43.0