From ddb19b77597138815fbb432c90e7124ea6eb3a8e Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Wed, 3 Sep 2025 08:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA,=20=20=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=89=93=E5=8D=A1=E4=B8=8D=E5=9C=A8=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/KQDeviceExchangeProcessor.java | 29 ++++++------ .../evo/common/controller/TestController.java | 46 +++++++++---------- .../src/main/resources/templates/error.html | 5 +- .../src/main/resources/templates/success.html | 5 +- .../main/resources/templates/user_info.html | 5 +- 5 files changed, 47 insertions(+), 43 deletions(-) diff --git a/evo-admin/src/main/java/com/evo/attendance/processor/impl/KQDeviceExchangeProcessor.java b/evo-admin/src/main/java/com/evo/attendance/processor/impl/KQDeviceExchangeProcessor.java index 59aab25..f459a80 100644 --- a/evo-admin/src/main/java/com/evo/attendance/processor/impl/KQDeviceExchangeProcessor.java +++ b/evo-admin/src/main/java/com/evo/attendance/processor/impl/KQDeviceExchangeProcessor.java @@ -227,7 +227,8 @@ public class KQDeviceExchangeProcessor implements PunchTheClockStrategyExchangeP RzAttendance beforeAttendance = rzAttendanceMapper.queryNowDayAttendanceByStatisticalIdAndDate(Long.valueOf(userId),DateUtils.addDays(date, -1)); if(beforeAttendance.getWorkStartTime() != null && beforeAttendance.getWorkEndTime() == null){ notBeforeEndTimeMessage = " - 昨天未打下班卡"; - sendAbnormalAttendance(userId, beforeAttendance.getWorkStartTime()); + //上班打卡不在推送消息, 影响消息返回, 可能引发打卡异常 + // sendAbnormalAttendance(userId, beforeAttendance.getWorkStartTime()); } } catch (Exception e) { e.printStackTrace(); @@ -235,19 +236,19 @@ public class KQDeviceExchangeProcessor implements PunchTheClockStrategyExchangeP } return (rzAttendanceMapper.updateRzAttendance(attendance) > 0) ? initMessage(0, "打卡成功"+notBeforeEndTimeMessage) : initMessage(1, "打卡失败"+notBeforeEndTimeMessage); } - - @Async - public void sendAbnormalAttendance(Long userId, Date date){ - try { - SysStaff sysStaff = sysStaffMapper.selectById(userId); - if(sysStaff != null && StringUtils.isNotEmpty(sysStaff.getOpenid())){ - SysDept sysDept = sysDeptMapper.selectById(sysStaff.getDeptId()); - sendClientService.sendAbnormalAttendance(sysDept != null ? sysDept.getDeptName() : "未知",sysStaff.getName(), "昨天下班未打卡", date, sysStaff.getOpenid()); - } - } catch (Exception e) { - log.error("推送公众号打卡异常失败, 原因为: {}", e.getMessage(), e); - } - } +// +// @Async +// public void sendAbnormalAttendance(Long userId, Date date){ +// try { +// SysStaff sysStaff = sysStaffMapper.selectById(userId); +// if(sysStaff != null && StringUtils.isNotEmpty(sysStaff.getOpenid())){ +// SysDept sysDept = sysDeptMapper.selectById(sysStaff.getDeptId()); +// sendClientService.sendAbnormalAttendance(sysDept != null ? sysDept.getDeptName() : "未知",sysStaff.getName(), "昨天下班未打卡", date, sysStaff.getOpenid()); +// } +// } catch (Exception e) { +// log.error("推送公众号打卡异常失败, 原因为: {}", e.getMessage(), e); +// } +// } /*** 撤销卡 diff --git a/evo-admin/src/main/java/com/evo/common/controller/TestController.java b/evo-admin/src/main/java/com/evo/common/controller/TestController.java index f8c68d8..30b25ac 100644 --- a/evo-admin/src/main/java/com/evo/common/controller/TestController.java +++ b/evo-admin/src/main/java/com/evo/common/controller/TestController.java @@ -1,5 +1,8 @@ package com.evo.common.controller; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.evo.attendance.service.IRzAttendanceService; import com.evo.attendance.service.IRzAttendanceStatisticalService; @@ -12,6 +15,10 @@ import com.evo.personnelMatters.mapper.RzOverTimeMapper; import com.evo.restaurant.service.IRzRestaurantStatisticsService; import com.evo.system.domain.SysStaff; import com.evo.system.service.ISysStaffService; +import com.evo.wechat.TemplateMessageUtil; +import com.evo.wechat.dto.AbnormalAttendanceTemplate; +import com.evo.wechat.dto.MessageTemplate; +import com.evo.wechat.service.GZHAccessTokenService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -57,6 +64,10 @@ public class TestController { private IRzAttendanceService rzAttendanceService; @Resource private RzAttendanceDetailService rzAttendanceDetailService; + @Resource + private GZHAccessTokenService gzhAccessTokenService; + + /** * 清洗加班 */ @@ -84,31 +95,20 @@ public class TestController { @GetMapping("/message") - public String message(Model model, String code) { + public String message(String openid) { - System.out.println(code); -// String res = AccessTokenUtil.accessToken2("wx268e32962db19f5f", "84a6065165ec82862c5e03a010a6dc6c", code); -// System.out.println(res); -// JSONObject obj = JSONObject.parseObject(res); -// String openid = obj.getString("openid"); - SysStaff user = new SysStaff(); - user.setOpenid(code); - model.addAttribute("user", user); - //model.addAttribute("openid", openid); -// ErrorData templateData = new ErrorData(); -// -// templateData.setThing1((JSONObject)JSON.toJSON(Collections.asMap("value", "研发部"))); -// templateData.setThing2((JSONObject)JSON.toJSON(Collections.asMap("value", "张三")));//动态跟换车牌号 -// templateData.setConst4((JSONObject)JSON.toJSON(Collections.asMap("value", "昨天下班未打卡")));//动态跟换车牌号 -// templateData.setTime6((JSONObject)JSON.toJSON(Collections.asMap("value", DateUtil.format(new Date(), "yyyy年MM月dd日"))));//动态跟换车牌号 -// -// MessageTemplateSendData sendData = new MessageTemplateSendData(); -// sendData.setTouser(openid); -// sendData.setTemplate_id("z9sy-38K-iC5MAWHbxcxwg1c-9oNTFWeCOoy6B6zdKY"); -// sendData.setData((JSONObject)JSON.toJSON(templateData)); -// TemplateMessageUtil.templateMessageSend(GZHAccessTokenService.gzhAccessToken(), sendData); + AbnormalAttendanceTemplate templateData = new AbnormalAttendanceTemplate(); - return "user_info.html"; + templateData.setThing1((JSONObject) JSON.toJSON(Collections.asMap("value", "研发部"))); + templateData.setThing2((JSONObject)JSON.toJSON(Collections.asMap("value", "张三")));//动态跟换车牌号 + templateData.setConst4((JSONObject)JSON.toJSON(Collections.asMap("value", "昨天下班未打卡")));//动态跟换车牌号 + templateData.setTime6((JSONObject)JSON.toJSON(Collections.asMap("value", DateUtil.format(new Date(), "yyyy年MM月dd日"))));//动态跟换车牌号 + + MessageTemplate sendData = new MessageTemplate(); + sendData.setTouser(openid); + sendData.setTemplate_id("z9sy-38K-iC5MAWHbxcxwg1c-9oNTFWeCOoy6B6zdKY"); + sendData.setData((JSONObject)JSON.toJSON(templateData)); + return TemplateMessageUtil.templateMessageSend(gzhAccessTokenService.gzhAccessToken(), sendData); } diff --git a/evo-admin/src/main/resources/templates/error.html b/evo-admin/src/main/resources/templates/error.html index c67596b..bdf4645 100644 --- a/evo-admin/src/main/resources/templates/error.html +++ b/evo-admin/src/main/resources/templates/error.html @@ -3,7 +3,7 @@ - 河北伊特机械设备有限公司-提交失败 + 河北伊特机械设备制造有限公司-提交失败 @@ -50,7 +50,8 @@
-

河北伊特机械设备有限公司考勤系统

+

河北伊特机械设备制造有限公司

+

考勤系统

信息提交结果

diff --git a/evo-admin/src/main/resources/templates/success.html b/evo-admin/src/main/resources/templates/success.html index 1e63830..040b826 100644 --- a/evo-admin/src/main/resources/templates/success.html +++ b/evo-admin/src/main/resources/templates/success.html @@ -3,7 +3,7 @@ - 河北伊特机械设备有限公司-提交成功 + 河北伊特机械设备制造有限公司-提交成功 @@ -41,7 +41,8 @@
-

河北伊特机械设备有限公司考勤系统

+

河北伊特机械设备制造有限公司

+

考勤系统

信息提交结果

diff --git a/evo-admin/src/main/resources/templates/user_info.html b/evo-admin/src/main/resources/templates/user_info.html index 60696dc..0983166 100644 --- a/evo-admin/src/main/resources/templates/user_info.html +++ b/evo-admin/src/main/resources/templates/user_info.html @@ -3,7 +3,7 @@ - 河北伊特机械设备有限公司-用户信息完善 + 河北伊特机械设备制造有限公司-用户信息完善 @@ -48,7 +48,8 @@
-

河北伊特机械制造有限公司考勤系统

+

河北伊特机械设备制造有限公司

+

考勤系统

请填写以下信息并提交