From 444b1808d73d21f9df361e64f44381b910947792 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 27 九月 2024 11:05:08 +0800
Subject: [PATCH] 去掉tdedgine，去掉一部分rocketmq，去掉dmplog模块
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
index ddb710b..1fa8afe 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
@@ -23,6 +23,7 @@
import org.apache.commons.collections.MapUtils;
import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -58,6 +59,7 @@
import com.qianwen.smartman.common.enums.DictEnum;
import com.qianwen.smartman.common.enums.StatusType;
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
+import com.qianwen.smartman.common.mqtt.MqttMessageSender;
import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.common.utils.MessageUtils;
@@ -141,7 +143,9 @@
private final IWorkstationWorkbenchService workbenchService;
private final IDncWsRelationTdService wsRelationTdService;
private final IDncFixedSpaceService dncFixedSpaceService;
- private final InsertWorkstationProducer workstationProducer;
+ @Autowired
+ private InsertWorkstationProducer workstationProducer;
+
private final IWorkstationDynamicCollectService dynamicCollectService;
private final String NAME = "榛樿宸ヤ綔鍙�";
private final Integer SORT = 1;
@@ -150,9 +154,10 @@
private final String ALL_WORKSTATION_GROUP = CommonGroupConstant.ALL_NAME;
private final Integer FTP_CORRELATION_DIRECTORY = 1;
private final Integer FTP_SAME_DIRECTORY = 2;
+ @Autowired
+ private MqttMessageSender mqttMsgSender;
-
- public WorkstationServiceImpl(final IMachineService machineService, final IWorkstationOfMachineService workstationOfMachineService, final IWorkstationWcsService workstationWcsService, final ICommonGroupOfItemService commonGroupOfItemService, final ICommonGroupService commonGroupService, final ICalendarService calendarService, final WorkstationMapper workstationMapper, final OssBuilder ossBuilder, final IDmpVariablesService dmpVariablesService, final ITransferDirectoryService transferDirectoryService, final ITransferDirectoryGroupService transferDirectoryGroupService, final IWorkstationWorkbenchService workbenchService, final IDncWsRelationTdService wsRelationTdService, final IDncFixedSpaceService dncFixedSpaceService, final InsertWorkstationProducer workstationProducer, final IWorkstationDynamicCollectService dynamicCollectService) {
+ public WorkstationServiceImpl(final IMachineService machineService, final IWorkstationOfMachineService workstationOfMachineService, final IWorkstationWcsService workstationWcsService, final ICommonGroupOfItemService commonGroupOfItemService, final ICommonGroupService commonGroupService, final ICalendarService calendarService, final WorkstationMapper workstationMapper, final OssBuilder ossBuilder, final IDmpVariablesService dmpVariablesService, final ITransferDirectoryService transferDirectoryService, final ITransferDirectoryGroupService transferDirectoryGroupService, final IWorkstationWorkbenchService workbenchService, final IDncWsRelationTdService wsRelationTdService, final IDncFixedSpaceService dncFixedSpaceService,final IWorkstationDynamicCollectService dynamicCollectService) {
this.machineService = machineService;
this.workstationOfMachineService = workstationOfMachineService;
this.workstationWcsService = workstationWcsService;
@@ -167,7 +172,7 @@
this.workbenchService = workbenchService;
this.wsRelationTdService = wsRelationTdService;
this.dncFixedSpaceService = dncFixedSpaceService;
- this.workstationProducer = workstationProducer;
+ //this.workstationProducer = workstationProducer;
this.dynamicCollectService = dynamicCollectService;
}
@@ -234,9 +239,12 @@
CacheUtil.clear(redisKey, Boolean.FALSE);
WorkstationVO workstationVO = WorkstationConvert.INSTANCE.convertSaveVO(workstationSubmitVO);
workstationVO.setId(workstation.getId());
- if (Func.isNull(workstationSubmitVO.getId())) {
- WorkstationCreateMessageDTO dto = WorkstationCreateMessageDTO.builder().workstationId(workstation.getId().toString()).operationTime(DateUtil.now()).build();
- this.workstationProducer.sendInsertWorkstationMessage(dto);
+
+ if (Func.isNull(workstationSubmitVO.getId())) {//鏂板宸ヤ綅锛屽彂閫佹秷鎭紝post搴旂敤鎵撳浐瀹氱偣
+ //WorkstationCreateMessageDTO dto = WorkstationCreateMessageDTO.builder().workstationId(workstation.getId().toString()).operationTime(DateUtil.now()).build();
+ //this.workstationProducer.sendInsertWorkstationMessage(dto);
+ workstationProducer.sendInsertWorkstationMessage(workstation.getId());
+
}
return workstationVO;
}
@@ -1059,9 +1067,11 @@
}
public List<CommonGroup> getCommonGroupIds(List<String> idList, List<CommonGroup> list) {
+ /*
List<CommonGroup> commonGroupList = this.commonGroupService.list(Lambda.in((v0) -> {
return v0.getParentId();
- }, idList));
+ }, idList));*/
+ List<CommonGroup> commonGroupList = this.commonGroupService.list(Lambda.<CommonGroup>in(CommonGroup::getParentId, idList));
if (Func.isEmpty(commonGroupList)) {
return list;
}
--
Gitblit v1.9.3