地质所 沉降监测网建设项目
zmk
2024-06-06 d829945c6491e88688e5afc2d3d3952d21b5fa79
提交代码
3个文件已修改
19 ■■■■ 已修改文件
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java
@@ -53,6 +53,14 @@
        return getDataTable(list);
    }
    @GetMapping("/cameralist")
    @ResponseBody
    public AjaxResult cameralist(ProjectCamera projectCamera) {
        List<ProjectCamera> list = projectCameraService.selectProjectCameraList(projectCamera);
        return AjaxResult.success(list);
    }
    /**
     * 导出监控设备列表
     */
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
@@ -96,7 +96,6 @@
    public AjaxResult search(@RequestParam("ids") String ids)
    {
        Project project = projectService.selectProjectById(ids);
//        mmap.put("project", project);
        return AjaxResult.success(project);
    }
@@ -118,14 +117,6 @@
    public String info(@RequestParam("id") String id, ModelMap mmap){
        Project project = projectService.selectProjectById(id);
        String cname = "";
        String lname = "";
        project.setCompanyName(cname);
        project.setLeaderName(lname);
        int count = holeMapper.selectHoleNumByProjectId(id);
        //设置钻孔数量
        project.setHoleNum(count);
@@ -134,7 +125,6 @@
        mmap.put("projectId", id);
        return prefix + "/info"; 
    }
    
    /**
javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java
@@ -68,5 +68,6 @@
        registry.addMapping("/geo/hole/**");
        registry.addMapping("/geo/TubLog/**");
        registry.addMapping("/geo/project/**");
        registry.addMapping("/geo/projectCamera/**");
    }
}