事件指派完成 ,查询当前用户告警信息

2025-08-17 07:02:49 +08:00
parent 247ad09a58
commit 2716324734
28 changed files with 1141 additions and 60 deletions
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java
@@ -1,28 +1,28 @@
 package org.dromara.property.controller;

-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.property.domain.bo.AttendanceArrangementBo;
-import org.dromara.property.domain.vo.AttendanceArrangementVo;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.AttendanceUserGroupVo;
-import org.dromara.property.domain.bo.AttendanceUserGroupBo;
-import org.dromara.property.service.IAttendanceUserGroupService;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.property.domain.bo.AttendanceUserGroupBo;
+import org.dromara.property.domain.vo.AttendanceUserGroupVo;
+import org.dromara.property.service.IAttendanceUserGroupService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;

 /**
 * 排班明细
@@ -67,7 +67,7 @@ public class AttendanceUserGroupController extends BaseController {
    @SaCheckPermission("Property:userGroup:query")
    @GetMapping("/{id}")
    public R<AttendanceUserGroupVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                            @PathVariable("id") Long id) {
        return R.ok(attendanceUserGroupService.queryById(id));
    }

@@ -114,4 +114,17 @@ public class AttendanceUserGroupController extends BaseController {
    public TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery) {
        return attendanceUserGroupService.queryScheduleView(bo, pageQuery);
    }
+
+    /**
+     * 查询今天的排班人员信息
+     *
+     * @return 返回排班人员信息
+     */
+    @RepeatSubmit()
+    @GetMapping("/query/currentDay")
+    public R<List<AttendanceUserGroupVo>> queryCurrentSchedu() {
+        return R.ok(attendanceUserGroupService.queryAttendPersonInfo(new Date()));
+    }
+
+
 }
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java
@@ -4,7 +4,6 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.property.api.domain.vo.RemoteBuildingVo;
 import org.dromara.property.domain.*;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +13,6 @@ import java.io.Serializable;
 import java.time.LocalDate;


-
 /**
 * 排班明细视图对象 attendance_user_group
 *
@@ -47,11 +45,11 @@ public class AttendanceUserGroupVo implements Serializable {
    @ExcelProperty(value = "员工ID")
    private Long employeeId;

-//    /**
-//     * 员工姓名
-//     */
-//    @ExcelProperty(value = "员工姓名")
-//    private String employeeName;
+    /**
+     * 员工姓名
+     */
+    @ExcelProperty(value = "员工姓名")
+    private String employeeName;

    /**
     * 部门ID
@@ -59,11 +57,11 @@ public class AttendanceUserGroupVo implements Serializable {
    @ExcelProperty(value = "部门ID")
    private Long deptId;

-//    /**
-//     * 部门名称
-//     */
-//    @ExcelProperty(value = "部门名称")
-//    private String deptName;
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;

    /**
     * 开始日期
@@ -89,8 +87,6 @@ public class AttendanceUserGroupVo implements Serializable {

    private RemoteUserVo remoteUserVo;

-    private String deptName;
-
    private AttendanceArea attendanceArea;


--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java
@@ -0,0 +1,37 @@
+package org.dromara.property.dubbo;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.property.api.RemoteAttendanceService;
+import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
+import org.dromara.property.domain.vo.AttendanceUserGroupVo;
+import org.dromara.property.service.IAttendanceUserGroupService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 排班远程服务调用实现
+ *
+ * @author lxj
+ */
+@DubboService
+@RequiredArgsConstructor
+public class RemoteAttendanceServiceImpl implements RemoteAttendanceService {
+
+
+    private final IAttendanceUserGroupService attendanceUserGroupService;
+
+
+    public List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date) {
+        List<AttendanceUserGroupVo> ls = attendanceUserGroupService.queryAttendPersonInfo(date);
+        if (CollUtil.isNotEmpty(ls)) {
+            return MapstructUtils.convert(ls, RemoteAttendanceUserGroupVo.class);
+        }
+        return null;
+    }
+
+
+}
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java
@@ -1,11 +1,13 @@
 package org.dromara.property.service;

-import org.dromara.property.domain.vo.AttendanceUserGroupVo;
-import org.dromara.property.domain.bo.AttendanceUserGroupBo;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.property.domain.AttendanceUserGroup;
+import org.dromara.property.domain.bo.AttendanceUserGroupBo;
+import org.dromara.property.domain.vo.AttendanceUserGroupVo;

 import java.util.Collection;
+import java.util.Date;
 import java.util.List;

 /**
@@ -66,5 +68,14 @@ public interface IAttendanceUserGroupService {
     */
    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);

+    /**
+     * 根据日期查询人员排班信息
+     *
+     * @param date 日期
+     * @return 返回排班人员信息
+     */
+    List<AttendanceUserGroupVo> queryAttendPersonInfo(Date date);
+
    TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery);
+
 }
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java
@@ -158,6 +158,14 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
        return baseMapper.deleteByIds(ids) > 0;
    }

+    @Override
+    public List<AttendanceUserGroupVo> queryAttendPersonInfo(Date date) {
+        LambdaQueryWrapper<AttendanceUserGroup> lqw = Wrappers.lambdaQuery();
+        lqw.le(AttendanceUserGroup::getStartDate, date)
+            .ge(AttendanceUserGroup::getEndDate, date);
+        // 如果今天存在排班信息。那么处理排班人员信息
+        return this.baseMapper.selectVoList(lqw);
+    }

    /**
     * 查询排班的班表视图