From cfdaeea133776a7378e42cfa1cb4a7e88bd44652 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 10 Oct 2025 15:37:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=8F=96=E5=80=BC=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=AE=A4=E4=B8=8D=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integrated/controller/FeedbackController.java | 2 +- .../service/impl/MeetingRoomServiceImpl.java | 10 ++++++++++ .../com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java index f22d1bc60..becf028c6 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java @@ -194,7 +194,7 @@ public class FeedbackController { List voList = dictResult.getData().stream().map(item -> { FeedbackTypeVO vo = new FeedbackTypeVO(); - vo.setId(item.getId()); + vo.setId(item.getItemValue()); vo.setLabel(item.getLabel()); return vo; }).collect(Collectors.toList()); diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java index 28990e28d..7fba6f673 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java @@ -205,12 +205,22 @@ public class MeetingRoomServiceImpl extends ServiceImpl equipmentList = meetingRoomEquipmentMapper.selectList(queryWrapper); + // 如果没有任何设备关联记录，直接返回空Map + if (CollectionUtils.isEmpty(equipmentList)) { + return Collections.emptyMap(); + } + // 2. 查询设备详细信息 List equipIds = equipmentList.stream() .map(MeetingRoomEquipmentEntity::getEquipId) .distinct() .collect(Collectors.toList()); + // 如果设备ID列表为空，也直接返回空Map + if (CollectionUtils.isEmpty(equipIds)) { + return Collections.emptyMap(); + } + Map equipmentInfoMap = meetingEquipmentMapper.selectBatchIds(equipIds) .stream() .collect(Collectors.toMap(MeetingEquipmentEntity::getId, e -> e)); diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java index d396d2125..e053cc989 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java @@ -21,7 +21,7 @@ public class FeedbackTypeVO implements Serializable { * 字典项ID */ @Schema(description = "字典项ID") - private Long id; + private String id; /** * 标签名称 From e8fd7808062fcbf307e4f55e318bd7565a2f3cee Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 10 Oct 2025 15:43:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integrated/controller/MaintenanceOrderController.java | 2 +- .../java/com/bsd/pjcloud/integrated/vo/MaintenanceTypeVO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java index 2a852639c..0b805a9e3 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java @@ -226,7 +226,7 @@ public class MaintenanceOrderController { List voList = dictResult.getData().stream().map(item -> { MaintenanceTypeVO vo = new MaintenanceTypeVO(); - vo.setId(item.getId()); + vo.setId(item.getItemValue()); vo.setLabel(item.getLabel()); return vo; }).collect(Collectors.toList()); diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MaintenanceTypeVO.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MaintenanceTypeVO.java index a7cec5247..bdd827a4d 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MaintenanceTypeVO.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MaintenanceTypeVO.java @@ -21,7 +21,7 @@ public class MaintenanceTypeVO implements Serializable { * 字典项ID */ @Schema(description = "字典项ID") - private Long id; + private String id; /** * 标签名称 From 1987999f850bff4d773811556aeee732039f4d42 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 13 Oct 2025 00:21:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/pjcloud/integrated/controller/FeedbackController.java | 1 + .../bsd/pjcloud/integrated/controller/VisitorsController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java index becf028c6..2fc85cbe4 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java @@ -65,6 +65,7 @@ public class FeedbackController { wrapper.like(StrUtil.isNotBlank(feedback.getTitle()),FeedbackEntity::getTitle,feedback.getTitle()); wrapper.eq(StrUtil.isNotBlank(feedback.getStatus()),FeedbackEntity::getStatus,feedback.getStatus()); wrapper.eq(StrUtil.isNotBlank(feedback.getType()),FeedbackEntity::getType,feedback.getType()); + wrapper.orderByDesc(FeedbackEntity::getCreateTime).orderByDesc(FeedbackEntity::getStatus); return R.ok(feedbackService.page(page, wrapper)); } diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java index 2e8141b75..473d4e482 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java @@ -67,7 +67,7 @@ public class VisitorsController { */ @Operation(summary = "通过id查询" , description = "通过id查询" ) @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('integrated_visitors_view')" ) +// @PreAuthorize("@pms.hasPermission('integrated_visitors_view')" ) public R getById(@PathVariable("id" ) Long id) { return R.ok(visitorsService.getById(id)); } From d0d3befb8299ddcc36fe4211512b22844b9ee1d5 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 13 Oct 2025 00:59:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1-?= =?UTF-8?q?=E6=8B=9C=E8=AE=BF=E4=BA=BA=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=84=B1?= =?UTF-8?q?=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integrated/controller/AppVisitorController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java index 790017a81..e837cedad 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java @@ -328,6 +328,16 @@ public class AppVisitorController { @Operation(summary = "查询拜访人的信息" , description = "根据拜访人的手机号或者姓名精确查询" ) public R getBFInfo(@RequestParam("keyword") String keyword) { R> userByNameOrMobile = remoteUserService.getUserByNameOrMobile(keyword); + // 对手机号进行脱敏处理 + if (userByNameOrMobile != null && userByNameOrMobile.getData() != null) { + userByNameOrMobile.getData().forEach(user -> { + if (user.getMobile() != null && user.getMobile().length() == 11) { + String mobile = user.getMobile(); + String maskedMobile = mobile.substring(0, 3) + "****" + mobile.substring(7); + user.setMobile(maskedMobile); + } + }); + } return userByNameOrMobile; } From 84dcc8e9c7ad0ac07e339f965bd03e3e05a820d9 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 13 Oct 2025 10:46:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/pjcloud/integrated/controller/AppVisitorController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java index e837cedad..888ed18ea 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java @@ -324,7 +324,7 @@ public class AppVisitorController { @GetMapping("/getBFInfo") - @SysLog("查询拜访人的信息" ) + @SysLog("查询拜访人的信息") @Operation(summary = "查询拜访人的信息" , description = "根据拜访人的手机号或者姓名精确查询" ) public R getBFInfo(@RequestParam("keyword") String keyword) { R> userByNameOrMobile = remoteUserService.getUserByNameOrMobile(keyword);