From 9a9b747962cc00801d8cce4137d1e123d556a79b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:59 +0800
Subject: [PATCH] 修复iotdb大批插入数据问题

---
 collect/src/main/java/com/qianwen/mdc/collect/cache/WorkstationCache.java |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/collect/src/main/java/com/qianwen/mdc/collect/cache/WorkstationCache.java b/collect/src/main/java/com/qianwen/mdc/collect/cache/WorkstationCache.java
index 766f62b..dc91d11 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/cache/WorkstationCache.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/cache/WorkstationCache.java
@@ -8,6 +8,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +47,7 @@
     private EmployeeOnOffWorkMapper employeeOnOffWorkMapper;
     
     
-    public Map<Long, WorkstationDTO> getWorkstations() {
+    public Map<String, WorkstationDTO> getWorkstations() {
         String redisKey = COLLECT_WORKSTATION.concat("::").concat(WORKSTATION_ALL);
         /*Map<String, WorkstationDTO> map = bladeRedis.hGetAll(redisKey);
        
@@ -56,7 +57,7 @@
         }
         return map;
         */
-        Map<Long, WorkstationDTO> map = convertMap(redisUtil.hmget(redisKey));
+        Map<String, WorkstationDTO> map = convertMap(redisUtil.hmget(redisKey));
        
         if (ObjectUtil.isEmpty(map)) {
             map = setWorkstations();
@@ -66,28 +67,37 @@
         
     }
     
-    private Map<Long, WorkstationDTO> setWorkstations() {
+    private Map<String, WorkstationDTO> setWorkstations() {
         List<Workstation> list = workstationService.list();
         String redisKey = COLLECT_WORKSTATION.concat("::").concat(WORKSTATION_ALL);
-       
+        /*
         list.forEach(ws -> {
-        	/*
-            WorkStationDTO workStationDTO = WorkstationConvert.INSTANCE.convertDTO(workStation);
-            bladeRedis.hSet(redisKey, workStation.getId(), workStationDTO);
-            */
+        	
+            //WorkStationDTO workStationDTO = WorkstationConvert.INSTANCE.convertDTO(workStation);
+            //bladeRedis.hSet(redisKey, workStation.getId(), workStationDTO);
+           
         	WorkstationDTO dto = new WorkstationDTO();
         	dto.setCalendarCode(ws.getCalendarCode());
         	dto.setCode(ws.getCode());
         	dto.setId(ws.getId());
         	dto.setName(ws.getName());
             redisUtil.hset(redisKey, ws.getId(), dto);
-        });
-       
-        //bladeRedis.expire(redisKey, 259200L);
-        redisUtil.expire(redisKey, 259200L);
-        //return bladeRedis.hGetAll(redisKey);
+        });*/
+        //Map<String, String> map = str.collect(Collectors.toMap(p -> p[0], p -> p[1]));
+        Map<String,WorkstationDTO> mp = list.stream().collect(Collectors.toMap(ws -> String.valueOf(ws.getId()), ws->{
+        	WorkstationDTO dto = new WorkstationDTO();
+        	dto.setCalendarCode(ws.getCalendarCode());
+        	dto.setCode(ws.getCode());
+        	dto.setId(ws.getId());
+        	dto.setName(ws.getName());
+        	return dto;
+        }));
+        redisUtil.hmset(redisKey, mp);
         
-        return convertMap(redisUtil.hmget(redisKey));
+        redisUtil.expire(redisKey, 259200L);
+        
+        
+        return (Map<String, WorkstationDTO>)redisUtil.hmget(redisKey);
     }
     
     static <K,V> Map<K,V> convertMap(Map<?,?> map){

--
Gitblit v1.9.3