Merge remote-tracking branch 'origin/master'

czt

3 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

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

@@ -35,31 +35,25 @@
    @GetMapping("/{patrolId}")
    public String getPatrolRecordById(@PathVariable("patrolId") String patrolId, Model model) {
        IgdsBaseParam param = new IgdsBaseParam();
        param.setPage(1);
        param.setLimit(6);
        param.setKey(patrolId);
        Page<PatrolRecord> records = patrolRecordManager.pageData(param);
        model.addAttribute("patrolRecordList", records.getRecords());
        model.addAttribute("currentPage", records.getCurrent());
        model.addAttribute("totalItems", records.getTotal());
        model.addAttribute("pageSize", records.getSize());
        model.addAttribute("patrolId", patrolId);
        return prefix + "/patrolRecord";
    }

    /**
     * 获取轨迹图页面
     */
    @GetMapping("trajectoryMap/{patrolId}")
    public String showTrajectoryMap(@PathVariable("patrolId") String patrolId, Model model) {

        IgdsBaseParam param = new IgdsBaseParam();
        param.setKey(patrolId);
        List<PatrolRecord> trackPoints = patrolRecordManager.listAll(param);
        model.addAttribute("trackPoints", trackPoints);

        return prefix + "/trajectoryMap";
        model.addAttribute("patrolRecordList", trackPoints);
        return prefix + "/patrolRecord";
    }
//
//    /**
//     * 获取轨迹图页面
//     */
//    @GetMapping("trajectoryMap/{patrolId}")
//    public String showTrajectoryMap(@PathVariable("patrolId") String patrolId, Model model) {
//
//        IgdsBaseParam param = new IgdsBaseParam();
//        param.setKey(patrolId);
//        List<PatrolRecord> trackPoints = patrolRecordManager.listAll(param);
//        model.addAttribute("trackPoints", trackPoints);
//
//        return prefix + "/trajectoryMap";
//    }

    /**
     * 分页获取数据