删除冗余代码

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class ProjectBody {
@@ -107,17 +106,13 @@ public class ProjectBody {
     private String secretaryPhone;
 
     private String deptId;
+
     private String deptName;
 
-    /**
-     * 数据列表
-     */
-    private List<Map<String, Object>> cameraList = new ArrayList<>();
+    private String cameraCode;
 
     /**
      * 进度图片列表
      */
     private List<CenterdataTKeyProjectsSchedule> scheduleList = new ArrayList<>();
-
-    private String cameraCode;
 }

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

@@ -22,7 +22,6 @@ import com.sooka.sponest.data.digitalresource.service.ICenterdataTFarmGridServic
 import com.sooka.sponest.data.digitalresource.service.IResourceViewService;
 import com.sooka.sponest.data.digitaltraffic.service.ITrafficViewService;
 import com.sooka.sponest.data.digitalwater.service.IWaterViewService;
-import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestNetworkprocessing;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTKeyProjectsSchedule;
 import com.sooka.sponest.data.generalbusiness.mapper.CenterdataTForestImportareaMapper;
@@ -161,45 +160,25 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
         Map<String, Object> industryTypeMap = DictUtils.getDictCacheToMap("centerdata_industry_type");
         Map<String, Object> parkMap = DictUtils.getDictCacheToMap("centerdata_park");
         projectBodies.forEach(item -> {
-            if (!StringUtils.isEmpty(item.getEnvironment()) && environmentMap.containsKey(item.getEnvironment())){
+            if (!StringUtils.isEmpty(item.getEnvironment()) && environmentMap.containsKey(item.getEnvironment())) {
                 item.setEnvironment(environmentMap.get(item.getEnvironment()).toString());
             }
-            if (!StringUtils.isEmpty(item.getNature()) && zjNatureMap.containsKey(item.getNature())){
+            if (!StringUtils.isEmpty(item.getNature()) && zjNatureMap.containsKey(item.getNature())) {
                 item.setNature(zjNatureMap.get(item.getNature()).toString());
             }
-            if (!StringUtils.isEmpty(item.getIndustryType()) && industryTypeMap.containsKey(item.getIndustryType())){
+            if (!StringUtils.isEmpty(item.getIndustryType()) && industryTypeMap.containsKey(item.getIndustryType())) {
                 item.setIndustryType(industryTypeMap.get(item.getIndustryType()).toString());
             }
-            if (!StringUtils.isEmpty(item.getPark()) && parkMap.containsKey(item.getPark())){
+            if (!StringUtils.isEmpty(item.getPark()) && parkMap.containsKey(item.getPark())) {
                 item.setPark(parkMap.get(item.getPark()).toString());
             }
         });
-//        List<Map<String, Object>> cameraList = commandCenterMapper.getKeyProjectsCamera(commandCenterBO);
-//        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;
-//        }
         return projectBodies;
     }
 

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

@@ -140,7 +140,6 @@
 
     <select id="getKeyProjects" parameterType="CommandCenterBO" resultType="ProjectBody">
         SELECT
-        GROUP_CONCAT(c.camera_code) cameraCode,
         a.id projectId,
         a.longitude,
         a.latitude,
@@ -172,13 +171,13 @@
         secretary,
         secretary_duties secretaryDuties,
         secretary_phone secretaryPhone,
-        a.dept_id AS deptId,
-        d.dept_name AS deptName
-        FROM
-        centerdata_t_key_projects a
+        a.dept_id deptId,
+        d.dept_name deptName,
+        GROUP_CONCAT(c.camera_code) cameraCode
+        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
-        left join centerdata_t_equipment_camera c on a.id = c.business_id
+        LEFT JOIN ${database_system}.sys_dept b ON b.dept_id = a.park
+        LEFT JOIN centerdata_t_equipment_camera c ON c.business_id = a.id
         <where>
             <choose>
                 <when test="deptId != null and deptId != ''">and FIND_IN_SET( #{deptId}, CONCAT(d.ancestors,',',d.dept_id) )</when>
@@ -202,22 +201,9 @@
         </where>
         GROUP BY a.id
         <if test="state != null and state != ''" >
-            HAVING cameraCode is not null
-        </if>
-        ORDER BY
-            a.create_time DESC
-    </select>
-
-    <select id="getKeyProjectsCamera" parameterType="CommandCenterBO" resultType="map">
-        SELECT a.business_id projectId,a.camera_id cameraId,a.camera_code cameraCode
-        FROM centerdata_t_equipment_camera a
-        where a.type = '0'
-        <if test="params.projectIds != null and params.projectIds.size > 0">
-            AND a.business_id IN
-            <foreach item="proid" collection="params.projectIds" open="(" separator="," close=")">
-                #{proid}
-            </foreach>
+            HAVING cameraCode IS NOT NULL
         </if>
+        ORDER BY a.create_time DESC
     </select>
 
     <select id="getImportAreaType" parameterType="CommandCenterBO" resultType="AreaBody">