1, 修改发短信接口

2，添加考勤输出日志，查问题

xueyi-common/xueyi-common-web/src/main/java/com/xueyi/common/web/utils/MyDateUtils.java

@@ -333,13 +333,19 @@ public class MyDateUtils extends org.apache.commons.lang.time.DateUtils {
     }
 
     public static LocalDateTime dateToLocalDateTime(Date date) {
-
         return date.toInstant()
                 .atZone(ZoneId.systemDefault())
                 .toLocalDateTime();
 
     }
 
+    public static LocalDate dateToLocalDate(Date date) {
+        return date.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime().toLocalDate();
+
+    }
+
 
     public static Date localDateToDate(LocalDate date) {
         LocalDateTime ldt = date.atStartOfDay();

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/common/service/IDmHolidayService.java

@@ -4,11 +4,12 @@ import com.xueyi.common.web.entity.service.IBaseService;
 import com.xueyi.system.api.holiday.domain.dto.DmHolidayDto;
 import com.xueyi.system.common.domain.query.DmHolidayQuery;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 public interface IDmHolidayService extends IBaseService<DmHolidayQuery, DmHolidayDto> {
 
     DmHolidayDto getTodayHoliday();
 
-    DmHolidayDto isHoliday(Date date);
+    DmHolidayDto isHoliday(LocalDate date);
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/common/service/impl/IDmHolidayServiceImpl.java

@@ -16,13 +16,16 @@ public class IDmHolidayServiceImpl extends BaseServiceImpl<DmHolidayQuery, DmHol
 
     @Override
     public DmHolidayDto getTodayHoliday() {
-        return isHoliday(new Date());
+        return isHoliday(LocalDateTimeUtil.now().toLocalDate());
     }
 
     @Override
-    public DmHolidayDto isHoliday(Date date) {
+    public DmHolidayDto isHoliday(LocalDate date) {
+        if (date == null) {
+            return null;
+        }
         DmHolidayQuery query = new DmHolidayQuery();
-        query.setDate(LocalDateTimeUtil.of(date).toLocalDate());
+        query.setDate(date);
         DmHolidayDto dto = baseManager.selectTodayHoliday(query);
         if (dto != null) {
             return dto;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/DmVisitorSmsConfigController.java

@@ -178,7 +178,12 @@ public class DmVisitorSmsConfigController extends BaseController<DmVisitorSmsCon
                         DmStaffPo staffPo = staffMapper.selectById(po.getUserId());
 
                         JSONObject json = new JSONObject();
-                        String code = visitRecordsService.genVisitorCode();
+                        String code = po.getVisitorCode();
+                        if (code == null) {
+                            code = visitRecordsService.genVisitorCode();
+                            po.setVisitorCode(code);
+                            visitRecordsMapper.updateById(po);
+                        }
 
                         json.put("code", code);
                         json.put("nickName", visitorsPo.getName());

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmStaffServiceImpl.java

@@ -1,5 +1,7 @@
 package com.xueyi.system.staff.service.impl;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.xueyi.common.core.utils.core.ObjectUtil;
@@ -25,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -143,12 +146,14 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
     }
 
 
-    public DmEmpAttendancePo judgeAttendanceDescStatus(DmEmpAttendancePo po, Date checkDate){
+    public DmEmpAttendancePo judgeAttendanceDescStatus(DmEmpAttendancePo po, LocalDateTime checkDateTime){
         SysDeptExt ext = sysDeptExtMapper.selectWorkTimeByDeptId(po.getDeptId());
         if (null == po) {
             DmEmpAttendancePo ea = new DmEmpAttendancePo();
+            Date checkDate = MyDateUtils.localDateTimeToDate(checkDateTime);
             ea.setCheckInTime(checkDate);
-            DmHolidayPo holidayPo = holidayService.isHoliday(checkDate);
+            logger.info("考勤打卡时间1：{}", JSON.toJSONString(checkDateTime));
+            DmHolidayPo holidayPo = holidayService.isHoliday(checkDateTime.toLocalDate());
             if (MyDateUtils.formatDate(checkDate, MyDateUtils.DEFAULT_TIME_PATTERN).compareTo(ext.getOnDutyHourEnd()) > 0) {//识别时间比考勤上班打卡最晚时间更晚
                 ea.setDescStatus(ATTENDANCE_STATUS_BE_LATER); // 迟到
                 if (holidayPo.getHoliday() == 1) {
@@ -161,7 +166,8 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
             }
             return ea;
         }
-        DmHolidayPo holidayPo = holidayService.isHoliday(po.getCheckInTime());
+        logger.info("考勤打卡时间2：{}", JSON.toJSONString(checkDateTime));
+        DmHolidayPo holidayPo = holidayService.isHoliday(checkDateTime.toLocalDate());
         if (holidayPo.getHoliday() == 1) {//如果是节假日
             po.setDescStatus(ATTENDANCE_STATUS_OVERTIME);//加班
             return po;
@@ -211,8 +217,8 @@ public class DmStaffServiceImpl extends BaseServiceImpl<DmStaffQuery, DmStaffDto
             return ;
         }
 
-        Date checkTime = MyDateUtils.localDateTimeToDate(checkRecords.getRecognizedTime());
-        String checkTimeDateStr = MyDateUtils.formatDate(checkTime, MyDateUtils.DEFAULT_DATE_PATTERN);
+        LocalDateTime checkTime = checkRecords.getRecognizedTime();
+        String checkTimeDateStr = LocalDateTimeUtil.format(checkTime, MyDateUtils.DEFAULT_DATE_PATTERN);
         if (StringUtils.isEmpty(checkTimeDateStr)) {
             return ;
         }