From a255936315b333a1114b868a07b6699b7e00aef2 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 8 Aug 2024 10:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4ws=E9=97=AE=E9=A2=98-=20?=
 =?UTF-8?q?=E5=92=8C=E8=80=83=E5=8B=A4=E8=AE=B0=E5=BD=95=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance/punchrecord/AttendancePunchRecordMapper.java   | 4 ++--
 .../yudao/module/smartfactory/service/hik/HikServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/punchrecord/AttendancePunchRecordMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/punchrecord/AttendancePunchRecordMapper.java
index f753f1a8..a06e027e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/punchrecord/AttendancePunchRecordMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/punchrecord/AttendancePunchRecordMapper.java
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Mapper
 public interface AttendancePunchRecordMapper extends BaseMapperX<AttendancePunchRecordDO> {
-
+//
     default PageResult<AttendancePunchRecordDO> selectPage(AttendancePunchRecordPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<AttendancePunchRecordDO>()
                 .eqIfPresent(AttendancePunchRecordDO::getUserId, reqVO.getUserId())
@@ -36,7 +36,7 @@ public interface AttendancePunchRecordMapper extends BaseMapperX<AttendancePunch
                 .betweenIfPresent(AttendancePunchRecordDO::getPunchTime, reqVO.getPunchTime())
                 .eqIfPresent(AttendancePunchRecordDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(AttendancePunchRecordDO::getImage, reqVO.getImage())
-                .betweenIfPresent(AttendancePunchRecordDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(AttendancePunchRecordDO::getShouldPunchTime, reqVO.getCreateTime())
                 .orderByDesc(AttendancePunchRecordDO::getId));
     }
 
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/hik/HikServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/hik/HikServiceImpl.java
index f16b0214..f19ddc2d 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/hik/HikServiceImpl.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/hik/HikServiceImpl.java
@@ -43,7 +43,7 @@ public class HikServiceImpl implements HikService {
         JSONObject body = new JSONObject();
         body.set("cameraIndexCode", cameraCode);
         body.set("streamType", streamType);
-        body.set("protocol", "wss");
+        body.set("protocol", "ws");
         body.set("transmode", 1);
         body.set("expand", "streamform=ps");
         try {