diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java index 6b7168a7..607120f0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java @@ -42,44 +42,44 @@ public class SisVisitorController { @GetMapping("/list") public TableDataInfo list(QueryDto dto) { - TableDataInfo tableDataInfo = new TableDataInfo(); - List accessRecordFindResList = new ArrayList<>(); - AccessRecordFindRes accessRecordFindRes = new AccessRecordFindRes(); - accessRecordFindRes.setDeviceName("4#岗亭09"); - accessRecordFindRes.setDoorName("4#岗亭09"); - accessRecordFindRes.setDeviceType(1102); - accessRecordFindRes.setReaderName(""); - accessRecordFindRes.setGatewayType(1); - accessRecordFindRes.setCustomerName("德隆吴鹏"); - accessRecordFindRes.setOrganFullPath("主楼11楼"); - accessRecordFindRes.setPictureUrl("https://bpic.588ku.com/back_list_pic/23/04/21/ef5e2a3dd5cfc336fdcf2fd000474f0f.jpg"); - accessRecordFindRes.setCardType(34); - accessRecordFindRes.setRecordType(2); - accessRecordFindRes.setActionTime(new Date()); - accessRecordFindResList.add(accessRecordFindRes); - tableDataInfo.setRows(accessRecordFindResList); - tableDataInfo.setTotal(1); - tableDataInfo.setCode(200); - return tableDataInfo; +// TableDataInfo tableDataInfo = new TableDataInfo(); +// List accessRecordFindResList = new ArrayList<>(); +// AccessRecordFindRes accessRecordFindRes = new AccessRecordFindRes(); +// accessRecordFindRes.setDeviceName("4#岗亭09"); +// accessRecordFindRes.setDoorName("4#岗亭09"); +// accessRecordFindRes.setDeviceType(1102); +// accessRecordFindRes.setReaderName(""); +// accessRecordFindRes.setGatewayType(1); +// accessRecordFindRes.setCustomerName("德隆吴鹏"); +// accessRecordFindRes.setOrganFullPath("主楼11楼"); +// accessRecordFindRes.setPictureUrl("https://bpic.588ku.com/back_list_pic/23/04/21/ef5e2a3dd5cfc336fdcf2fd000474f0f.jpg"); +// accessRecordFindRes.setCardType(34); +// accessRecordFindRes.setRecordType(2); +// accessRecordFindRes.setActionTime(new Date()); +// accessRecordFindResList.add(accessRecordFindRes); +// tableDataInfo.setRows(accessRecordFindResList); +// tableDataInfo.setTotal(1); +// tableDataInfo.setCode(200); +// return tableDataInfo; -// dto.setPageIndex(1); -// dto.setMaxResultCount(20); -// -// // 10秒内 -// String starTime = DateUtil.format(DateUtil.offset(new Date(), DateField.SECOND, -10), "yyyy-MM-dd HH:mm:ss"); -// String endTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); -// -// AccessRecordFindReq lift = new AccessRecordFindReq(); -// lift.setStartTime(starTime); -// lift.setEndTime(endTime); -// lift.setRecordType(2); -// // 9号电梯 -// lift.setDeviceId(550757939925061L); -// dto.setQueryDto(lift); -//// TableDataInfo nineLiftList = e8PlatformApi.getPageAccessRecordList(dto); -// TableDataInfo pageAccessRecordList = new TableDataInfo(); -// -// return e8PlatformApi.getPageAccessRecordList(dto); + dto.setPageIndex(1); + dto.setMaxResultCount(20); + + // 10秒内 + String starTime = DateUtil.format(DateUtil.offset(new Date(), DateField.SECOND, -10), "yyyy-MM-dd HH:mm:ss"); + String endTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); + + AccessRecordFindReq lift = new AccessRecordFindReq(); + lift.setStartTime(starTime); + lift.setEndTime(endTime); + lift.setRecordType(2); + // 9号电梯 + lift.setDeviceId(550757939925061L); + dto.setQueryDto(lift); +// TableDataInfo nineLiftList = e8PlatformApi.getPageAccessRecordList(dto); + TableDataInfo pageAccessRecordList = new TableDataInfo(); + + return e8PlatformApi.getPageAccessRecordList(dto); //如果pageAccessRecordList报错就捕获并封装 } }