回滚-重点工程 新增cameraCode和cameraName

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

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

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

@@ -174,27 +174,27 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
                 item.setPark(parkMap.get(item.getPark()).toString());
             }
         });
-//        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);
-//            }
-//        }));
+        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);
+            }
+        }));
         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

@@ -140,55 +140,64 @@
 
     <select id="getKeyProjects" parameterType="CommandCenterBO" resultType="ProjectBody">
         SELECT
-            GROUP_CONCAT(mc.camera_code) cameraCode,
-            GROUP_CONCAT(mc.camera_name) cameraName,
-            a.id projectId,
-            a.longitude,
-            a.latitude,
-            project_name projectName,
-            project_target projectTarget,
-            project_type projectType,
-            project_level projectLevel,
-            construction_unit constructionUnit,
-            principal,
-            a.phone phone,
-            construction_site constructionSite,
-            construction_area constructionArea,
-            camera_system cameraSystem,
-            introduction,
-            photo_id photoId,
-            territoriality,
-            park,
-            b.dept_name parkName,
-            park_longitude parkLongitude,
-            park_latitude parkLatitude,
-            environment,
-            legal_unit legalUnit,
-            start_time startTime,
-            end_time endTime,
-            nature,
-            total_invest totalInvest,
-            year_invest yearInvest,
-            industry_type industryType,
-            secretary,
-            secretary_duties secretaryDuties,
-            secretary_phone secretaryPhone,
-            a.dept_id AS deptId,
-            d.dept_name AS deptName
-        FROM
-            centerdata_t_key_projects a
-                LEFT JOIN onest_system.sys_dept d ON d.dept_id = a.dept_id
-                LEFT JOIN onest_system.sys_dept b ON a.park = b.dept_id
-                left join centerdata_t_equipment_camera c on a.id = c.business_id
-                left join onest_monitor.centermonitor_t_camera mc on mc.id=c.camera_id
-        WHERE
-            FIND_IN_SET( '365', CONCAT( d.ancestors, ',', d.dept_id ) )
-        GROUP BY a.id
-        <if test="state != null and state != ''" >
-            HAVING cameraCode is not null
-        </if>
-        ORDER BY
-            a.create_time DESC
+        id projectId,
+        longitude,
+        latitude,
+        project_name projectName,
+        project_target projectTarget,
+        project_type projectType,
+        project_level projectLevel,
+        construction_unit constructionUnit,
+        principal,
+        a.phone phone,
+        construction_site constructionSite,
+        construction_area constructionArea,
+        camera_system cameraSystem,
+        introduction,
+        photo_id photoId,
+        territoriality,
+        park,
+        b.dept_name parkName,
+        park_longitude parkLongitude,
+        park_latitude parkLatitude,
+        environment,
+        legal_unit legalUnit,
+        start_time startTime,
+        end_time endTime,
+        nature,
+        total_invest totalInvest,
+        year_invest yearInvest,
+        industry_type industryType,
+        secretary,
+        secretary_duties secretaryDuties,
+        secretary_phone secretaryPhone,
+        a.dept_id as deptId,
+        d.dept_name as deptName
+        FROM centerdata_t_key_projects a
+        LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
+        LEFT JOIN ${database_system}.sys_dept b on a.park = b.dept_id
+        <where>
+            <choose>
+                <when test="deptId != null and deptId != ''">and FIND_IN_SET( #{deptId}, CONCAT(d.ancestors,',',d.dept_id) )</when>
+                <otherwise>${params.dataScope}</otherwise>
+            </choose>
+            <if test="params.projectName != null and params.projectName != ''"><!--工程名称-->
+                AND project_name like concat('%', #{params.projectName}, '%')
+            </if>
+            <if test="params.park != null and params.park != ''"><!--所属开发区（园区）-->
+                AND park = #{params.park}
+            </if>
+            <if test="params.territoriality != null and params.territoriality != ''"><!--属地辖区-->
+                AND territoriality = #{params.territoriality}
+            </if>
+            <if test="params.projectLevel != null and params.projectLevel != ''"><!--工程级别-->
+                AND project_level = #{params.projectLevel}
+            </if>
+            <if test="params.nature != null and params.nature != ''"><!--在建性质-->
+                AND nature in (${params.nature})
+            </if>
+        </where>
+        ORDER BY a.create_time DESC
     </select>
 
     <select id="getKeyProjectsCamera" parameterType="CommandCenterBO" resultType="map">