|
@@ -1,7 +1,6 @@
|
|
|
package com.xjrsoft.module.hikvision.controller;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
-import cn.hutool.core.convert.Convert;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.google.gson.JsonArray;
|
|
|
import com.google.gson.JsonElement;
|
|
@@ -13,7 +12,6 @@ import com.xjrsoft.module.hikvision.dto.HikvisionOutinPageDto;
|
|
|
import com.xjrsoft.module.hikvision.service.IHikvisionDataService;
|
|
|
import com.xjrsoft.module.hikvision.util.ApiUtil;
|
|
|
import com.xjrsoft.module.hikvision.vo.HikvisionOutinPageVo;
|
|
|
-import com.xjrsoft.module.workflow.vo.PendingTaskVo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
@@ -69,7 +67,8 @@ public class OutInController {
|
|
|
PageOutput<HikvisionOutinPageVo> output = new PageOutput<>();
|
|
|
output.setCurrentPage(dto.getLimit());
|
|
|
output.setPageSize(dto.getSize());
|
|
|
- output.setTotal(data.get("totalPage").getAsInt());
|
|
|
+ output.setTotalPage(data.get("totalPage").getAsInt());
|
|
|
+ output.setTotal(data.get("total").getAsInt());
|
|
|
output.setList(result);
|
|
|
|
|
|
return RT.ok(output);
|