by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加事件自动指派操作

Browse Source
This commit is contained in:
15683799673
2025-08-30 06:36:27 +08:00
parent 0b22169649
commit 3c6595e591
15 changed files with 150 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java
View File

@@ -6,7 +6,9 @@ import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.property.api.RemoteAttendanceService;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.property.service.attendanceService.IAttendanceAreaDeviceService;
import org.dromara.property.service.attendanceService.IAttendanceUserGroupService;
import java.util.Date;
@@ -23,6 +25,7 @@ public class RemoteAttendanceServiceImpl implements RemoteAttendanceService {
private final IAttendanceUserGroupService attendanceUserGroupService;
private final IAttendanceAreaDeviceService attendanceAreaDeviceService;
public List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date) {
@@ -33,4 +36,12 @@ public class RemoteAttendanceServiceImpl implements RemoteAttendanceService {
return null;
}
@Override
public List<RemoteAttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp) {
List<AttendanceUserGroupVo> ls = attendanceUserGroupService.queryAttendByCurrDateAndDeviceIp(date, deviceIp);
if (CollUtil.isNotEmpty(ls)) {
return BeanUtil.copyToList(ls, RemoteAttendanceUserGroupVo.class);
}
return null;
}
}

14
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceUserGroupMapper.java
View File

@@ -1,8 +1,12 @@
package org.dromara.property.mapper.attendanceMapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.Date;
import java.util.List;
/**
* 排班明细Mapper接口
@@ -12,4 +16,12 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/
public interface AttendanceUserGroupMapper extends BaseMapperPlus<AttendanceUserGroup, AttendanceUserGroupVo> {
/**
* 根据日期和设备ip 查询当前设备所在区域的排班人员信息
*
* @param date 查询日期
* @param deviceIp 设备ip
* @return 返回排班人员列表
*/
List<AttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(@Param("currDate") Date currDate, @Param("deviceIp") String deviceIp);
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaDeviceService.java
View File

@@ -6,6 +6,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@@ -65,4 +66,5 @@ public interface IAttendanceAreaDeviceService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

9
ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceUserGroupService.java
View File

@@ -75,6 +75,15 @@ public interface IAttendanceUserGroupService {
*/
List<AttendanceUserGroupVo> queryAttendPersonInfo(Date date);
TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery);
/**
* 根据日期和设备ip 查询当前设备所在区域的排班人员信息
*
* @param date 查询日期
* @param deviceIp 设备ip
* @return 返回排班人员列表
*/
List<AttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp);
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceUserGroupServiceImpl.java
View File

@@ -299,4 +299,9 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
return TableDataInfo.build(attendanceArrangementVoPage);
}
@Override
public List<AttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp) {
return this.baseMapper.queryAttendByCurrDateAndDeviceIp(date, deviceIp);
}
}

16
ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceUserGroupMapper.xml
View File

@@ -4,4 +4,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.attendanceMapper.AttendanceUserGroupMapper">
<select id="queryAttendByCurrDateAndDeviceIp"
resultType="org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo">
SELECT
a.*
FROM
attendance_user_group a
LEFT JOIN attendance_arrangement_area b ON a.schedule_id = b.shcedule_id
LEFT JOIN attendance_area_device c ON b.area_id = c.area_id
LEFT JOIN sis_device_manage d ON c.device_manage_id = d.id
WHERE
d.device_ip = #{deviceIp}
AND a.start_date &lt;= #{currDate}
AND a.end_date &gt; #{currDate}
</select>
</mapper>