Merge branch 'V0.0.9' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.9

project_data/sql/0.0.9/soc/soc.sql

@@ -78,7 +78,7 @@ insert into sys_role_menu (role_id, menu_id) VALUES ('122', '1788476228704907266
 -- 机构补充信息和GA38填写信息导出按钮
 delete from sys_menu where id in ('01788377780888264705','01788377908143448066');
 INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01788377780888264705, '导出机构补充信息', 103, 9, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:dept:exportOrgExtend', '1', NULL, NULL, '超级管理员', '2024-05-09 09:17:44', '', NULL, '');
-INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01788377908143448066, '导出GA38填写情况', 103, 10, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:dept:exportDefenseDetailExtend', '1', NULL, NULL, '超级管理员', '2024-05-09 09:18:14', '', NULL, '');
+INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01788377908143448066, '导出安全防范设施建设达标信息', 103, 10, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:dept:exportDefenseDetailExtend', '1', NULL, NULL, '超级管理员', '2024-05-09 09:18:14', '', NULL, '');
 
 delete from sys_dict_data where dict_type='video_diagnosis_state' and dict_label in ('未知');
 INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '未知', '2', 'video_diagnosis_state', NULL, 'default', 'N', '0', '超级管理员', '2024-05-13 11:07:08', '', NULL, NULL);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ProtectionServiceImpl.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -37,6 +38,7 @@ import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.enums.ProtectionStatus;
 import com.xunmei.system.api.vo.ProtectionVO;
+import io.netty.util.internal.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -268,7 +270,11 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
         //获取所有关联了登记簿的子系统
         List<IotAlarmSubsystem> list = getIotAlarmSubsystems(orgId);
         if (ObjectUtil.isEmpty(list)) {
-            return resultList;
+            //没有关联登记簿的控制器,构建空数据显示
+            final IotAlarmSubsystem subsystem = new IotAlarmSubsystem();
+            subsystem.setName(" ");
+            subsystem.setId(IdWorker.getId());
+            list.add(subsystem);
         }
         for (IotAlarmSubsystem subsystem : list) {
             Map<String, List<Map<String, Object>>> map = new LinkedHashMap<>();
@@ -277,9 +283,7 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
         }
         List<Long> protectionIdList = list.stream().map(IotAlarmSubsystem::getId).collect(Collectors.toList());
         List<IotAlarmSubsystemLog> logList = getIotAlarmSubsystemLogs(orgId, date, protectionIdList);
-        if (ObjectUtil.isEmpty(logList)) {
-            return resultList;
-        }
+
         //布防状态，0：撤防，1：布防
         for (Map<String, List<Map<String, Object>>> subsystemListMap : resultList) {
             for (Map.Entry<String, List<Map<String, Object>>> listEntry : subsystemListMap.entrySet()) {
@@ -290,11 +294,19 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
                         .sorted(Comparator.comparing(IotAlarmSubsystemLog::getStatusChangeTime))
                         .collect(Collectors.toList());
                 if (subsystemLogList.isEmpty()) {
+                    Map<String, Object> map = new LinkedHashMap<>();
+                    map.put("status", 0);
+                    map.put("date", StringUtil.EMPTY_STRING);
+                    listEntry.getValue().add(map);
+
+                    Map<String, Object> map1 = new LinkedHashMap<>();
+                    map1.put("status", 1);
+                    map1.put("date", StringUtil.EMPTY_STRING);
+                    listEntry.getValue().add(map1);
                     continue;
                 }
                 for (IotAlarmSubsystemLog subsystemLog : subsystemLogList) {
                     Map<String, Object> map = new LinkedHashMap<>();
-                    map.put("id", subsystemLog.getId());
                     map.put("status", subsystemLog.getStatus());
                     map.put("date", DateUtil.format(subsystemLog.getStatusChangeTime(), "HH:mm"));
                     listEntry.getValue().add(map);

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -192,17 +192,6 @@ public class PdfUtil {
         }
     }
 
-    private static String getStatusTime(List<Map<String, Object>> data, Integer status, List<Long> ingoreIdList) {
-        Optional<Map<String, Object>> optional = data.stream()
-                .filter(r -> r.get("status").equals(status) && !ingoreIdList.contains(Long.valueOf(r.get("id").toString())))
-                .findFirst();
-        if (optional.isPresent()) {
-            Map<String, Object> map = optional.get();
-            ingoreIdList.add(Long.valueOf(map.get("id").toString()));
-            return map.get("date").toString();
-        }
-        return StringUtil.EMPTY_STRING;
-    }
 
 
     public static void dealResumptionBody(Document document, PdfPTable table, Font tableFont, Map<String, Object> data) throws Exception {

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotBoardMapper.java

@@ -33,7 +33,7 @@ public interface IotBoardMapper extends BaseMapper {
     List<Map<String, String>> countSensorNums(String orgPath);
 
 
-    List<Map<String, String>> selectVideoDaysStorage(@Param("orgPath") String orgPath, @Param("startTime") Date startTime);
+    List<Map<String, String>> selectVideoDaysStorage(@Param("orgPath") String orgPath,@Param("startTime") Date startTime);
 
-    List<MediatorVideoIntegrityCheckLog> selectVideoCheckSelf(@Param("orgPath") String orgPath, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<MediatorVideoIntegrityCheckLog> selectVideoCheckSelf(@Param("orgPath") String orgPath, @Param("startTime") String startTime);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotDvrChannelMapper.java

@@ -50,5 +50,5 @@ public interface IotDvrChannelMapper extends BaseMapper<IotDvrChannel> {
 
     Integer selectChannelCount(@Param("orgPath") String orgPath);
 
-    List<MediatorVideoDiagnosisLog> selectData(@Param("orgPath") String orgPath, @Param("startTime") DateTime startTime, @Param("endTime") Date endTime);
+    List<MediatorVideoDiagnosisLog> selectData(@Param("orgPath") String orgPath, @Param("startTime") Date startTime);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotDvrDiskMapper.java

@@ -12,6 +12,8 @@ import com.xunmei.iot.vo.dvrDisk.DvrDiskAlarmHistoryPageVo;
 import com.xunmei.iot.vo.dvrDisk.DvrDiskStatisticVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -34,5 +36,5 @@ public interface IotDvrDiskMapper extends BaseMapper<IotDvrDisk> {
                                                   @Param("pageDto") DvrDiskAppPageDto pageDto,
                                                   @Param("orgPath") String orgPath);
 
-    int selectDiskCount(@Param("orgPath") String orgPath);
+    List<IotDvrDisk> selectDiskCount(@Param("orgPath") String orgPath);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/VideoDiagnosisService.java

@@ -38,6 +38,6 @@ public interface VideoDiagnosisService extends IService<IotDvrChannel> {
     Integer appVideoLoseBadge(Long orgId);
     Integer appVideoQualityBadge(Long orgId);
 
-    IotBoardTotalData.VideoDiagnostic selectVideoDiagnostic(String orgPath, Date now, Integer channelDataOffsetDay);
+    IotBoardTotalData.VideoDiagnostic selectVideoDiagnostic(String orgPath, Date startTime);
 
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotBoardServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Lists;
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
 import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetectionLog;
 import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
@@ -319,13 +320,13 @@ public class IotBoardServiceImpl implements IotBoardService {
         for (Map<String, String> map : deviceNums) {
             String aLong = map.get(MAP_VALUE);
             int res = Integer.parseInt(aLong);
-            if (CategoryDataEnum.IOT_DETECTION_DEVICE.getId().equals(map.get(CATEGORY_ID))) {
+            if (CategoryDataEnum.IOT_DETECTION_DEVICE.getId().toString().equals(map.get(CATEGORY_ID))) {
                 deviceOverview.setEdgeComputingHosts(res);
             }
-            if (CategoryDataEnum.ALARM_HOST_DEVICE.getId().equals(map.get(CATEGORY_ID))) {
+            if (CategoryDataEnum.ALARM_HOST_DEVICE.getId().toString().equals(map.get(CATEGORY_ID))) {
                 deviceOverview.setAlarmControllers(res);
             }
-            if (CategoryDataEnum.MONITOR_HOST_DEVICE.getId().equals(map.get(CATEGORY_ID))) {
+            if (CategoryDataEnum.MONITOR_HOST_DEVICE.getId().toString().equals(map.get(CATEGORY_ID))) {
                 deviceOverview.setHardDiskRecorders(res);
             }
         }
@@ -372,9 +373,9 @@ public class IotBoardServiceImpl implements IotBoardService {
         //录像文件自检
         this.selectVideoCheckSelf(orgVO, now, totalData, channelDataOffsetDay);
 
-
+        final Date startTime = DateUtil.beginOfDay(DateUtil.offsetDay(now, -channelDataOffsetDay));
         //录像天数存储
-        List<Map<String, String>> videoCheckMap = iotBoardMapper.selectVideoDaysStorage(orgPath, new Date());
+        List<Map<String, String>> videoCheckMap = iotBoardMapper.selectVideoDaysStorage(orgPath,startTime);
         HashMap<Integer, Integer> hashMap = new LinkedHashMap<>();
         IotBoardTotalData.RecordingStorage storage = new IotBoardTotalData.RecordingStorage();
         if (!videoCheckMap.isEmpty()) {
@@ -388,7 +389,7 @@ public class IotBoardServiceImpl implements IotBoardService {
         storage.setHashmap(hashMap);
         totalData.setRecordingStorage(storage);
 
-        IotBoardTotalData.VideoDiagnostic videoDiagnostic = videoDiagnosisService.selectVideoDiagnostic(orgPath, now, channelDataOffsetDay);
+        IotBoardTotalData.VideoDiagnostic videoDiagnostic = videoDiagnosisService.selectVideoDiagnostic(orgPath, startTime);
         totalData.setVideoDiagnostic(videoDiagnostic);
 
         totalData.setAirConditionerInfo(new IotBoardTotalData.AirConditionerInfo());
@@ -404,7 +405,7 @@ public class IotBoardServiceImpl implements IotBoardService {
         //获取查询时间范围的最小值
         DateTime offsetDay = DateUtil.offsetDay(now, -channelDataOffsetDay);
         //查询历史上报的录像完整性数据
-        List<MediatorVideoIntegrityCheckLog> videoIntegrityCheckLogs = iotBoardMapper.selectVideoCheckSelf(org.getPath(), DateUtil.format(offsetDay, "yyyy-MM-dd"), DateUtil.format(now, "yyyy-MM-dd"));
+        List<MediatorVideoIntegrityCheckLog> videoIntegrityCheckLogs = iotBoardMapper.selectVideoCheckSelf(org.getPath(), DateUtil.format(offsetDay, "yyyy-MM-dd"));
         if (ObjectUtil.isEmpty(videoIntegrityCheckLogs)) {
             videoInspection.setLostRate("-");
         } else {
@@ -435,56 +436,11 @@ public class IotBoardServiceImpl implements IotBoardService {
         }
         //硬盘异常率
         //获取硬盘数量
-        int diskNum = iotDvrDiskMapper.selectDiskCount(org.getPath());
-        //获取历史上报的硬盘数据
-        List<IotDvrHardDiskDetectionLog> logList = dvrHardDiskDetectionLogMapper.selectData(org.getPath(), DateUtil.format(offsetDay, "yyyy-MM-dd"), DateUtil.format(now, "yyyy-MM-dd"));
-
-        if (ObjectUtil.isEmpty(logList)) {
+        final List<IotDvrDisk> dvrDiskList = iotDvrDiskMapper.selectDiskCount(org.getPath());
+        if (ObjectUtil.isEmpty(dvrDiskList)) {
             videoInspection.setHardDiskExceptionRate("-");
         }
-
-        int diskTotal = diskNum * channelDataOffsetDay;
-        //硬盘正常数量
-        int diskExitTotal = 0;
-        //把硬盘检测数据根据主机code分组
-        Map<String, List<IotDvrHardDiskDetectionLog>> diskListmap = logList.stream().collect(Collectors.groupingBy(IotDvrHardDiskDetectionLog::getEquipmentCode));
-        for (Map.Entry<String, List<IotDvrHardDiskDetectionLog>> listEntry : diskListmap.entrySet()) {
-
-            //拿到每个主机下上报的硬盘检测数据
-            List<IotDvrHardDiskDetectionLog> detectionLogs = listEntry.getValue();
-
-            //循环每一天
-            for (DateTime time : timeList) {
-
-                //判断当天是否上报
-                Optional<IotDvrHardDiskDetectionLog> first = detectionLogs.stream().filter(r -> DateUtils.isSameDay(time, DateUtils.toDate(r.getCreateTime()))).findFirst();
-                if (!first.isPresent()) {
-                    continue;
-                }
-                IotDvrHardDiskDetectionLog detectionLog = first.get();
-                String detailInfo = detectionLog.getDetailInfo();
-                if (ObjectUtil.isEmpty(detailInfo)) {
-                    continue;
-                }
-                //获取上报数据详情
-                List<Map> maps = JSON.parseArray(detailInfo, Map.class);
-
-                //统计上报数据中正常的硬盘数量
-                long count = maps.stream().filter(d -> ObjectUtil.equal(d.get("state").toString(), "0")).count();
-                //硬盘正常数量累加
-                diskExitTotal += (int) count;
-
-            }
-        }
-
-        if (diskTotal == 0) {
-            videoInspection.setHardDiskExceptionRate("-");
-        } else {
-            //用计算分母减去正常硬盘数量=异常硬盘数; 用异常硬盘数/计算分母得到异常率
-            videoInspection.setHardDiskExceptionRate(String.format("%.2f", ((diskTotal - diskExitTotal) * 100.0 / diskTotal)) + "%");
-        }
-
+        final long count1 = dvrDiskList.stream().filter(d -> ObjectUtil.equal(d.getState(), 0)).count();
+        videoInspection.setHardDiskExceptionRate(String.format("%.2f", ((dvrDiskList.size() - count1) * 100.0 / dvrDiskList.size())) + "%");
     }
-
-
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/VideoDiagnosisServiceImpl.java

@@ -243,9 +243,8 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
     }
 
     @Override
-    public IotBoardTotalData.VideoDiagnostic selectVideoDiagnostic(String orgPath, Date now, Integer channelDataOffsetDay) {
-        DateTime startTime = DateUtil.offsetDay(now, -channelDataOffsetDay);
-        List<MediatorVideoDiagnosisLog> logList = baseMapper.selectData(orgPath, startTime, now);
+    public IotBoardTotalData.VideoDiagnostic selectVideoDiagnostic(String orgPath, Date startTime) {
+        List<MediatorVideoDiagnosisLog> logList = baseMapper.selectData(orgPath, startTime);
 
 
         IotBoardTotalData.VideoDiagnostic videoDiagnostic = new IotBoardTotalData.VideoDiagnostic();

soc-modules/soc-modules-iot/src/main/resources/mapper/DvrDiskMapper.xml

@@ -199,8 +199,8 @@
         </if>
     </select>
 
-    <select id="selectDiskCount" resultType="int">
-        select count(1)
+    <select id="selectDiskCount" resultType="com.xunmei.common.core.domain.iot.domain.IotDvrDisk">
+        select  *
         from iot_dvr_disk d
                  inner join sys_org o on o.id = d.org_id
         where o.deleted = 0

soc-modules/soc-modules-iot/src/main/resources/mapper/IotBoardMapper.xml

@@ -136,12 +136,16 @@
     </select>
 
     <select id="selectVideoDaysStorage" resultType="java.util.Map">
-        select CAST(c.plan_days AS CHAR) as planDays,CAST(sum(c.plan_days != c.real_days) AS CHAR) as nums,CAST(max(c.update_time) as CHAR ) as time
+        select CAST(c.plan_days AS CHAR)                     as planDays,
+               CAST(sum(c.plan_days != c.real_days) AS CHAR) as nums,
+               CAST(max(c.update_time) as CHAR)              as time
         from mediator_video_days_check c
                  inner join sys_org o on o.id = c.org_id
         where o.deleted = 0
+          and c.update_time >= #{startTime}
           and org_path like concat(#{orgPath}, '%')
-        group by c.plan_days order by c.plan_days
+        group by c.plan_days
+        order by c.plan_days
     </select>
 
     <select id="selectVideoCheckSelf" resultType="com.xunmei.common.core.domain.video.MediatorVideoIntegrityCheckLog">

soc-modules/soc-modules-iot/src/main/resources/mapper/IotDvrChannelMapper.xml

@@ -402,7 +402,6 @@
                  inner join sys_org o on o.id = l.org_id
         where o.deleted = 0
           and l.create_time >= #{startTime}
-          and l.create_time <= #{endTime}
           and o.path like concat(#{orgPath}, '%')
     </select>
 </mapper>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgExtendExport.java

@@ -36,79 +36,82 @@ public class OrgExtendExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "中心建设时间(年)", index = 6)
+    @ExcelProperty(value = "中心建设时间(年)", index = 7)
     private String constructionTime;
 
-    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 7)
+    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 8)
     private String lastUpdateTime;
 
-    @ExcelProperty(value = "监控中心平台品牌", index = 8)
+    @ExcelProperty(value = "监控中心平台品牌", index = 9)
     private String platformBrand;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 9)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 10)
     private Integer cashAddingRoom;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 10)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 11)
     private Integer remoteCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 11)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 12)
     private Integer cashAddingRoomControlCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 12)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 13)
     private Integer remoteControlCount;
 
-    @ExcelProperty(value= "视频监控摄像头总路数", index = 13)
+    @ExcelProperty(value= "视频监控摄像头总路数", index = 14)
     private Integer totalCameraCount;
 
-    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 14)
+    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 15)
     private Integer hdCameraCount;
 
-    @ExcelProperty(value = "产权类型", index = 15)
+    @ExcelProperty(value = "产权类型", index = 16)
     private String ownerShipName;
 
-    @ExcelProperty(value = "所在位置", index = 16)
+    @ExcelProperty(value = "所在位置", index = 17)
     private String outsideArea;
 
-    @ExcelProperty(value = "夜间值守方式", index = 17)
+    @ExcelProperty(value = "夜间值守方式", index = 18)
     private String dutyMode;
 
-    @ExcelProperty(value = "是否设立保管箱库", index = 18)
+    @ExcelProperty(value = "是否设立保管箱库", index = 19)
     private String safeBox;
 
-    @ExcelProperty(value = "是否设立在行式自助银行", index = 19)
+    @ExcelProperty(value = "是否设立在行式自助银行", index = 20)
     private String selfServiceBank;
 
     @ExcelProperty(value = "在行式大堂式机具", index = 21)
     private Integer onLineLobbyEquipment;
 
-    @ExcelProperty(value = "在行式穿墙式机具", index = 20)
+    @ExcelProperty(value = "在行式穿墙式机具", index = 22)
     private Integer onLineWallPenetratingEquipment;
 
-    @ExcelProperty(value = "离行式大堂式机具", index = 22)
+    @ExcelProperty(value = "离行式大堂式机具", index = 23)
     private Integer departureLobbyEquipment;
 
-    @ExcelProperty(value = "离行式穿墙式机具", index = 23)
+    @ExcelProperty(value = "离行式穿墙式机具", index = 24)
     private Integer departureWallPenetratingEquipment;
 
-    @ExcelProperty(value = "是否设立业务库", index = 24)
+    @ExcelProperty(value = "是否设立业务库", index = 25)
     private String businessLibrary;
 
-    @ExcelProperty(value = "业务库类型", index = 25)
+    @ExcelProperty(value = "业务库类型", index = 26)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "是否配备保安人员", index = 26)
+    @ExcelProperty(value = "是否配备保安人员", index = 27)
     private String askari;
 
-    @ExcelProperty(value = "内部保安人数(含派遣)", index = 27)
+    @ExcelProperty(value = "内部保安人数(含派遣)", index = 28)
     private Integer innerCount;
 
-    @ExcelProperty(value = "外聘保安人数", index = 28)
+    @ExcelProperty(value = "外聘保安人数", index = 29)
     private Integer outsideCount;
 
-    @ExcelProperty(value = "是否取得保安证书", index = 29)
+    @ExcelProperty(value = "是否取得保安证书", index = 30)
     private String isAskariCertificate;
 
 //    @ExcelProperty(value = "保安证", index = 30,converter = ImgUrlConverter.class)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgExtendJKZXExport.java

@@ -36,33 +36,36 @@ public class OrgExtendJKZXExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "中心建设时间(年)", index = 6)
+    @ExcelProperty(value = "中心建设时间(年)", index = 7)
     private String constructionTime;
 
-    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 7)
+    @ExcelProperty(value = "监控平台最近一次升级改造时间(年)", index = 8)
     private String lastUpdateTime;
 
-    @ExcelProperty(value = "监控中心平台品牌", index = 8)
+    @ExcelProperty(value = "监控中心平台品牌", index = 9)
     private String platformBrand;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 9)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 10)
     private Integer cashAddingRoom;
 
-    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 10)
+    @ExcelProperty(value = {"未实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 11)
     private Integer remoteCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 11)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "离行式自助银行加钞间出入口设置数量"}, index = 12)
     private Integer cashAddingRoomControlCount;
 
-    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 12)
+    @ExcelProperty(value = {"实现远程控制和实时授权功能", "业务库（不含保管箱库）防控隔离门出入口设置数量"}, index = 13)
     private Integer remoteControlCount;
 
-    @ExcelProperty(value= "视频监控摄像头总路数", index = 13)
+    @ExcelProperty(value= "视频监控摄像头总路数", index = 14)
     private Integer totalCameraCount;
 
-    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 14)
+    @ExcelProperty(value = "视频监控摄像头高清摄像机路数", index = 15)
     private Integer hdCameraCount;
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgExtendLHSZZExport.java

@@ -36,13 +36,16 @@ public class OrgExtendLHSZZExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "离行式大堂式机具", index = 6)
+    @ExcelProperty(value = "离行式大堂式机具", index = 7)
     private Integer departureLobbyEquipment;
 
-    @ExcelProperty(value = "离行式穿墙式机具", index = 7)
+    @ExcelProperty(value = "离行式穿墙式机具", index = 8)
     private Integer departureWallPenetratingEquipment;
 
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgExtendYYWDExport.java

@@ -33,46 +33,49 @@ public class OrgExtendYYWDExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "产权类型", index = 6)
+    @ExcelProperty(value = "产权类型", index = 7)
     private String ownerShipName;
 
-    @ExcelProperty(value = "所在位置", index = 7)
+    @ExcelProperty(value = "所在位置", index = 8)
     private String outsideArea;
 
-    @ExcelProperty(value = "夜间值守方式", index = 8)
+    @ExcelProperty(value = "夜间值守方式", index = 9)
     private String dutyMode;
 
-    @ExcelProperty(value = "是否设立保管箱库", index = 9)
+    @ExcelProperty(value = "是否设立保管箱库", index = 10)
     private String safeBox;
 
-    @ExcelProperty(value = "是否设立业务库", index = 10)
+    @ExcelProperty(value = "是否设立业务库", index = 11)
     private String businessLibrary;
 
-    @ExcelProperty(value = "是否设立在行式自助银行", index = 11)
+    @ExcelProperty(value = "是否设立在行式自助银行", index = 12)
     private String selfServiceBank;
 
-    @ExcelProperty(value = "在行式大堂式机具", index = 12)
+    @ExcelProperty(value = "在行式大堂式机具", index = 13)
     private Integer onLineLobbyEquipment;
 
-    @ExcelProperty(value = "在行式穿墙式机具", index = 13)
+    @ExcelProperty(value = "在行式穿墙式机具", index = 14)
     private Integer onLineWallPenetratingEquipment;
 
-    @ExcelProperty(value = "业务库类型", index = 14)
+    @ExcelProperty(value = "业务库类型", index = 15)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "是否配备保安人员", index = 15)
+    @ExcelProperty(value = "是否配备保安人员", index = 16)
     private String askari;
 
-    @ExcelProperty(value = "内部保安人数(含派遣)", index = 16)
+    @ExcelProperty(value = "内部保安人数(含派遣)", index = 17)
     private Integer innerCount;
 
-    @ExcelProperty(value = "外聘保安人数", index = 17)
+    @ExcelProperty(value = "外聘保安人数", index = 18)
     private Integer outsideCount;
 
-    @ExcelProperty(value = "是否取得保安证书", index = 18)
+    @ExcelProperty(value = "是否取得保安证书", index = 19)
     private String isAskariCertificate;
 
 //    @ExcelProperty(value = "保安证", index = 19,converter = ImgUrlConverter.class)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgExtendZXYWKExport.java

@@ -33,16 +33,19 @@ public class OrgExtendZXYWKExport {
     @ExcelProperty(value = "机构类型", index = 4)
     private String typeName;
 
-    @ExcelProperty(value = "地址", index = 5)
+    @ExcelProperty(value = "状态", index = 5)
+    private String status;
+
+    @ExcelProperty(value = "地址", index = 6)
     private String address;
 
-    @ExcelProperty(value = "是否设立业务库", index = 6)
+    @ExcelProperty(value = "是否设立业务库", index = 7)
     private String businessLibrary;
 
-    @ExcelProperty(value = "业务库类型", index = 7)
+    @ExcelProperty(value = "业务库类型", index = 8)
     private String businessLibraryTypeName;
 
-    @ExcelProperty(value = "夜间值守方式", index = 8)
+    @ExcelProperty(value = "夜间值守方式", index = 9)
     private String dutyMode;
 
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgPhysicalDefenseConstructionDetailExport.java

@@ -40,19 +40,22 @@ public class OrgPhysicalDefenseConstructionDetailExport {
     @ExcelProperty(value = "机构类型", index = 5)
     private String typeName;
 
-    @ExcelProperty(value = "GA38机构类型", index = 6)
+    @ExcelProperty(value = "状态", index = 6)
+    private String status;
+
+    @ExcelProperty(value = "GA38机构类型", index = 7)
     private String extendTypeName;
 
-    @ExcelProperty(value = "GA38标准", index = 7)
+    @ExcelProperty(value = "GA38标准", index = 8)
     private String standard;
 
-    @ExcelProperty(value = "达标日期", index = 8)
+    @ExcelProperty(value = "达标日期", index = 9)
     private String dateOfCompliance;
 
-    @ExcelProperty(value = "未达标原因", index = 9)
+    @ExcelProperty(value = "未达标原因", index = 10)
     private String reason;
 
-    @ExcelProperty(value = "计划达标日期", index = 10)
+    @ExcelProperty(value = "计划达标日期", index = 11)
     private String dateOfComplete;
 
 //    @ExcelProperty(value = "证书", index = 11,converter = ImgUrlConverter.class)

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

@@ -1336,6 +1336,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             b.affiliated_bank AS affiliatedBank,
             b.short_name AS shortName,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'sys_org_type' AND dict_value = b.type ) AS typeName,
+            ( CASE b.is_lock WHEN 1 THEN '停用' ELSE '正常' END ) AS status,
             b.address AS address,
             IFNULL(SUBSTR( a.construction_time, 1, 4 ), '' ) AS constructionTime,
             IFNULL(SUBSTR( a.last_update_time, 1, 4 ), '' ) AS lastUpdateTime,
@@ -1389,6 +1390,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
                     #{orgType}
                 </foreach>
             </if>
+        order by b.affiliated_bank asc,b.is_lock asc
     </select>
     <select id="exportDefenseDetailExtend" resultType="com.xunmei.system.util.OrgPhysicalDefenseConstructionDetailExport">
         SELECT
@@ -1397,6 +1399,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             b.affiliated_bank AS affiliatedBank,
             b.short_name AS shortName,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'sys_org_type' AND dict_value = b.type ) AS typeName,
+            ( CASE b.is_lock WHEN 1 THEN '停用' ELSE '正常' END ) AS status,
             b.address AS address,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'org_extend_type' AND dict_value = a.type ) AS extendTypeName,
             ( SELECT dict_label FROM sys_dict_data WHERE dict_type = 'org_extend_standard' AND dict_value = a.standard ) AS standard,
@@ -1424,6 +1427,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
                     #{orgType}
                 </foreach>
             </if>
+        order by b.affiliated_bank asc,b.is_lock asc
     </select>
 
 </mapper>