From e8ed1a91c77ab62a924f12acd55777f227bacd7e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 21 十一月 2025 17:15:17 +0800
Subject: [PATCH] 工位组删除后，其下工位移动到默认组
---
smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/WorkstationCache.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 dcd8038..5f638ca 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
@@ -24,22 +24,23 @@
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
import com.qianwen.smartman.common.utils.CommonUtil;
-import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
-import com.qianwen.smartman.modules.cps.dto.WorkstationDTO;
-import com.qianwen.smartman.modules.cps.dto.WorkstationParamTypeDTO;
-import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDTO;
-import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
-import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
-import com.qianwen.smartman.modules.cps.entity.Workstation;
-import com.qianwen.smartman.modules.cps.message.dto.TelemetryDataResponseDTO;
-import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
-import com.qianwen.smartman.modules.cps.service.IMachineService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationWcsService;
-import com.qianwen.smartman.modules.cps.vo.WorkstationInGroupVO;
+import com.qianwen.smartman.modules.smis.convert.WorkstationConvert;
+import com.qianwen.smartman.modules.smis.dto.WorkstationDTO;
+import com.qianwen.smartman.modules.smis.dto.WorkstationParamTypeDTO;
+import com.qianwen.smartman.modules.smis.dto.WorkstationWcsDTO;
+import com.qianwen.smartman.modules.smis.dto.WorkstationWcsDmpDTO;
+import com.qianwen.smartman.modules.smis.entity.GlobalWcs;
+import com.qianwen.smartman.modules.smis.entity.Workstation;
+import com.qianwen.smartman.modules.smis.message.dto.TelemetryDataResponseDTO;
+import com.qianwen.smartman.modules.smis.service.IGlobalWcsService;
+import com.qianwen.smartman.modules.smis.service.IMachineService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationWcsService;
+import com.qianwen.smartman.modules.smis.vo.WorkstationInGroupVO;
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 com.qianwen.smartman.modules.mdc.service.IProcessParameterService;
public class WorkstationCache {
public static final String CRC = "crc:";
@@ -64,7 +65,8 @@
private static final IGlobalWcsService WCS_SERVICE = (IGlobalWcsService) SpringUtil.getBean(IGlobalWcsService.class);
private static final IWorkstationWcsService WORKSTATION_WCS_SERVICE = (IWorkstationWcsService) SpringUtil.getBean(IWorkstationWcsService.class);
private static final SuperProcessParameterMapper superProcessParameterMapper = (SuperProcessParameterMapper) SpringUtil.getBean(SuperProcessParameterMapper.class);
-
+ private static final IProcessParameterService processParameterService = SpringUtil.getBean(IProcessParameterService.class);
+
public static List<WorkstationWcsDmpDTO> getWorkstationWcsList(String workstationId) {
String redisKey = CommonUtil.getReallyCacheName(ExtCacheConstant.CPS_CACHE, WORKSTATION_WCS, "", workstationId);
SetOperations<String, Object> setOps = BLADE_REDIS.getSetOps();
@@ -138,7 +140,10 @@
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);
+ //
+ //List<WorkstationCollectData> workstationCollectData = superProcessParameterMapper.queryLastParameter(workstationId);
+ Long wid = Long.parseLong(workstationId);
+ List<WorkstationCollectData> workstationCollectData = processParameterService.queryLastParameter(wid);
if (Func.isNotEmpty(workstationCollectData)) {
resultMapping = workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
return v0.getN();
@@ -149,6 +154,7 @@
return result;
}));
}
+
}
return resultMapping;
}
--
Gitblit v1.9.3