From 85bb45834b1a2fd993d9f8653c48d14efc12a59e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 四月 2024 12:09:46 +0800
Subject: [PATCH] 去掉无用注释
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java | 85 ++++++++++++++++++++----------------------
1 files changed, 40 insertions(+), 45 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 cd742b9..f94191e 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
@@ -125,7 +125,6 @@
import com.qianwen.smartman.modules.tdengine.service.IWorkstationDynamicCollectService;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationServiceImpl.class */
public class WorkstationServiceImpl extends BaseServiceImpl<WorkstationMapper, Workstation> implements IWorkstationService {
private static final Pattern CHINESE = Pattern.compile("^[A-Za-z0-9]+$");
private final IMachineService machineService;
@@ -181,24 +180,24 @@
return Long.valueOf(seconds);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationWcsDmpDTO> queryWcsList(String workstationId) {
return this.baseMapper.queryWcsList(workstationId).stream().filter(c -> {
return (WcsDataTypeEnums.WcsDataType.ALARM.getCode().equals(c.getWcsDataType()) || WcsDataTypeEnums.WcsDataType.ALARM_NUM.getCode().equals(c.getWcsDataType()) || WcsDataTypeEnums.WcsDataType.ALARM_INFO.getCode().equals(c.getWcsDataType())) ? false : true;
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public WorkstationWcsDmpDTO queryDateTypeState(Integer code, String workstationId) {
return ((WorkstationMapper) this.baseMapper).queryDateTypeState(code, workstationId);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<DmpVariablesVO> queryDmpList(String workstationId) {
return ((WorkstationMapper) this.baseMapper).queryDmpList(workstationId);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public WorkstationVO submit(WorkstationSubmitVO workstationSubmitVO) {
checkWorkstation(workstationSubmitVO);
@@ -347,12 +346,12 @@
}
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Boolean changeCollectSwitch(Long workstationId, Integer collectSwitch) {
return this.machineService.changeCollectSwitch(workstationId, collectSwitch);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean delete(List<Long> workstationIds, Integer type) {
String redisKey = ExtCacheConstant.CPS_CACHE.concat(":").concat(":").concat(WorkstationCache.CRC);
@@ -388,7 +387,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<WorkstationVO> listPage(IPage<WorkstationVO> workstationVOIPage, String keyWord, Long groupId, Integer status, Integer type) {
List<String> workStationGroupIdList = new ArrayList<>();
if (!Objects.equals(groupId, CommonGroupConstant.ALL_WORKSTATION_ID) && Func.isNotEmpty(groupId)) {
@@ -407,7 +406,7 @@
return workstationVOIPage.setRecords(workstationVOS);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationVO> getWorkstationByGroupIds(final List<String> groupIds) {
List<WorkstationVO> workstationVOS = this.workstationMapper.listWorkstation(groupIds);
workstationVOS.forEach(workstationVO -> {
@@ -437,11 +436,9 @@
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<FmsWorkstation> getFmsWorkstation(final List<Long> workstationIds) {
- List<Long> commonGroupIds = this.commonGroupService.list(Lambda.eq((v0) -> {
- return v0.getGroupTag();
- }, FmsOrderEnum.FMS_BELTLINE.getCode())).stream().map((v0) -> {
+ List<Long> commonGroupIds = this.commonGroupService.list(Lambda.eq(CommonGroup::getGroupTag, FmsOrderEnum.FMS_BELTLINE.getCode())).stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<FmsWorkstation> fmsWorkstations = commonGroupIds.stream().flatMap(id -> {
@@ -469,14 +466,14 @@
return fmsWorkstations;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Boolean changeCalendarCode(WorkstationChangeCalendarVO workstationChangeCalendarVO) {
Workstation workstation = (Workstation) getById(workstationChangeCalendarVO.getWorkstationId());
workstation.setCalendarCodeWaiting(workstationChangeCalendarVO.getCalendarCodeWaiting());
return Boolean.valueOf(updateById(workstation));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public void updateWorkstationCalendar() {
List<Workstation> list = list(new QueryWrapper<Workstation>().lambda().isNotNull(Workstation::getCalendarCodeWaiting));
List<Workstation> workstationList = new ArrayList<>();
@@ -493,7 +490,7 @@
WorkstationCache.clearWorkstationCache();
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean changeWorkstationGroup(Long groupId, List<Long> workstationIdList) {
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(groupId);
@@ -510,12 +507,10 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteGroup(Long groupId) {
- if (this.commonGroupOfItemService.count(Lambda.eq((v0) -> {
- return v0.getGroupId();
- }, groupId)) > 0) {
+ if (this.commonGroupOfItemService.count(Lambda.eq(CommonGroupOfItem::getGroupId, groupId)) > 0) {
throw new ServiceException(MessageUtils.message("cps.common.group.production.line.delete.fail", new Object[0]));
}
this.transferDirectoryGroupService.deleteWorkstationGroup(groupId);
@@ -523,7 +518,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BladeFile importWorkstation(List<WorkstationImport> data) {
if (Func.isEmpty(data)) {
@@ -569,7 +564,7 @@
return null;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public BladeFile exportWorkstation(String keyWord, Long groupId, HttpServletResponse response) {
Query query = new Query();
query.setSize(-1);
@@ -585,7 +580,7 @@
return bladeFile;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query) {
List<String> workStationGroupIdList = dto.getWorkStationGroupIdList();
if (workStationGroupIdList.size() == 1) {
@@ -598,7 +593,7 @@
return manualBuildIPage(query, buildProperties(result, dto.getDeviceStatus()));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<RealTimeStatusVO> getRealTimeProperties(Long workstationId, Long machineId) {
List<RealTimeStatusVO> properties = new ArrayList<>();
Map<String, Object> map = WorkstationCache.getWorkstationRealTime(String.valueOf(workstationId));
@@ -654,49 +649,49 @@
return properties;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<Workstation> listWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Query query, Integer shift, Integer type) {
return ((WorkstationMapper) this.baseMapper).listWorkStationOnShiftIndex(Condition.getPage(query), Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listWorkStationOnShift(List<Long> ids, LocalDate localDate, List<Integer> shifts, Integer type) {
return ((WorkstationMapper) this.baseMapper).listWorkStationOnShift(Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shifts, type, ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Integer countWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Integer shift, Integer type) {
return ((WorkstationMapper) this.baseMapper).countWorkStationOnShiftIndex(Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listWorkStationByGroupId(List<String> ids) {
return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId(ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listWorkStationByGroup(List<Long> ids) {
return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId(ids.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList()));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Set<Long> findByIndexAndDateAndTypeAndYear(Integer year, String queryDate, Integer shiftIndex, Integer code) {
return ((WorkstationMapper) this.baseMapper).findByIndexAndDateAndTypeAndYear(year, queryDate, shiftIndex, code);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Long> findByMachineShortCode(String code) {
return ((WorkstationMapper) this.baseMapper).findByMachineShortCode(code);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> workStationList(List<Long> ids) {
return list(new QueryWrapper<Workstation>().lambda().in(Workstation::getId, ids).orderByAsc(Workstation::getName));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Map<Long, GroupWorkDTO> queryGroupWorkStation(List<Long> ids) {
List<GroupWorkDTO> groupWorkDTOS = this.baseMapper.queryGroupWorkStation(ids);
return groupWorkDTOS.stream().collect(Collectors.toMap((v0) -> {
@@ -706,12 +701,12 @@
}));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public ProductionCalendarDay getDayShift(Long workstationId, String calendarDate) {
return ((WorkstationMapper) this.baseMapper).getDayShift(workstationId, calendarDate);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Long> productionLineList(Long groupId) {
List<Long> ids = Lists.newArrayList();
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(groupId);
@@ -731,7 +726,7 @@
return ids;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationDmpDTO> getDmpVar(String workstationId) {
return ((WorkstationMapper) this.baseMapper).getDmpVar(workstationId);
}
@@ -941,7 +936,7 @@
return false;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public WorkstationVO getDetail(Long workstationId) {
SpaceRootNodeVO ftpDirectory;
Workstation workstation = (Workstation) getById(workstationId);
@@ -998,7 +993,7 @@
return null;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<DmpVariablesVO> getDmpVariables(String workstationId, String machineId) {
if (Func.isBlank(machineId)) {
throw new ServiceException(MessageUtils.message("workstation.not.turn.on.acquisition.function", new Object[0]));
@@ -1077,7 +1072,7 @@
return getCommonGroupIds(ids, list);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<FmsWorkstation> assemblyWorkstationData(List<String> workstationIds, Map<String, FmsRealTimeTray> realTimeTrayMap, List<FmsRealTimeTray> realTimeTrayList, List<String> positionList) {
List<FmsWorkstation> fmsWorkstationList = new ArrayList<>();
List<MachineInformationVO> informationList = new ArrayList<>();
@@ -1097,12 +1092,12 @@
return fmsWorkstationList;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public WorkMachineEasyVO getWorkMachine(String workstationId) {
return ((WorkstationMapper) this.baseMapper).getWorkMachine(workstationId);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<FmsWorkstationGroupVO> fmsTreeWorkstation(FmsWorkstationQueryVO queryVO) {
WorkTypeEnum workTypeEnum;
List<CommonGroup> allSubGroup = this.commonGroupService.getAllSubGroup(CommonGroupConstant.WARE_ROOT, CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
@@ -1146,22 +1141,22 @@
return roots;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listMachine(Integer status, String keyword) {
return ((WorkstationMapper) this.baseMapper).listMachine(status, keyword);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationVO> getWorkstationListInMaintainOrRepairById(Long orderProcessId, Set<Long> workstationIdList) {
return ((WorkstationMapper) this.baseMapper).getWorkstationListInMaintainOrRepairById(orderProcessId, workstationIdList);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationVO> getWorkstationListInMaintainOrRepairByIdList(List<Long> orderProcessIdList, Set<Long> workstationIdList) {
return ((WorkstationMapper) this.baseMapper).getWorkstationListInMaintainOrRepairByIdList(orderProcessIdList, workstationIdList);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<WorkstationRealTimeStatusVO> pageH5(Query query, WorkstationPageQueryVO workstationPageQueryVO) {
IPage<WorkstationVO> workstationVOIPage = listPage(new Page<WorkstationVO>().setSize(-1L), workstationPageQueryVO.getKeyWord(), null, workstationPageQueryVO.getStatus(), workstationPageQueryVO.getType());
IPage<WorkstationRealTimeStatusVO> convert = WorkstationConvert.INSTANCE.convertPage(workstationVOIPage);
--
Gitblit v1.9.3