履职登记簿 布撤防信息样式修改

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 {