ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整ws问题- 和考勤记录搜索问题

Browse Source
This commit is contained in:
aikai 2024-08-08 10:52:29 +08:00
parent 6fb5829db0
commit a255936315
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/punchrecord/AttendancePunchRecordMapper.java
View File

@ -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));
}

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/hik/HikServiceImpl.java
View File

@ -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 {