From 13304af2facdc0e9d8df197c0cf5ed51c94ffc8f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 18 五月 2024 22:35:05 +0800
Subject: [PATCH] 全面注释整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java
index 6ad760d..4e67bd9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java
@@ -1,31 +1,31 @@
package com.qianwen.smartman.modules.tdengine.service.impl;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.enums.DynamicCalculationWcsDataType;
-import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
-import com.qianwen.smartman.common.utils.DelayList;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.SpringUtil;
+import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
+import com.qianwen.smartman.common.enums.DynamicCalculationWcsDataType;
+import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
+import com.qianwen.smartman.common.utils.DelayList;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.cps.dto.CalendarShiftTimeSlicesDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.entity.WorkstationWcs;
@@ -41,9 +41,8 @@
import com.qianwen.smartman.modules.visual.dto.VisualTimeDTO;
import com.qianwen.smartman.modules.visual.utils.VisualUtils;
import com.qianwen.smartman.modules.visual.vo.VisualUsagePolicyEnum;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
@Service
public class WorkstationDynamicCollectServiceImpl implements IWorkstationDynamicCollectService {
@@ -140,14 +139,12 @@
//workstationIds.forEach(workstationId -> this.workstationWcsService.list((Wrapper)((ExtraLambdaQueryWrapper)Lambda.eq(WorkstationWcs::getWorkstationId, workstationId).isNotNull(WorkstationWcs::getUsageId)).select(new SFunction[] { WorkstationWcs::getUsageId })).stream().map(WorkstationWcs::getUsageId).map(this.workstationWcsUsageService::getById).forEach(()));
workstationIds.forEach(workstationId -> {
- //Stream map = this.workstationWcsService.list(((ExtraLambdaQueryWrapper) Lambda.eq(WorkstationWcs::getWorkstationId, workstationId).isNotNull(WorkstationWcs::getUsageId).select(new SFunction[] { WorkstationWcs::getUsageId }).stream().map(WorkstationWcs::getUsageId);
Stream<Long> map = this.workstationWcsService.list(Lambda.<WorkstationWcs>eq(WorkstationWcs::getWorkstationId, workstationId).isNotNull(WorkstationWcs::getUsageId)
.select(WorkstationWcs::getUsageId )).stream().map(WorkstationWcs::getUsageId);
////.map(WorkstationWcs::getUsageId);
- IWorkstationWcsUsageService iWorkstationWcsUsageService = this.workstationWcsUsageService;
- //iWorkstationWcsUsageService.getClass();
- map.map((v1) -> {
- return this.workstationWcsUsageService.getById(v1);
+
+ map.map((usageId) -> {
+ return this.workstationWcsUsageService.getById(usageId);
}).forEach(it -> {
removeTable(workstationId, it.getUsageCode(), it.getCollectType());
});
@@ -160,17 +157,7 @@
return this.workstationWcsService.list(Lambda.<WorkstationWcs>eq(WorkstationWcs::getUsageId, usageId).select(WorkstationWcs::getWorkstationId)).stream()
.filter(Func::notNull)
.map(WorkstationWcs::getWorkstationId).collect(Collectors.toList());
- /*
- return (List) this.workstationWcsService.list(Lambda.eq((v0) -> {
- return v0.getUsageId();
- }, usageId).select((v0) -> {
- return v0.getWorkstationId();
- })).stream().filter((v0) -> {
- return Func.notNull(v0);
- }).map((v0) -> {
- return v0.getWorkstationId();
- }).collect(Collectors.toList());
- */
+
}
@Override
--
Gitblit v1.9.3