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/mdc/service/impl/WorkstationAnalysisServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
index b140611..9a13b5e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
@@ -17,6 +17,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -42,7 +43,6 @@
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
import com.qianwen.smartman.modules.mdc.mapper.SuperAggregateStateMapper;
import com.qianwen.smartman.modules.mdc.mapper.SuperAlarmMapper;
-import com.qianwen.smartman.modules.mdc.mapper.SuperProcessParameterMapper;
import com.qianwen.smartman.modules.mdc.service.IProcessParameterService;
import com.qianwen.smartman.modules.mdc.service.IWorkstationAnalysisService;
import com.qianwen.smartman.modules.mdc.vo.AlarmAnalysisWorkstationVO;
@@ -55,15 +55,20 @@
public class WorkstationAnalysisServiceImpl implements IWorkstationAnalysisService {
private static final Logger log = LoggerFactory.getLogger(WorkstationAnalysisServiceImpl.class);
public static final String STATUS = "STATUS";
- private final SuperAggregateStateMapper superAggregateStateMapper;
- private final SuperAlarmMapper superAlarmMapper;
- private final IGlobalWcsService globalWcsService;
- private final WorkstationMapper workstationMapper;
- private final SuperProcessParameterMapper superProcessParameterMapper;
- private final IWorkstationService workstationService;
-
+ @Autowired
+ private SuperAggregateStateMapper superAggregateStateMapper;
+ @Autowired
+ private SuperAlarmMapper superAlarmMapper;
+ @Autowired
+ private IGlobalWcsService globalWcsService;
+ @Autowired
+ private WorkstationMapper workstationMapper;
+ //private final SuperProcessParameterMapper superProcessParameterMapper;
+ @Autowired
+ private IWorkstationService workstationService;
+ @Autowired
private IProcessParameterService processParameterService;
-
+ /*
public WorkstationAnalysisServiceImpl(final SuperAggregateStateMapper superAggregateStateMapper, final SuperAlarmMapper superAlarmMapper, final IGlobalWcsService globalWcsService, final WorkstationMapper workstationMapper, final SuperProcessParameterMapper superProcessParameterMapper, final IWorkstationService workstationService,IProcessParameterService aProcessParameterService) {
this.superAggregateStateMapper = superAggregateStateMapper;
this.superAlarmMapper = superAlarmMapper;
@@ -72,7 +77,7 @@
this.superProcessParameterMapper = superProcessParameterMapper;
this.workstationService = workstationService;
this.processParameterService = aProcessParameterService;
- }
+ }*/
@Override
public List<StatusAnalysisWorkstationVO> statusByWorkstation(String workstationId) {
@@ -209,7 +214,7 @@
//this error
//List<WorkstationCollectData> workstationCollectData = this.superProcessParameterMapper.queryLastParameter(wId);//璇ュ伐浣嶆渶鏂扮殑last(ts),last(v)
- List<WorkstationCollectData> workstationCollectData = processParameterService.lastParameter(Long.parseLong(wId));
+ List<WorkstationCollectData> workstationCollectData = processParameterService.queryLastParameter(Long.parseLong(wId));
if (Func.isNotEmpty(workstationCollectData)) {
//resultMapping ,key:n 锛寁alue锛歍elemetryDataResponseDTO{last(ts),last(v)}
Map<String, Object> resultMapping = workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
--
Gitblit v1.9.3