From 9fd8c803ffb15aa0bb9d76ca502cdfc5c2e64d85 Mon Sep 17 00:00:00 2001 From: aikai Date: Fri, 14 Jun 2024 17:10:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/job/equipment/AttendanceMachineJob.java | 12 +++++------- .../service/attendance/AttendanceServiceImpl.java | 2 +- .../equipment/AttendanceMachineServiceImpl.java | 9 ++++----- .../main/resources/mapper/assets/AssetsMapper.xml | 1 + 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/equipment/AttendanceMachineJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/equipment/AttendanceMachineJob.java index 470824dd..e09854e8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/equipment/AttendanceMachineJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/equipment/AttendanceMachineJob.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.job.equipment; +import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.framework.websocket.core.session.WebSocketSessionManager; import cn.iocoder.yudao.module.system.dal.dataobject.equipment.AttendanceMachineDO; @@ -32,18 +33,15 @@ public class AttendanceMachineJob { // 获得所有在线的设备 List attendanceMachineDOS = attendanceMachineService.getListByStatus(); for (AttendanceMachineDO reqDO : attendanceMachineDOS) { - // redis数据不存在，则为离线状态 - if (stringRedisTemplate.opsForValue().get(reqDO.getDeviceNo()) == null) { - + String data = stringRedisTemplate.opsForValue().get(reqDO.getDeviceNo()); + if (StrUtil.isEmpty(data)) { attendanceMachineService.updateAttendanceMachineStatus(reqDO.getDeviceNo(), 0, null); - //同步 删除对应sessionId WebSocketSessionManager webSocketSessionManager = SpringContentUtils.getBean(WebSocketSessionManager.class); webSocketSessionManager.removeSession(webSocketSessionManager.getSessionByDeviceNum(reqDO.getDeviceNo())); - }else { - - attendanceMachineService.updateAttendanceMachineStatus(reqDO.getDeviceNo(), 1, stringRedisTemplate.opsForValue().get(reqDO.getDeviceNo())); + } else { + attendanceMachineService.updateAttendanceMachineStatus(reqDO.getDeviceNo(), 1, data); } } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java index a9184eb6..65f96213 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java @@ -223,7 +223,7 @@ public class AttendanceServiceImpl implements AttendanceService { JSONObject data = JSONUtil.parseObj(o); data.forEach((k, v) -> { JSONObject item = JSONUtil.parseObj(v); - map.put(item.get("date").toString(), item.get("isOffDay").toString()); + map.put(item.get("date").toString(), item.get("holiday").toString()); }); stringRedisTemplate.opsForHash().putAll(key, map); // -- 删除去年的 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/equipment/AttendanceMachineServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/equipment/AttendanceMachineServiceImpl.java index ea195af1..0b5fd591 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/equipment/AttendanceMachineServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/equipment/AttendanceMachineServiceImpl.java @@ -111,10 +111,9 @@ public class AttendanceMachineServiceImpl implements AttendanceMachineService { @Override public void updateAttendanceMachineStatus(String deviceNo, Integer status, String dateTime) { - AttendanceMachineDO updateDO = new AttendanceMachineDO(); updateDO.setStatus(status); - updateDO.setUpdater(getLoginUserId().toString()); +// updateDO.setUpdater(getLoginUserId().toString()); if (status == 1) { updateDO.setRequestTime(LocalDateTime.parse(dateTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); } @@ -130,7 +129,7 @@ public class AttendanceMachineServiceImpl implements AttendanceMachineService { if (attendanceMachineDO == null) { throw exception(ATTENDANCE_MACHINE_NOT_EXISTS); - }else { + } else { if (!passwordEncoder.matches(updateReqVO.getOldPassword(), attendanceMachineDO.getPassword())) { @@ -221,7 +220,7 @@ public class AttendanceMachineServiceImpl implements AttendanceMachineService { deviceNo = new ArrayList<>(); deviceNo.add(addReqVO.getDeviceNo()); - }else { + } else { if (!deviceNo.contains(addReqVO.getDeviceNo())) { @@ -232,7 +231,7 @@ public class AttendanceMachineServiceImpl implements AttendanceMachineService { //设备 用户绑定设备 data.setAttendanceMachineNos(deviceNo); }); - }else if (addReqVO.getMethod() == 1) { + } else if (addReqVO.getMethod() == 1) { usersExtDO.forEach(data -> { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/AssetsMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/AssetsMapper.xml index 72ecab67..a35bc8f1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/AssetsMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/AssetsMapper.xml @@ -35,6 +35,7 @@ SELECT a.id, a.util, + a.assets_no, a.item_json, a.name, a.amount,