Merge remote-tracking branch 'origin/master'

czt

3 天以前 dfd2060bdcc0de929b4770a6a4a580c17bd72104

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapRecordController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.constant.WarnType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.SnapRecord;
@@ -16,6 +17,10 @@
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


@Slf4j
@@ -46,8 +51,12 @@
        model.addAttribute("currentPage", images.getCurrent());
        model.addAttribute("totalItems", images.getTotal());
        model.addAttribute("pageSize", images.getSize());
        //设备数据
        model.addAttribute("cameraList", commonManager.listCameraData());
        //库区数据
        model.addAttribute("deptList", commonManager.listDeptData());
        //公司数据
        model.addAttribute("companyList", commonManager.listCompanyData());
        return prefix + "/snapRecord";
    }