From c9b04383c77f91ac309e37e70783edcf8a9298b5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 18 五月 2024 23:24:12 +0800
Subject: [PATCH] websocket代码整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/WorkstationCache.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/WorkstationCache.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/WorkstationCache.java
index 54a8927..8f9e1b4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/WorkstationCache.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/WorkstationCache.java
@@ -1,26 +1,29 @@
package com.qianwen.smartman.common.cache.cps;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import java.util.ArrayList;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.util.SystemPropertyUtils;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.qianwen.core.redis.cache.BladeRedis;
+import com.qianwen.core.secure.utils.AuthUtil;
+import com.qianwen.core.tool.utils.Func;
+import com.qianwen.core.tool.utils.SpringUtil;
import com.qianwen.smartman.common.constant.ExtCacheConstant;
import com.qianwen.smartman.common.constant.ProductionTimeConstant;
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
import com.qianwen.smartman.common.utils.CommonUtil;
-import com.qianwen.core.redis.cache.BladeRedis;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.core.tool.utils.SpringUtil;
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.dto.WorkstationDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationParamTypeDTO;
@@ -37,10 +40,7 @@
import com.qianwen.smartman.modules.mdc.dto.WorkstationDmpDTO;
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
import com.qianwen.smartman.modules.mdc.mapper.SuperProcessParameterMapper;
-import org.springframework.data.redis.core.SetOperations;
-import org.springframework.util.SystemPropertyUtils;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/cache/cps/WorkstationCache.class */
public class WorkstationCache {
public static final String CRC = "crc:";
private static final String WORKSTATION = "workstation:";
@@ -80,7 +80,7 @@
BLADE_REDIS.expire(redisKey, 600L);
return wcsList;
}
- return (List) members.stream().map(c -> {
+ return members.stream().map(c -> {
return (WorkstationWcsDmpDTO) Func.convert(c, WorkstationWcsDmpDTO.class);
}).filter(c2 -> {
return Func.notNull(c2) && Func.isNotBlank(c2.getName());
@@ -129,13 +129,13 @@
}
public static Map<String, Object> getWorkstationRealTime(String workstationId) {
- new HashMap();
+
String cacheName = CommonUtil.getReallyCacheName(ExtCacheConstant.CPS_CACHE, WORKSTATION_REAL_TIME, "", workstationId);
Map<String, Object> resultMapping = BLADE_REDIS.hGetAll(cacheName);
if (Func.isEmpty(resultMapping)) {
List<WorkstationCollectData> workstationCollectData = superProcessParameterMapper.queryLastParameter(workstationId);
if (Func.isNotEmpty(workstationCollectData)) {
- resultMapping = (Map) workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
+ resultMapping = workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
return v0.getN();
}, item -> {
TelemetryDataResponseDTO result = new TelemetryDataResponseDTO();
@@ -195,7 +195,7 @@
if (Func.isEmpty(workstationWcsDTOList)) {
BLADE_REDIS.hSet(redisKey, paramName, new ArrayList());
} else {
- List<WorkstationParamTypeDTO> collect = (List) workstationWcsDTOList.stream().map(workstationWcsDTO -> {
+ List<WorkstationParamTypeDTO> collect = workstationWcsDTOList.stream().map(workstationWcsDTO -> {
WorkstationParamTypeDTO workstationParamTypeDTO = WorkstationParamTypeDTO.builder().type(workstationWcsDTO.getDataType()).workstationId(workstationWcsDTO.getWorkstationId()).id(workstationWcsDTO.getId()).build();
return workstationParamTypeDTO;
}).collect(Collectors.toList());
@@ -272,11 +272,8 @@
if (Func.isEmpty(dtos)) {
return Maps.newHashMap();
}
- Map<String, WorkstationDmpDTO> dmpMap = (Map) dtos.stream().collect(Collectors.toMap((v0) -> {
- return v0.getDmpName();
- }, v -> {
- return v;
- }));
+ Map<String, WorkstationDmpDTO> dmpMap = dtos.stream().collect(Collectors.toMap(WorkstationDmpDTO::getDmpName, v -> v));
+
BLADE_REDIS.getRedisTemplate().opsForHash().putAll(redisKey, dmpMap);
BLADE_REDIS.expire(redisKey, ExtCacheConstant.FIVE_MINUTES_EXPIRE_TIME.longValue());
return dmpMap;
--
Gitblit v1.9.3