3.监控中心机构信息补充：增加“全辖摄像头总路数”“全辖高清摄像头路数” 4.安全保卫工作情况统计表：监控中心相关信息从监控中心机构补充信息统计

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -174,6 +174,18 @@ public class SysOrgExtend extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date lastUpdateTime;
 
+    /**
+     * 高清摄像头路数
+     */
+    @ApiModelProperty(value = "高清摄像头路数")
+    private Integer hdCameraCount;
+
+    /**
+     * 摄像头总路数
+     */
+    @ApiModelProperty(value = "摄像头总路数")
+    private Integer totalCameraCount;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -327,13 +327,20 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 if(centerConstruction.get("brand") != null){
                     securityWorkExport.setBrand(brandMap.get(centerConstruction.get("brand").toString()));
                 }
+                // 获取监控中心机构上的 高清摄像头路数
+                if(centerConstruction.get("hdCameraCount") != null){
+                    securityWorkExport.setDefinitionNumber(Integer.valueOf(centerConstruction.get("hdCameraCount").toString()));
+                }
+                if(centerConstruction.get("totalCameraCount") != null){
+                    securityWorkExport.setCameraTotal(Integer.valueOf(centerConstruction.get("totalCameraCount").toString()));
+                }
 
             }
 
-            //高清摄像头
-            Map camera = baseMapper.getCamera(s.getPath());
-            securityWorkExport.setCameraTotal(Integer.valueOf(camera.get("cameraTotal").toString()));
-            securityWorkExport.setDefinitionNumber(Integer.valueOf(camera.get("definitionNumber").toString()));
+            //高清摄像头  高清摄像头 有监控中心机构 扩展信息中维护
+//            Map camera = baseMapper.getCamera(s.getPath());
+//            securityWorkExport.setCameraTotal(Integer.valueOf(camera.get("cameraTotal").toString()));
+//            securityWorkExport.setDefinitionNumber(Integer.valueOf(camera.get("definitionNumber").toString()));
 
 
             //是否实现远程控制

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgExtendMapper.xml

@@ -31,7 +31,7 @@ _type"/>
 
     <sql id="selectSysOrgExtendVo">
         select id, org_type, weather_area_code, premises_area, ownership, outside_area, org_physical_defense_construction_id, askari, askari_certificate, business_library
-_type, duty_mode, remote_control, self_service_bank, lobby_equipment, wall_penetrating_equipment, bank_physical_defense_construction_id, create_time, update_time, create_by, update_by, org_id
+_type, duty_mode, remote_control, self_service_bank, lobby_equipment, wall_penetrating_equipment, bank_physical_defense_construction_id, create_time, update_time, create_by, update_by, org_id,hd_camera_count,total_camera_count
         from sys_org_extend
     </sql>
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -951,7 +951,9 @@ and
         SELECT
             IFNULL(SUBSTR( b.construction_time, 1, 4 ), '' ) as centerConstructionTime,
             IFNULL(SUBSTR( b.last_update_time, 1, 4 ), '' )AS transformTime,
-            b.platform_brand  AS brand
+            b.platform_brand  AS brand,
+            IFNULL( b.hd_camera_count, 0 ) AS hdCameraCount,
+            IFNULL( b.total_camera_count, 0 ) AS totalCameraCount
         FROM
             ( SELECT id FROM sys_org WHERE type = 10 AND path LIKE concat( #{orgPath}, '%' ) ORDER BY create_time DESC LIMIT 0, 1 ) a
                 LEFT JOIN sys_org_extend b ON a.id = b.org_id