From f69073b835f1a0c66590130e1830edcdd75ebb8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:35 +0800
Subject: [PATCH] 去掉dmpvar
---
/dev/null | 80 ----------------------------------------
1 files changed, 0 insertions(+), 80 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/RealTimeDataController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/RealTimeDataController.java
deleted file mode 100644
index b545ba8..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/RealTimeDataController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.qianwen.smartman.modules.mdc.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import com.qianwen.core.scanner.modular.annotation.GetResource;
-import com.qianwen.core.scanner.modular.annotation.PostResource;
-import com.qianwen.core.scanner.modular.stereotype.ApiResource;
-import com.qianwen.core.tool.api.R;
-import com.qianwen.smartman.modules.smis.vo.DmpStatusVariableVO;
-import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;
-import com.qianwen.smartman.modules.mdc.service.IRealTimeDataService;
-import com.qianwen.smartman.modules.mdc.vo.WorkstationVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@ApiResource({"mdc/real-time-data"})
-@Api(value = "瀹炴椂鏁版嵁", tags = {"瀹炴椂鏁版嵁"})
-@RestController
-public class RealTimeDataController {
- private final IRealTimeDataService realTimeDataService;
-
- public RealTimeDataController(final IRealTimeDataService realTimeDataService) {
- this.realTimeDataService = realTimeDataService;
- }
- //yangys 20241022娉ㄩ噴锛屼及璁℃槸娌＄敤浜嗭紝鍑嗗鍒犻櫎
- /*
- @PostResource({"/status"})
- @ApiOperation(value = "鑾峰彇宸ヤ綅鐨勭姸鎬�", notes = "浼犲叆宸ヤ綅缁処D鎴栬�呭伐浣岻D鍒楄〃")
- public R<List<DmpStatusVariableVO>> getWorkstationRealTimeStatus(@RequestBody WorkstationVO workstationVO) {
- return R.data(this.realTimeDataService.getWorkstationRealTimeStatus(workstationVO));
- }
-
- @GetResource({"/dmp-variables/{workstationId}"})
- @ApiOperation(value = "鑾峰彇宸ヤ綅鐨勯噰闆嗛」", notes = "浼犲叆workstationId")
- public R<List<DmpVariablesVO>> getWorkstationDmpVariables(@PathVariable Long workstationId) {
- return R.data(this.realTimeDataService.getWorkstationDmpVariables(workstationId));
- }
- */
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java
deleted file mode 100644
index 92ea87f..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.qianwen.smartman.modules.mdc.service;
-
-import java.util.List;
-import com.qianwen.smartman.modules.smis.vo.DmpStatusVariableVO;
-import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;
-import com.qianwen.smartman.modules.mdc.vo.WorkstationVO;
-/**
- * 瀹炴椂鏁版嵁
- */
-public interface IRealTimeDataService {
- //List<DmpStatusVariableVO> getWorkstationRealTimeStatus(WorkstationVO workstationVO);
-
- //List<DmpVariablesVO> getWorkstationDmpVariables(Long workstationId);
-
-
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java
deleted file mode 100644
index 60137b2..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.qianwen.smartman.modules.mdc.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.apache.commons.collections.MapUtils;
-import com.qianwen.smartman.common.cache.cps.WorkstationCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.modules.smis.dto.WorkstationRealTimeStatusDTO;
-import com.qianwen.smartman.modules.smis.entity.WorkstationOfMachine;
-import com.qianwen.smartman.modules.smis.mapper.WorkstationMapper;
-import com.qianwen.smartman.modules.smis.message.dto.TelemetryDataResponseDTO;
-import com.qianwen.smartman.modules.smis.service.IDmpVariablesService;
-import com.qianwen.smartman.modules.smis.service.IWorkstationOfMachineService;
-import com.qianwen.smartman.modules.smis.vo.DmpStatusVariableVO;
-import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;
-import com.qianwen.smartman.modules.smis.vo.WorkstationRealTimeStatusVO;
-import com.qianwen.smartman.modules.mdc.service.IRealTimeDataService;
-import com.qianwen.smartman.modules.mdc.vo.WorkstationVO;
-import org.springframework.stereotype.Service;
-
-@Service("oldRealTimeDataService")
-public class RealTimeDataServiceImpl implements IRealTimeDataService {
- private final WorkstationMapper workstationMapper;
- private final IWorkstationOfMachineService workstationOfMachineService;
- private final IDmpVariablesService dmpVariablesService;
-
- public RealTimeDataServiceImpl(final WorkstationMapper workstationMapper, final IWorkstationOfMachineService workstationOfMachineService, final IDmpVariablesService dmpVariablesService) {
- this.workstationMapper = workstationMapper;
- this.workstationOfMachineService = workstationOfMachineService;
- this.dmpVariablesService = dmpVariablesService;
- }
- /*
- @Override
- public List<DmpStatusVariableVO> getWorkstationRealTimeStatus(WorkstationVO workstationVO) {
- List<Long> workstationIdList = workstationVO.getWorkstationIdList();
- if (Func.isEmpty(workstationIdList)) {
- List<String> workstationGroupIdList = workstationVO.getWorkstationGroupIdList().stream().map(x -> {
- return String.valueOf(x);
- }).collect(Collectors.toList());
- WorkstationRealTimeStatusDTO workstationRealTimeStatusDTO = new WorkstationRealTimeStatusDTO();
- workstationRealTimeStatusDTO.setWorkStationGroupIdList(workstationGroupIdList);
- workstationIdList = this.workstationMapper.getWorkstationListByWorkStationGroupIdList(null, workstationRealTimeStatusDTO).stream().map(WorkstationRealTimeStatusVO::getId).collect(Collectors.toList());
- }
- List<DmpStatusVariableVO> dmpStatusVariableList = this.dmpVariablesService.getDmpVariablesByWorkstationIdList(workstationIdList);
- dmpStatusVariableList.forEach(x2 -> {
- Map<String, Object> map = WorkstationCache.getWorkstationRealTime(String.valueOf(x2.getWorkstationId()));
- if (map.containsKey(x2.getVariableKey())) {
- TelemetryDataResponseDTO t = (TelemetryDataResponseDTO) MapUtils.getObject(map, x2.getVariableKey());
- x2.setVariableValue(t.getV());
- }
- });
- return dmpStatusVariableList;
- }
-
- @Override
- public List<DmpVariablesVO> getWorkstationDmpVariables(Long workstationId) {
- WorkstationOfMachine workstationOfMachine = this.workstationOfMachineService.getWorkstationOfMachineByWorkstationId(workstationId);
- if (Func.isEmpty(workstationOfMachine)) {
- throw new ServiceException(MessageUtils.message("workstation.not.turn.on.acquisition.function", new Object[0]));
- }
- List<DmpVariablesVO> dmpVariables = this.dmpVariablesService.getDmpVariablesByWorkstationId(Long.valueOf(workstationId.longValue()));
- return dmpVariables.stream().filter(DmpVariablesVO::getRealTimeData).collect(Collectors.toList());
- }
- */
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IDmpVariablesService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IDmpVariablesService.java
deleted file mode 100644
index 566cb08..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IDmpVariablesService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.qianwen.smartman.modules.smis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-import com.qianwen.smartman.modules.smis.entity.DmpVariables;
-import com.qianwen.smartman.modules.smis.vo.DmpStatusVariableVO;
-import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;
-import com.qianwen.smartman.modules.smis.vo.MachineDmpVariablesVO;
-
-public interface IDmpVariablesService extends IService<DmpVariables> {
- List<DmpVariablesVO> listByMachineId(Long machineId);
-
- MachineDmpVariablesVO listByWorkstationId(Long workstationId);
-
- List<DmpVariablesVO> getDmpVariablesByWorkstationId(Long workstationId);
-
- List<DmpStatusVariableVO> getDmpVariablesByWorkstationIdList(List<Long> workstationIdList);
-
- List<DmpVariablesVO> getDmpVariablesByWorkstationIds(List<Long> workstationIds);
-}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/DmpVariablesServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/DmpVariablesServiceImpl.java
deleted file mode 100644
index f505f66..0000000
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/DmpVariablesServiceImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.qianwen.smartman.modules.smis.service.impl;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.smartman.common.enums.WorkstationParamTypeEnum;
-import com.qianwen.smartman.modules.smis.convert.DmpVariablesConvert;
-import com.qianwen.smartman.modules.smis.entity.DmpVariables;
-import com.qianwen.smartman.modules.smis.entity.Machine;
-import com.qianwen.smartman.modules.smis.entity.WorkstationOfMachine;
-import com.qianwen.smartman.modules.smis.mapper.DmpVariablesMapper;
-import com.qianwen.smartman.modules.smis.service.IDmpVariablesService;
-import com.qianwen.smartman.modules.smis.service.IMachineService;
-import com.qianwen.smartman.modules.smis.service.IWorkstationOfMachineService;
-import com.qianwen.smartman.modules.smis.vo.DmpStatusVariableVO;
-import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;
-import com.qianwen.smartman.modules.smis.vo.MachineDmpVariablesVO;
-
-@Service
-public class DmpVariablesServiceImpl extends ServiceImpl<DmpVariablesMapper, DmpVariables> implements IDmpVariablesService {
- private final IWorkstationOfMachineService workstationOfMachineService;
- private final IMachineService machineService;
-
-
- public DmpVariablesServiceImpl(final IWorkstationOfMachineService workstationOfMachineService, final IMachineService machineService) {
- this.workstationOfMachineService = workstationOfMachineService;
- this.machineService = machineService;
- }
-
- @Override
- public List<DmpVariablesVO> listByMachineId(Long machineId) {
- List<DmpVariables> list = list(Wrappers.<DmpVariables>lambdaQuery().eq(DmpVariables::getMachineId, machineId));
- return DmpVariablesConvert.INSTANCE.convert(list);
- }
-
- @Override
- public MachineDmpVariablesVO listByWorkstationId(Long workstationId) {
- WorkstationOfMachine workstationOfMachine = this.workstationOfMachineService.getWorkstationOfMachineByWorkstationId(workstationId);
- if (Func.isNotEmpty(workstationOfMachine)) {
- Machine machine = (Machine) this.machineService.getById(workstationOfMachine.getMachineId());
- if (Func.isNotEmpty(machine)) {
- MachineDmpVariablesVO machineDmpVariablesVO = new MachineDmpVariablesVO();
- machineDmpVariablesVO.setMachineCode(machine.getMachineCode());
- machineDmpVariablesVO.setMachineName(machine.getMachineName());
- machineDmpVariablesVO.setMachineBrand(machine.getBrand());
- machineDmpVariablesVO.setTypeName(machine.getTypeName());
- List<DmpVariablesVO> dmpVariablesVOList = ((DmpVariablesMapper) this.baseMapper).getVariablesAndWcs(machine.getId(), workstationId);
- dmpVariablesVOList.forEach(dmpVariablesVO -> {
- if (Func.isEmpty(dmpVariablesVO.getDataItem())) {
- dmpVariablesVO.setDataItem(dmpVariablesVO.getDescription());
- dmpVariablesVO.setWcsDataType(WorkstationParamTypeEnum.OTHER.getType());
- }
- dmpVariablesVO.setSort(dmpVariablesVO.getIdx());
- });
- machineDmpVariablesVO.setDmpVariablesVOList(dmpVariablesVOList);
- return machineDmpVariablesVO;
- }
- }
- return new MachineDmpVariablesVO();
- }
-
- @Override
- public List<DmpVariablesVO> getDmpVariablesByWorkstationId(Long workstationId) {
- return this.baseMapper.getDmpVariablesByWorkstationId(workstationId);
- }
-
- @Override
- public List<DmpStatusVariableVO> getDmpVariablesByWorkstationIdList(List<Long> workstationIdList) {
- return ((DmpVariablesMapper) this.baseMapper).getDmpVariablesByWorkstationIdList(workstationIdList);
- }
-
- @Override
- public List<DmpVariablesVO> getDmpVariablesByWorkstationIds(List<Long> workstationIds) {
- return ((DmpVariablesMapper) this.baseMapper).getDmpVariablesByWorkstationIds(workstationIds);
- }
-}
--
Gitblit v1.9.3