From d829945c6491e88688e5afc2d3d3952d21b5fa79 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 06 六月 2024 12:03:27 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java | 8 ++++++++
javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java | 1 +
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java | 10 ----------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java
index 76e4570..281b86a 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectCameraController.java
+++ b/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);
+ }
+
/**
* 瀵煎嚭鐩戞帶璁惧鍒楄〃
*/
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
index 057e549..d03eeb5 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
+++ b/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";
}
-
/**
diff --git a/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java b/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java
index 51ea42c..3373ab3 100644
--- a/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java
+++ b/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/**");
}
}
\ No newline at end of file
--
Gitblit v1.9.1