Merge remote-tracking branch 'origin/master'

czt

4 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

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

@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.ResponseBody;

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

/**
@@ -103,7 +104,7 @@

        String viewUrl = prefix + "/video-webrtc";

        //WEB-RTC大华播放
        //WEB-RTC播放
        if (CameraPlayType.PLAY_TYPE_WEB_RTC.getCode().equals(playType)) {
            viewUrl = prefix + "/video-webrtc";
        }
@@ -124,4 +125,32 @@
        return secManager.updatePos(params);
    }



    /**
     * 首页总览
     *
     * @return
     */
    @RequestMapping("/quantity")
    public String infrared(
            @RequestParam(value = "type", required = false) String type,
            ModelMap view) {

        SysUser user = ContextUtil.getLoginUser();
        view.put(Constant.MODEL_KEY_LOGIN_USER, user);

        String deptId = ContextUtil.subDeptId(user);
        view.put("deptId", deptId);
//        List<InfraredCamera> listCamera = infraredManager.listCamera(deptId, user.getCompanyId());
//
//        if(null == listCamera){
//            listCamera = new ArrayList<>();
//            listCamera.add(new InfraredCamera());
//        }
//        view.put("listCamera", listCamera);

        return prefix + "/quantity";
    }

}