重点工程 新增cameraCode

src/main/java/com/sooka/sponest/data/commandcenter/domian/ProjectBody.java

@@ -118,4 +118,6 @@ public class ProjectBody {
      * 进度图片列表
      */
     private List<CenterdataTKeyProjectsSchedule> scheduleList = new ArrayList<>();
+
+    private String cameraCode;
 }

src/main/java/com/sooka/sponest/data/commandcenter/service/impl/ICommandCenterServiceImpl.java

@@ -175,26 +175,31 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
             }
         });
         List<Map<String, Object>> cameraList = commandCenterMapper.getKeyProjectsCamera(commandCenterBO);
-        projectBodies.forEach(project -> cameraList.forEach(item -> {
-            if (project.getProjectId().equals(MapUtils.getString(item, "projectId"))) {
-                project.getCameraList().add(item);
-            }
-        }));
+        projectBodies.forEach(project -> {
+            List<String> projectCameraCodes = new ArrayList<>();
+            cameraList.forEach(item -> {
+                if (project.getProjectId().equals(MapUtils.getString(item, "projectId"))) {
+                    projectCameraCodes.add(MapUtils.getString(item, "cameraCode"));
+                }
+            });
+            String joinedCameraCodes = String.join(",", projectCameraCodes);
+            project.setCameraCode(joinedCameraCodes);
+        });
         List<CenterdataTKeyProjectsSchedule> scheduleList = commandCenterMapper.getKeyProjectsSchedule(commandCenterBO);
         projectBodies.forEach(project -> scheduleList.forEach(schedule -> {
             if (project.getProjectId().equals(schedule.getKeyProjectsId())) {
                 project.getScheduleList().add(schedule);
             }
         }));
-        if ("true".equals(commandCenterBO.getState())){
-            List<ProjectBody> projectBodyList = new ArrayList<>();
-            projectBodies.forEach(project -> {
-                if (project.getCameraList().size()!=0) {
-                    projectBodyList.add(project);
-                }
-            });
-            return projectBodyList;
-        }
+//        if ("true".equals(commandCenterBO.getState())){
+//            List<ProjectBody> projectBodyList = new ArrayList<>();
+//            projectBodies.forEach(project -> {
+//                if (project.getCameraList().size()!=0) {
+//                    projectBodyList.add(project);
+//                }
+//            });
+//            return projectBodyList;
+//        }
         return projectBodies;
     }
 

src/main/resources/mapper/commandcenter/CommandCentreMapper.xml

@@ -201,10 +201,8 @@
     </select>
 
     <select id="getKeyProjectsCamera" parameterType="CommandCenterBO" resultType="map">
-        SELECT a.business_id projectId,b.id cameraId,b.camera_code cameraCode,b.camera_name cameraName,b.camera_factory
-        cameraFactory,b.longitude,b.latitude,b.camera_radius cameraRadius
+        SELECT a.business_id projectId,a.camera_id cameraId,a.camera_code cameraCode
         FROM centerdata_t_equipment_camera a
-        LEFT JOIN ${database_monitor}.centermonitor_t_camera b ON b.id = a.camera_id
         where a.type = '0'
         <if test="params.projectIds != null and params.projectIds.size > 0">
             AND a.business_id IN