From b773661de485d9748386bfdd15a7ac7cd399be36 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 02 四月 2024 11:20:34 +0800
Subject: [PATCH] visual修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualGlobalApiServiceImpl.java | 112 +----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java | 92 +---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompTypeServiceImpl.java | 127 -----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dto/VisualDownloadDTO.java | 15
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java | 150 ++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/VisualCountPulseWrapper.java | 112 ++--
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/StatusWrapper.java | 32
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualController.java | 52 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java | 198 ++-------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java | 54 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java | 133 +----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualUsagePolicyEnum.java | 8
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dynamic/DynamicDataSourceHolder.java | 4
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java | 51 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCategoryServiceImpl.java | 49 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java | 62 +-
16 files changed, 364 insertions(+), 887 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java
index 133f629..e52de53 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualCompTypeController.java
@@ -1,18 +1,17 @@
package com.qianwen.smartman.modules.visual.controller;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
+
import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
@@ -24,15 +23,18 @@
import com.qianwen.core.secure.annotation.PreAuth;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.node.ForestNodeMerger;
+import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.modules.visual.convert.VisualCompTypeConvert;
import com.qianwen.smartman.modules.visual.entity.VisualCompType;
import com.qianwen.smartman.modules.visual.service.IVisualCompTypeService;
import com.qianwen.smartman.modules.visual.vo.VisualCompMenuDetailVO;
import com.qianwen.smartman.modules.visual.vo.VisualCompTypeVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import springfox.documentation.annotations.ApiIgnore;
@Api(value = "澶у睆缁勪欢鍒嗙被绠＄悊", tags = {"澶у睆缁勪欢鍒嗙被绠＄悊"})
@@ -42,28 +44,6 @@
public class VisualCompTypeController extends BladeController {
private IVisualCompTypeService visualCompTypeService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -982778162:
- if (implMethodName.equals("getOrderNum")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderNum();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualCompTypeController(final IVisualCompTypeService visualCompTypeService) {
this.visualCompTypeService = visualCompTypeService;
@@ -84,7 +64,7 @@
@ApiOperation(value = "澶у睆缁勪欢鍒嗙被鍒楄〃锛屾爲缁撴瀯", notes = "浼犲叆map")
@PreAuth
public R<List<VisualCompTypeVO>> list(@RequestParam @ApiIgnore Map<String, Object> params) {
- List<VisualCompType> list = this.visualCompTypeService.list((Wrapper) Condition.getQueryWrapper(params, VisualCompType.class).lambda().orderByAsc((v0) -> {
+ List<VisualCompType> list = this.visualCompTypeService.list(Condition.getQueryWrapper(params, VisualCompType.class).lambda().orderByAsc((v0) -> {
return v0.getOrderNum();
}));
List<VisualCompTypeVO> vos = VisualCompTypeConvert.INSTANCE.convert(list);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualController.java
index c7ddf67..6479804 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualController.java
@@ -1,16 +1,19 @@
package com.qianwen.smartman.modules.visual.controller;
+import java.io.FileNotFoundException;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.io.FileNotFoundException;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
@@ -21,6 +24,7 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.support.Kv;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.system.constant.SystemFieldConstant;
import com.qianwen.smartman.modules.visual.dto.VisualDTO;
@@ -30,11 +34,10 @@
import com.qianwen.smartman.modules.visual.service.IVisualCompService;
import com.qianwen.smartman.modules.visual.service.IVisualService;
import com.qianwen.smartman.modules.visual.vo.VisualInfoVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@ApiResource({"blade-visual/visual"})
@Api(value = "鍙鍖栬〃", tags = {"鍙鍖栨暟鎹帴鍙�"})
@@ -45,29 +48,6 @@
private final IVisualCategoryService categoryService;
private final OssBuilder ossBuilder;
private final IVisualCompService compService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492779276:
- if (implMethodName.equals("getGroupName")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupName();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualController(final IVisualService visualService, final IVisualCategoryService categoryService, final OssBuilder ossBuilder, final IVisualCompService compService) {
this.visualService = visualService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dto/VisualDownloadDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dto/VisualDownloadDTO.java
index 98ffca4..dc7ecc0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dto/VisualDownloadDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dto/VisualDownloadDTO.java
@@ -86,6 +86,19 @@
}
public String toString() {
- return "{\"visual\":" + this.visual + ",\"detail\":" + this.detail + ",\"component\":" + this.component + SystemPropertyUtils.PLACEHOLDER_SUFFIX;
+ StringBuilder builder = new StringBuilder();
+ builder.append("{");
+ builder.append("\"visual\":");
+ builder.append(this.visual);
+ builder.append(",");
+ builder.append("\"detail\":");
+ builder.append(this.detail);
+ builder.append(",");
+ builder.append("\"component\":");
+ builder.append(this.component);
+ builder.append("}");
+ return builder.toString();
+ /*
+ return "{\"visual\":" + this.visual + ",\"detail\":" + this.detail + ",\"component\":" + this.component + "}";*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dynamic/DynamicDataSourceHolder.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dynamic/DynamicDataSourceHolder.java
index 564f58d..5bbd7eb 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dynamic/DynamicDataSourceHolder.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/dynamic/DynamicDataSourceHolder.java
@@ -31,7 +31,9 @@
}
public void handleDataSource(String id) {
- DynamicRoutingDataSource ds = this.dataSource;
+ DynamicRoutingDataSource ds = (DynamicRoutingDataSource)this.dataSource;
+ /*
+ DynamicRoutingDataSource ds = this.dataSource;*/
Set<String> keys = ds.getCurrentDataSources().keySet();
if (!keys.contains(id)) {
DynamicDataSource dynamicDataSource = getDataSource(id);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCategoryServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCategoryServiceImpl.java
index 4bafba1..ccb8cce 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCategoryServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCategoryServiceImpl.java
@@ -1,64 +1,33 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.visual.entity.VisualCategory;
import com.qianwen.smartman.modules.visual.mapper.VisualCategoryMapper;
import com.qianwen.smartman.modules.visual.service.IVisualCategoryService;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualCategoryServiceImpl.class */
public class VisualCategoryServiceImpl extends ServiceImpl<VisualCategoryMapper, VisualCategory> implements IVisualCategoryService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -787804323:
- if (implMethodName.equals("getCategoryValue")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCategory") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCategoryValue();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCategory") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
@Override // org.springblade.modules.visual.service.IVisualCategoryService
public boolean submit(VisualCategory visualCategory) {
+ LambdaQueryWrapper<VisualCategory> lqw = Wrappers.<VisualCategory>query().lambda().eq(VisualCategory::getCategoryValue, visualCategory.getCategoryValue());
+ /*
Wrapper wrapper = (LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getCategoryValue();
- }, visualCategory.getCategoryValue());
+ }, visualCategory.getCategoryValue());*/
+ Long cnt = this.baseMapper.selectCount(Func.isEmpty(visualCategory.getId()) ? lqw : lqw.notIn(VisualCategory::getId, new Object[] { visualCategory.getId() }));
+ /*
Long cnt = ((VisualCategoryMapper) this.baseMapper).selectCount(Func.isEmpty(visualCategory.getId()) ? wrapper : (Wrapper) wrapper.notIn((v0) -> {
return v0.getId();
- }, new Object[]{visualCategory.getId()}));
+ }, new Object[]{visualCategory.getId()}));*/
if (cnt.longValue() > 0) {
throw new ServiceException("褰撳墠妯″潡閿�煎凡瀛樺湪!");
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java
index 0af75bb..324c851 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompServiceImpl.java
@@ -1,14 +1,8 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.google.common.collect.Lists;
import java.io.File;
import java.io.FileInputStream;
-import java.lang.invoke.SerializedLambda;
+import java.io.FileNotFoundException;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -16,13 +10,26 @@
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.google.common.collect.Lists;
+import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.SpringUtil;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.visual.convert.VisualCompConvert;
import com.qianwen.smartman.modules.visual.dto.VisualCompCreatedDTO;
@@ -33,11 +40,8 @@
import com.qianwen.smartman.modules.visual.service.IVisualCompTypeService;
import com.qianwen.smartman.modules.visual.utils.VisualUtils;
import com.qianwen.smartman.modules.visual.vo.VisualCompVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.util.ZipUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualCompServiceImpl.class */
@@ -46,87 +50,6 @@
@Lazy
private IVisualCompTypeService visualCompTypeService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = false;
- break;
- }
- break;
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualComp") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualComp") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.visual.service.IVisualCompService
public IPage<VisualCompVO> pageVO(IPage<VisualComp> page, Map<String, Object> map) {
@@ -137,19 +60,30 @@
VisualCompType type = (VisualCompType) this.visualCompTypeService.getOne(Lambda.eq((v0) -> {
return v0.getType();
}, typeStr));
+ if (type.getParentId().longValue() == 0L) {
+ typeList = (List<String>)this.visualCompTypeService.list(Lambda.eq(VisualCompType::getParentId, type.getId()).select(VisualCompType::getType ))
+ .stream().map(VisualCompType::getType).collect(Collectors.toList());
+ }else {
+ typeList = Lists.newArrayList(new String[] { typeStr });
+ }
+ /*
typeList = type.getParentId().longValue() == 0 ? (List) this.visualCompTypeService.list(Lambda.eq((v0) -> {
return v0.getParentId();
}, type.getId()).select((v0) -> {
return v0.getType();
})).stream().map((v0) -> {
return v0.getType();
- }).collect(Collectors.toList()) : Lists.newArrayList(new String[]{typeStr});
+ }).collect(Collectors.toList()) : Lists.newArrayList(new String[]{typeStr});*/
}
+ IPage<VisualComp> visualCompIPage = page(page, Lambda.like(Func.isNotEmpty(nameStr), VisualComp::getName, nameStr)
+
+ .in((typeList != null && !typeList.isEmpty()), VisualComp::getType, typeList));
+ /*
IPage<VisualComp> visualCompIPage = page(page, Lambda.like(Func.isNotEmpty(nameStr), (v0) -> {
return v0.getName();
}, nameStr).in((typeList == null || typeList.isEmpty()) ? false : true, (v0) -> {
return v0.getType();
- }, typeList));
+ }, typeList));*/
IPage<VisualCompVO> convert = VisualCompConvert.INSTANCE.convert(visualCompIPage);
wrapper(convert.getRecords());
return convert;
@@ -172,6 +106,17 @@
@Override // org.springblade.modules.visual.service.IVisualCompService
public BladeFile componentZipDownload(List<Long> componentIds) {
+
+ List<String> jsonTexts = list(Lambda.<VisualComp>in((componentIds != null && componentIds.size() != 0), VisualComp::getId, componentIds))
+ .stream().map(VisualCompConvert.INSTANCE::convertDTO).map(JSON::toJSONString).collect(Collectors.toList());
+ File zipFile = VisualUtils.visualDownload(jsonTexts.<String>toArray(new String[0]));
+ try {
+ return ((OssBuilder)SpringUtil.getBean(OssBuilder.class)).tempTemplate().putFile(zipFile.getName(), new FileInputStream(zipFile));
+ } catch (FileNotFoundException e) {
+ log.error("缁勪欢涓嬭浇zip鏂囦欢閿欒",e);
+ throw new ServiceException("缁勪欢涓嬭浇zip鏂囦欢閿欒"+e.getMessage());
+ }
+ /*
boolean z;
if (componentIds != null) {
if (componentIds.size() != 0) {
@@ -199,6 +144,7 @@
}).collect(Collectors.toList());
File zipFile2 = VisualUtils.visualDownload((String[]) jsonTexts2.toArray(new String[0]));
return ((OssBuilder) SpringUtil.getBean(OssBuilder.class)).tempTemplate().putFile(zipFile2.getName(), new FileInputStream(zipFile2));
+ */
}
@Override // org.springblade.modules.visual.service.IVisualCompService
@@ -218,6 +164,12 @@
@Transactional
public void save(String... replaceText) {
+ List<VisualComp> compList = Stream.<String>of(replaceText).map(text -> JSONObject.parseObject(text, VisualCompCreatedDTO.class)).map(dto -> {
+ VisualCompType type = (VisualCompType)this.visualCompTypeService.getOne(Lambda.eq(VisualCompType::getType, dto.getType()));
+ dto.setType((type == null) ? "ungrouped" : type.getType());
+ return dto;
+ }).map(VisualCompConvert.INSTANCE::convert).collect(Collectors.toList());
+ /*
Stream map = Stream.of((Object[]) replaceText).map(text -> {
return (VisualCompCreatedDTO) JSONObject.parseObject(text, VisualCompCreatedDTO.class);
}).map(dto -> {
@@ -229,13 +181,13 @@
});
VisualCompConvert visualCompConvert = VisualCompConvert.INSTANCE;
visualCompConvert.getClass();
- List<VisualComp> compList = (List) map.map(this::convert).collect(Collectors.toList());
+ List<VisualComp> compList = (List) map.map(this::convert).collect(Collectors.toList());*/
visualSaveOrUpdateBatch(compList);
}
private void visualSaveOrUpdateBatch(List<VisualComp> upList) {
List<VisualComp> list = list();
- Map<String, List<VisualComp>> existComp = (Map) list.stream().collect(Collectors.groupingBy(item -> {
+ Map<String, List<VisualComp>> existComp = list.stream().collect(Collectors.groupingBy(item -> {
return item.getName() + item.getType();
}));
if (Func.isEmpty(existComp)) {
@@ -244,7 +196,7 @@
}
Set<VisualComp> addList = new HashSet<>();
upList.forEach(item2 -> {
- List<VisualComp> visualComps = (List) existComp.get(item2.getName() + item2.getType());
+ List<VisualComp> visualComps = existComp.get(item2.getName() + item2.getType());
Optional.ofNullable(visualComps).ifPresent(compList -> {
compList.forEach(comp -> {
comp.setComponent(item2.getComponent());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompTypeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompTypeServiceImpl.java
index 5bd9591..2fb726e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompTypeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualCompTypeServiceImpl.java
@@ -1,18 +1,18 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import java.lang.invoke.SerializedLambda;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.visual.convert.VisualCompConvert;
import com.qianwen.smartman.modules.visual.convert.VisualCompTypeConvert;
import com.qianwen.smartman.modules.visual.entity.VisualComp;
@@ -22,108 +22,13 @@
import com.qianwen.smartman.modules.visual.service.IVisualCompService;
import com.qianwen.smartman.modules.visual.service.IVisualCompTypeService;
import com.qianwen.smartman.modules.visual.vo.VisualCompMenuDetailVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualCompTypeServiceImpl.class */
public class VisualCompTypeServiceImpl extends BaseServiceImpl<VisualCompTypeMapper, VisualCompType> implements IVisualCompTypeService {
private final IVisualCompService compService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -982778162:
- if (implMethodName.equals("getOrderNum")) {
- z = false;
- break;
- }
- break;
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderNum();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualCompType") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
public VisualCompTypeServiceImpl(final IVisualCompService compService) {
this.compService = compService;
@@ -133,12 +38,14 @@
@Transactional
public boolean remove(List<Long> ids) {
removeByIds(ids);
+ List<VisualCompType> child = list(Lambda.in(VisualCompType::getParentId, ids).select(VisualCompType::getId ));
+ /*
List<VisualCompType> child = list(Lambda.in((v0) -> {
return v0.getParentId();
}, ids).select((v0) -> {
return v0.getId();
- }));
- List<Long> childIds = (List) child.stream().map((v0) -> {
+ }));*/
+ List<Long> childIds = child.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
removeByIds(childIds);
@@ -147,12 +54,14 @@
@Override // org.springblade.modules.visual.service.IVisualCompTypeService
public List<VisualCompMenuDetailVO> treeMenu(Map<String, Object> params) {
- List<Long> componentIds = (List) params.get("componentIds");
+ List<Long> componentIds = (List<Long>) params.get("componentIds");
+ List<VisualCompType> list = list(Lambda.<VisualCompType>create().eq(VisualCompType::getStatus, Integer.valueOf(VisualCompTypeEnum.ENABLE.getValue())).orderByAsc(VisualCompType::getOrderNum));
+ /*
List<VisualCompType> list = list((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
return v0.getStatus();
}, Integer.valueOf(VisualCompTypeEnum.ENABLE.getValue()))).orderByAsc((v0) -> {
return v0.getOrderNum();
- }));
+ }));*/
List<VisualCompMenuDetailVO> menuDetailVOS = VisualCompTypeConvert.INSTANCE.convertMenu(list);
List<VisualComp> visualCompList = this.compService.list(Lambda.in((componentIds == null || componentIds.size() == 0) ? false : true, (v0) -> {
return v0.getId();
@@ -160,12 +69,12 @@
list.stream().filter(item -> {
return !Func.equals(item.getParentId(), 0L);
}).forEach(item2 -> {
- List<VisualComp> compList = (List) visualCompList.stream().filter(comp -> {
+ List<VisualComp> compList = visualCompList.stream().filter(comp -> {
return comp.getType().equals(item2.getType());
}).sorted(Comparator.comparing((v0) -> {
return v0.getOrderNum();
})).collect(Collectors.toList());
- List<VisualCompMenuDetailVO> visualCompMenuDetailVOS = (List) compList.stream().map(comp2 -> {
+ List<VisualCompMenuDetailVO> visualCompMenuDetailVOS = compList.stream().map(comp2 -> {
return VisualCompConvert.INSTANCE.convertMenu(comp2, item2.getId());
}).collect(Collectors.toList());
menuDetailVOS.addAll(visualCompMenuDetailVOS);
@@ -196,11 +105,13 @@
throw new ServiceException("宸茬粡瀛樺湪鐩稿悓鐨勭被鍨�:" + exist.getName());
}
if (entity.getParentId().longValue() == 0) {
+ lambdaUpdate().set(VisualCompType::getStatus, entity.getStatus()).eq(VisualCompType::getParentId, entity.getId()).update();
+ /*
((LambdaUpdateChainWrapper) ((LambdaUpdateChainWrapper) lambdaUpdate().set((v0) -> {
return v0.getStatus();
}, entity.getStatus())).eq((v0) -> {
return v0.getParentId();
- }, entity.getId())).update();
+ }, entity.getId())).update();*/
}
return super.updateById(entity);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java
index 344a3f3..923a7bc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualDataSourceServiceImpl.java
@@ -1,25 +1,24 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.qianwen.core.tool.node.ForestNodeMerger;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.CommonGroupConstant;
import com.qianwen.smartman.common.constant.VisualConstant;
import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
-import com.qianwen.core.tool.node.ForestNodeMerger;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.convert.CommonGroupConvert;
import com.qianwen.smartman.modules.cps.dto.CurrentShiftInfoDTO;
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
@@ -34,7 +33,6 @@
import com.qianwen.smartman.modules.visual.service.IVisualDataSourceService;
import com.qianwen.smartman.modules.visual.vo.DropDownVO;
import com.qianwen.smartman.modules.visual.vo.WorkStationTreeVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualDataSourceServiceImpl.class */
@@ -44,54 +42,6 @@
private final IShiftModelService shiftModelService;
private final ICalendarService calendarService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = false;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualDataSourceServiceImpl(final ICommonGroupService commonGroupService, final IDictService dictService, final IShiftModelService shiftModelService, final ICalendarService calendarService) {
this.commonGroupService = commonGroupService;
@@ -104,17 +54,21 @@
public List<WorkStationTreeVO> workstationDataSource() {
CommonGroupTypeVO commonGroupTypeVO = new CommonGroupTypeVO().setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY).setStatus(CommonConstant.ENABLE).setGroupType(CommonGroupTypeEnum.WORKSTATION.getName());
List<WorkstationInGroupVO> list = this.commonGroupService.groupWorkstationList(commonGroupTypeVO);
+
+ List<WorkStationTreeVO> vos = hasChildGroup(list).stream().map(CommonGroupConvert.INSTANCE::convertToChart).collect(Collectors.toList());
+ /*
Stream<WorkstationInGroupVO> stream = hasChildGroup(list).stream();
CommonGroupConvert commonGroupConvert = CommonGroupConvert.INSTANCE;
commonGroupConvert.getClass();
List<WorkStationTreeVO> vos = (List) stream.map(this::convertToChart).collect(Collectors.toList());
+ */
return ForestNodeMerger.merge(vos);
}
@Override // org.springblade.modules.visual.service.IVisualDataSourceService
public List<DropDownVO> timeLevelDataSource() {
List<Dict> dictList = this.dictService.getList(VisualConstant.VISUAL_TIME_LEVEL);
- return (List) dictList.stream().map(dict -> {
+ return dictList.stream().map(dict -> {
return DropDownVO.builder().id(dict.getDictKey()).name(dict.getDictValue()).build();
}).collect(Collectors.toList());
}
@@ -125,7 +79,7 @@
List<ShiftModel> list = this.shiftModelService.list();
List<DropDownVO> dropDownVOList = new ArrayList<>();
if (Func.isNotEmpty(list)) {
- dropDownVOList = (List) list.stream().map(shiftModel -> {
+ dropDownVOList = list.stream().map(shiftModel -> {
return DropDownVO.builder().id(String.valueOf(shiftModel.getId())).name(shiftModel.getName()).build();
}).collect(Collectors.toList());
}
@@ -138,13 +92,13 @@
if (Func.isEmpty(collect)) {
CommonGroupTypeVO commonGroupTypeVO = new CommonGroupTypeVO().setGroupCategory(CommonGroupConstant.DEFAULT_CATEGORY).setStatus(CommonConstant.ENABLE).setGroupType(CommonGroupTypeEnum.WORKSTATION.getName());
List<WorkstationInGroupVO> commonList = this.commonGroupService.groupWorkstationList(commonGroupTypeVO);
- List<String> calendarCodeList = (List) commonList.stream().map((v0) -> {
+ List<String> calendarCodeList = commonList.stream().map((v0) -> {
return v0.getCalendarCode();
}).filter((v0) -> {
return Func.isNotEmpty(v0);
}).distinct().collect(Collectors.toList());
Map<String, CurrentShiftInfoDTO> currentShiftInfo = TimeSliceCache.getCurrentShiftInfo(calendarCodeList);
- collect = (List) commonList.stream().filter(workstationInGroupVO -> {
+ collect = commonList.stream().filter(workstationInGroupVO -> {
CurrentShiftInfoDTO currentShiftInfoDTO = (CurrentShiftInfoDTO) currentShiftInfo.get(workstationInGroupVO.getCalendarCode());
Boolean flag = workstationInGroupVO.getIsGroup();
if (Func.isNotEmpty(currentShiftInfoDTO)) {
@@ -155,15 +109,18 @@
}).collect(Collectors.toList());
WorkstationCache.setShiftWorkStation(collect, id);
}
+
+ List<WorkStationTreeVO> vos = hasChildGroup(collect).stream().map(CommonGroupConvert.INSTANCE::convertToChart).collect(Collectors.toList());
+ /*
Stream<WorkstationInGroupVO> stream = hasChildGroup(collect).stream();
CommonGroupConvert commonGroupConvert = CommonGroupConvert.INSTANCE;
commonGroupConvert.getClass();
- List<WorkStationTreeVO> vos = (List) stream.map(this::convertToChart).collect(Collectors.toList());
+ List<WorkStationTreeVO> vos = (List) stream.map(this::convertToChart).collect(Collectors.toList());*/
return ForestNodeMerger.merge(vos);
}
private List<WorkstationInGroupVO> hasChildGroup(List<WorkstationInGroupVO> list) {
- Set<Long> groupIds = (Set) list.stream().filter((v0) -> {
+ Set<Long> groupIds = list.stream().filter((v0) -> {
return v0.getIsWorkstation();
}).map((v0) -> {
return v0.getParentId();
@@ -179,7 +136,7 @@
if (res.size() == CommonGroupConstant.SIZE.intValue() && res.contains(root.getId())) {
return Lists.newArrayList();
}
- return (List) list.stream().filter(c -> {
+ return list.stream().filter(c -> {
return res.contains(c.getId()) || c.getIsWorkstation().booleanValue();
}).collect(Collectors.toList());
}
@@ -194,12 +151,17 @@
}
private CommonGroup findRoot() {
+ return this.commonGroupService.getOne(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
+ .eq(CommonGroup::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName())
+ .eq(CommonGroup::getParentId, CommonGroupConstant.ROOT));
+ /*
return (CommonGroup) this.commonGroupService.getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getGroupCategory();
}, CommonGroupConstant.DEFAULT_CATEGORY)).eq((v0) -> {
return v0.getGroupType();
}, CommonGroupTypeEnum.WORKSTATION.getName())).eq((v0) -> {
return v0.getParentId();
- }, CommonGroupConstant.ROOT));
+ }, CommonGroupConstant.ROOT));*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualGlobalApiServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualGlobalApiServiceImpl.java
index b9368bc..5d362ac 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualGlobalApiServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualGlobalApiServiceImpl.java
@@ -1,113 +1,30 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import java.lang.invoke.SerializedLambda;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
+
import org.apache.commons.lang3.StringUtils;
import org.assertj.core.util.Lists;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.stereotype.Service;
+
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.modules.system.entity.InterfaceConfig;
import com.qianwen.smartman.modules.system.service.IInterfaceConfigService;
import com.qianwen.smartman.modules.visual.dto.VisualGlobalQueryDTO;
import com.qianwen.smartman.modules.visual.entity.Visual;
import com.qianwen.smartman.modules.visual.entity.VisualGlobalApi;
import com.qianwen.smartman.modules.visual.mapper.VisualGlobalApiMapper;
import com.qianwen.smartman.modules.visual.service.IVisualGlobalApiService;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualGlobalApiServiceImpl.class */
public class VisualGlobalApiServiceImpl extends BaseServiceImpl<VisualGlobalApiMapper, VisualGlobalApi> implements IVisualGlobalApiService {
private IInterfaceConfigService interfaceConfigService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1233650324:
- if (implMethodName.equals("getOwningChart")) {
- z = true;
- break;
- }
- break;
- case -621871631:
- if (implMethodName.equals("getVisualId")) {
- z = true;
- break;
- }
- break;
- case -593679572:
- if (implMethodName.equals("getUpdateTime")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 1497760115:
- if (implMethodName.equals("getConfigId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getUpdateTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualGlobalApi") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getConfigId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/InterfaceConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/InterfaceConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getOwningChart();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualGlobalApi") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualGlobalApi") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualGlobalApiServiceImpl(final IInterfaceConfigService interfaceConfigService) {
this.interfaceConfigService = interfaceConfigService;
@@ -122,31 +39,44 @@
String types = visualGlobalQueryDTO.getType();
List<Long> interfaceConfigIds = Lists.newArrayList();
if (Func.isNotBlank(types)) {
+ interfaceConfigIds = (List<Long>)this.interfaceConfigService.list(Lambda.<InterfaceConfig>in(Func.isNotBlank(types), InterfaceConfig::getOwningChart, (types == null) ? null : types.split(","))
+ .select(InterfaceConfig::getId)).stream().map(InterfaceConfig::getId).collect(Collectors.toList());
+ /*
interfaceConfigIds = (List) this.interfaceConfigService.list(Lambda.in(Func.isNotBlank(types), (v0) -> {
return v0.getOwningChart();
}, types == null ? null : types.split(",")).select((v0) -> {
return v0.getId();
})).stream().map((v0) -> {
return v0.getId();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
}
+
+ return list(
+ Lambda.eq(VisualGlobalApi::getVisualId, visualGlobalQueryDTO.getVisualId())
+ .in(!interfaceConfigIds.isEmpty(), VisualGlobalApi::getConfigId, interfaceConfigIds));
+ /*
return list(Lambda.eq((v0) -> {
return v0.getVisualId();
}, visualGlobalQueryDTO.getVisualId()).in(!interfaceConfigIds.isEmpty(), (v0) -> {
return v0.getConfigId();
- }, interfaceConfigIds));
+ }, interfaceConfigIds));*/
}
@Override // org.springblade.modules.visual.service.IVisualGlobalApiService
public void updateVisualId(Visual visual, List<Long> globalApiId) {
if (globalApiId != null && !globalApiId.isEmpty()) {
+ lambdaUpdate()
+ .set(VisualGlobalApi::getVisualId, visual.getId())
+ .set(VisualGlobalApi::getUpdateTime, new Date())
+ .in(VisualGlobalApi::getId, globalApiId).update();
+ /*
((LambdaUpdateChainWrapper) ((LambdaUpdateChainWrapper) ((LambdaUpdateChainWrapper) lambdaUpdate().set((v0) -> {
return v0.getVisualId();
}, visual.getId())).set((v0) -> {
return v0.getUpdateTime();
}, new Date())).in((v0) -> {
return v0.getId();
- }, globalApiId)).update();
+ }, globalApiId)).update();*/
}
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
index 4494275..39a889c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
@@ -48,41 +48,6 @@
private final IWorkstationDynamicCollectService dynamicCollectService;
private final IWorkstationWcsUsageService workstationWcsUsageService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 764041336:
- if (implMethodName.equals("getUsageCode")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWcsUsage") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getUsageCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualOutputServiceImpl(final SuperAggregateOutputMapper superAggregateOutputMapper, final IWorkstationService workstationService, final OutputWrapper outputWrapper, final IWorkstationDynamicCollectService dynamicCollectService, final IWorkstationWcsUsageService workstationWcsUsageService) {
this.superAggregateOutputMapper = superAggregateOutputMapper;
@@ -130,12 +95,17 @@
WorkstationChartSeriesDataVO chartSeriesDataVO = new WorkstationChartSeriesDataVO();
List<Workstation> xList = new ArrayList<>();
List<Long> workStationIdList = workstationShiftOutput.getWorkStationIdList();
- ArrayList arrayList = new ArrayList();
+
+ List<Long> arrayList = new ArrayList<>();
+ //ArrayList arrayList = new ArrayList();
+ List<Workstation> list = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().in(Workstation::getId, workStationIdList));
+ /*
List<Workstation> list = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, workStationIdList));
+ }, workStationIdList));*/
if (Func.isNotEmpty(list)) {
- ArrayList arrayList2 = new ArrayList();
+ List<SeriesItem> seriesItems = new ArrayList<>();
+ //ArrayList<Long> arrayList2 = new ArrayList<>();
list.forEach(s -> {
xList.add(s);
String calendarCode = s.getCalendarCode();
@@ -157,9 +127,10 @@
SeriesItem seriesItem = new SeriesItem();
seriesItem.setName(VisualConstant.SHIFT_OUTPUT);
seriesItem.setData(arrayList);
- arrayList2.add(seriesItem);
+ seriesItems.add(seriesItem);
chartSeriesDataVO.generateCategories(xList, 3);
- chartSeriesDataVO.setSeries(arrayList2);
+
+ chartSeriesDataVO.setSeries(seriesItems);
}
return chartSeriesDataVO;
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java
index 907006b..9c5b42c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualServiceImpl.java
@@ -1,27 +1,28 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.resource.service.IOssService;
import com.qianwen.smartman.modules.visual.dto.VisualDTO;
@@ -34,9 +35,9 @@
import com.qianwen.smartman.modules.visual.service.IVisualService;
import com.qianwen.smartman.modules.visual.utils.VisualUtils;
import com.qianwen.smartman.modules.visual.vo.VisualInfoVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualServiceImpl.class */
@@ -46,136 +47,6 @@
private final OssBuilder ossBuilder;
private final IOssService ossService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492779276:
- if (implMethodName.equals("getGroupName")) {
- z = true;
- break;
- }
- break;
- case -621871631:
- if (implMethodName.equals("getVisualId")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 964243849:
- if (implMethodName.equals("getGroupIndex")) {
- z = false;
- break;
- }
- break;
- case 1283554731:
- if (implMethodName.equals("getBackgroundUrl")) {
- z = true;
- break;
- }
- break;
- case 1966196898:
- if (implMethodName.equals("getTitle")) {
- z = true;
- break;
- }
- break;
- case 2128411252:
- if (implMethodName.equals("getCategory")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupIndex();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupIndex();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTitle();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getCategory();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/Visual") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getBackgroundUrl();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/visual/entity/VisualConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVisualId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualServiceImpl(final IVisualConfigService configService, final IVisualGlobalApiService globalApiService, final OssBuilder ossBuilder, final IOssService ossService) {
this.configService = configService;
@@ -187,9 +58,11 @@
@Override // org.springblade.modules.visual.service.IVisualService
public VisualDTO detail(Long id) {
Visual visual = (Visual) getById(id);
+ VisualConfig visualConfig = this.configService.getOne(Wrappers.<VisualConfig>query().lambda().eq(VisualConfig::getVisualId, id));
+ /*
VisualConfig visualConfig = (VisualConfig) this.configService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getVisualId();
- }, id));
+ }, id));*/
VisualDTO dto = new VisualDTO();
dto.setVisual(visual);
dto.setConfig(visualConfig);
@@ -202,11 +75,13 @@
if (StringUtils.isEmpty(visual.getGroupName())) {
return null;
}
+ List<Visual> list = list(Lambda.eq(Visual::getGroupName, visual.getGroupName()).orderByAsc(Visual::getGroupIndex));
+ /*
List<Visual> list = list((Wrapper) Lambda.eq((v0) -> {
return v0.getGroupName();
}, visual.getGroupName()).orderByAsc((v0) -> {
return v0.getGroupIndex();
- }));
+ }));*/
if (list.size() <= 1) {
return null;
}
@@ -223,11 +98,13 @@
if (StringUtils.isEmpty(visual.getGroupName())) {
return null;
}
+ List<Visual> list = list(Lambda.eq(Visual::getGroupName, visual.getGroupName()).orderByDesc(Visual::getGroupIndex));
+ /*
List<Visual> list = list((Wrapper) Lambda.eq((v0) -> {
return v0.getGroupName();
}, visual.getGroupName()).orderByDesc((v0) -> {
return v0.getGroupIndex();
- }));
+ }));*/
if (list.size() <= 1) {
return null;
}
@@ -236,7 +113,7 @@
}).findFirst().map(item2 -> {
return item2.getId();
}).orElseGet(() -> {
- return ((Visual) list.get(0)).getId();
+ return list.get(0).getId();
});
}
@@ -271,9 +148,12 @@
@Transactional(rollbackFor = {Exception.class})
public Long copyVisual(Long id) {
Visual visual = (Visual) getById(id);
+
+ VisualConfig visualConfig = (VisualConfig)this.configService.getOne(Wrappers.<VisualConfig>query().lambda().eq(VisualConfig::getVisualId, id));
+ /*
VisualConfig visualConfig = (VisualConfig) this.configService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getVisualId();
- }, id));
+ }, id));*/
if (visual != null && visualConfig != null) {
visual.setId(null);
visualConfig.setId(null);
@@ -308,6 +188,9 @@
@Override // org.springblade.modules.visual.service.IVisualService
public List<VisualInfoVO> detailsByCatalog(Integer catalogId) {
+ List<Visual> list = list(Lambda.eq((catalogId != null), Visual::getCategory, catalogId)
+ .select(Visual::getId, Visual::getTitle, Visual::getBackgroundUrl ));
+ /*
List<Visual> list = list(Lambda.eq(catalogId != null, (v0) -> {
return v0.getCategory();
}, catalogId).select((v0) -> {
@@ -316,17 +199,17 @@
return v0.getTitle();
}, (v0) -> {
return v0.getBackgroundUrl();
- }));
+ }));*/
if (list == null || list.isEmpty()) {
return Collections.emptyList();
}
- List<Long> visualIds = (List) list.stream().map((v0) -> {
+ List<Long> visualIds = list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<VisualConfig> config = this.configService.list(Lambda.in((v0) -> {
return v0.getVisualId();
}, visualIds));
- return (List) config.stream().map(item -> {
+ return config.stream().map(item -> {
Visual match = (Visual) list.stream().filter(visual -> {
return visual.getId().equals(item.getVisualId());
}).findFirst().orElse(null);
@@ -380,7 +263,12 @@
public void visualZipImport(MultipartFile zipFile, Integer category) {
String localFileName = IdWorker.get32UUID() + ".zip";
File localZipFile = new File("static/visual/" + localFileName);
- FileUtils.copyToFile(zipFile.getInputStream(), localZipFile);
+ try {
+ FileUtils.copyToFile(zipFile.getInputStream(), localZipFile);
+ } catch (IOException e) {
+ log.error("鍙鍖栧鍏ラ敊璇�",e);
+ throw new ServiceException("鍙鍖栧鍏ラ敊璇�"+e.getMessage());
+ }
visualZipImport(localZipFile, category);
}
@@ -388,16 +276,16 @@
public void visualZipImport(File zipFile, Integer category) {
File distFile = ZipUtil.unzip(zipFile);
File[] files = distFile.listFiles();
- File imagesDir = (File) Stream.of((Object[]) files).filter(file -> {
+ File imagesDir = (File) Stream.of(files).filter(file -> {
return file.isDirectory() && "images".equalsIgnoreCase(file.getName());
}).findFirst().orElse(null);
if (imagesDir == null) {
- String[] jsFilesText = (String[]) Stream.of((Object[]) files).filter(file2 -> {
+ String[] jsFilesText = (String[]) Stream.of( files).filter(file2 -> {
return file2.isFile() && file2.getName().endsWith("js");
}).map(item -> {
return FileUtil.readString(item, "utf-8");
- }).toArray(x$0 -> {
- return new String[x$0];
+ }).toArray(x -> {
+ return new String[x];
});
File distFile2 = VisualUtils.visualDownload(jsFilesText);
visualZipImport(distFile2, category);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
index 5437a24..c5304fe 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
@@ -1,12 +1,5 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.alibaba.fastjson.parser.Feature;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
@@ -22,6 +15,17 @@
import java.util.Objects;
import java.util.TreeMap;
import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.parser.Feature;
+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.StringUtil;
import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CalendarConstant;
@@ -31,16 +35,13 @@
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
import com.qianwen.smartman.common.enums.WorkstationParamTypeEnum;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.modules.cps.dto.CalendarShiftTimeSlicesDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationAlarmDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.Workstation;
+import com.qianwen.smartman.modules.cps.entity.WorkstationWcs;
import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
import com.qianwen.smartman.modules.cps.service.IWorkstationWcsService;
@@ -67,7 +68,6 @@
import com.qianwen.smartman.modules.visual.vo.VisualWorkStationStatusVO;
import com.qianwen.smartman.modules.visual.vo.WorkStationAlarmVO;
import com.qianwen.smartman.modules.visual.wrapper.StatusWrapper;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualStatusServiceImpl.class */
@@ -79,73 +79,6 @@
private final IGlobalWcsService globalWcsService;
private final IWorkstationWcsService workstationWcsService;
private final Integer OUT_OF_SHIFT = -1;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -427996294:
- if (implMethodName.equals("getDataType")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 1431273455:
- if (implMethodName.equals("getCollectSettingItem")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCollectSettingItem();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWcs") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDataType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public VisualStatusServiceImpl(final ISuperAggregateStateService superAggregateStateService, final IWorkstationService workstationService, final StatusWrapper wrapper, final SuperAggregateStateMapper superAggregateStateMapper, final IGlobalWcsService globalWcsService, final IWorkstationWcsService workstationWcsService) {
this.superAggregateStateService = superAggregateStateService;
@@ -205,7 +138,7 @@
if (workStationList == null) {
workStationList = Collections.EMPTY_LIST;
}
- List<ICard> list = (List) workStationList.stream().map(item -> {
+ List<ICard> list = workStationList.stream().map(item -> {
return this.workstationService.getDetail(item);
}).map(item2 -> {
return new VisualWorkStationStatusVO(item2.getId(), item2.getMachineId(), item2.getName(), null, item2.getAvatar());
@@ -401,14 +334,14 @@
return res;
}
List<SuperAggregateState> states = Lists.newArrayList();
- Map<String, List<Workstation>> calendarCodeMap = (Map) workstations.stream().filter(c -> {
+ Map<String, List<Workstation>> calendarCodeMap = workstations.stream().filter(c -> {
return Func.isNotEmpty(c.getCalendarCode());
}).collect(Collectors.groupingBy((v0) -> {
return v0.getCalendarCode();
}));
- calendarCodeMap.forEach(calendarCode, workstationList -> {
+ calendarCodeMap.forEach((calendarCode, workstationList) -> {
CalendarShiftTimeSlicesDTO timeSliceShift = TimeSliceCache.getTimeSliceShift(calendarCode, DateUtil.now());
- List<Long> ids = (List) workstationList.stream().map((v0) -> {
+ List<Long> ids = workstationList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
if (Func.isNotEmpty(timeSliceShift) && !this.OUT_OF_SHIFT.equals(timeSliceShift.getShiftIndex())) {
@@ -428,15 +361,17 @@
public ChartGanttStatusDataVO getEquipmentStatusRecord(VisualBaseVO visualBaseVO) {
List<Long> workStationIdList = visualBaseVO.getWorkStationIdList();
List<SuperAggregateState> stateList = new ArrayList<>();
+ List<Workstation> workstationList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().in(Workstation::getId, workStationIdList));
+ /*
List<Workstation> workstationList = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, workStationIdList));
+ }, workStationIdList));*/
if (Func.isNotEmpty(workstationList)) {
- Map<String, List<Workstation>> calendarCodeMap = (Map) workstationList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<Workstation>> calendarCodeMap = workstationList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCalendarCode();
}));
- calendarCodeMap.forEach(k, v -> {
- List<Long> workstationIds = (List) v.stream().map((v0) -> {
+ calendarCodeMap.forEach((k, v) -> {
+ List<Long> workstationIds = v.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
CalendarShiftTimeSlicesDTO timeSliceShift = TimeSliceCache.getTimeSliceShift(k, new Date());
@@ -448,7 +383,7 @@
}
});
}
- List<SuperAggregateState> collect = (List) stateList.stream().peek(s -> {
+ List<SuperAggregateState> collect = stateList.stream().peek(s -> {
if (Func.isNull(s.getEndTime())) {
s.setEndTime(new Timestamp(DateUtil.now().getTime()));
}
@@ -478,7 +413,7 @@
LocalDateTime dayStart = LocalDateTimeUtils.getDayStart(now);
LocalDateTime dayEnd = LocalDateTimeUtils.getDayEnd(now);
List<SuperAggregateState> statusByCondition = this.superAggregateStateService.getStatusByCondition(vo.getWorkStationIdList(), dayStart, dayEnd);
- List<SuperAggregateState> collect = (List) FilterOffUtils.filterOffDay(statusByCondition, OpenTypeEnums.OEE).stream().filter(s -> {
+ List<SuperAggregateState> collect = FilterOffUtils.filterOffDay(statusByCondition, OpenTypeEnums.OEE).stream().filter(s -> {
return s.getRps().intValue() > 0;
}).collect(Collectors.toList());
return this.wrapper.entityToEfficiencyAverageVo(collect, productivityTypeEnum);
@@ -494,7 +429,7 @@
String timeLevel = timeStatusVO.getTimeLevel();
VisualTimeDTO visualTimeDTO = VisualUtils.getTimeSectionByLevel(timeLevel);
List<SuperAggregateState> statusByCondition = this.superAggregateStateService.getStatusByTimeSection(timeStatusVO.getWorkStationIdList(), visualTimeDTO.getStartTime(), visualTimeDTO.getEndTime());
- List<SuperAggregateState> collect = (List) FilterOffUtils.filterOffDay(statusByCondition, OpenTypeEnums.OEE).stream().filter(s -> {
+ List<SuperAggregateState> collect = FilterOffUtils.filterOffDay(statusByCondition, OpenTypeEnums.OEE).stream().filter(s -> {
return s.getRps().intValue() > 0;
}).collect(Collectors.toList());
return this.wrapper.entityToEfficiencyTopVo(collect, productivityTypeEnum, timeStatusVO.getTop(), workstations, StringUtil.format("杩憑}灏忔椂绋煎姩鐜囨帓鍚�", new Object[]{timeLevel}));
@@ -545,7 +480,7 @@
}, v -> {
return v;
}));
- List<Long> workIds = (List) workstations.stream().map((v0) -> {
+ List<Long> workIds = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
LocalDate now = LocalDate.now();
@@ -555,7 +490,7 @@
}
private ChartSeriesDataVO getChartSeriesDataVO(List<Workstation> workstations, Map<Long, Workstation> workstationMap, List<SuperAggregateState> data, String name) {
- Map<Long, Long> workMap = (Map) data.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, Long> workMap = data.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}, TreeMap::new, Collectors.mapping((v0) -> {
return v0.getDurationCollect();
@@ -563,7 +498,7 @@
return Long.sum(v0, v1);
}))));
List<Map.Entry<Long, Long>> list = Lists.newArrayList(workMap.entrySet());
- list.sort(o1, o2 -> {
+ list.sort((o1, o2) -> {
return Math.toIntExact(((Long) o2.getValue()).longValue() - ((Long) o1.getValue()).longValue());
});
WorkstationChartSeriesDataVO res = new WorkstationChartSeriesDataVO();
@@ -609,12 +544,12 @@
res2.setSeries(Lists.newArrayList());
return res2;
}
- List<Long> workIds = (List) workstations.stream().map((v0) -> {
+ List<Long> workIds = workstations.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<SuperAggregateState> data = this.superAggregateStateService.getCurrWeekAlarmState(workIds, week, DefaultWcsEnum.ALARM.getCode());
List<SuperAggregateState> data2 = FilterOffUtils.filterOffDay(data, OpenTypeEnums.TIME_USED_ANALYSIS);
- Map<Long, Workstation> workstationMap = (Map) workstations.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Workstation> workstationMap = workstations.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, v -> {
return v;
@@ -630,6 +565,10 @@
@Override // org.springblade.modules.visual.service.IVisualStatusService
public ChartNameValueDataVO getWorkstationRealStatusChart(VisualBaseVO vo) {
+ Map<Long, String> settings = this.workstationWcsService.list(Lambda.<WorkstationWcs>in(WorkstationWcs::getWorkstationId, vo.getWorkStationIdList())
+ .eq(WorkstationWcs::getDataType, WcsDataTypeEnums.WcsDataType.STATE.getCode()).select(WorkstationWcs::getCollectSettingItem, WorkstationWcs::getWorkstationId ))
+ .stream().collect(Collectors.toMap(WorkstationWcs::getWorkstationId, WorkstationWcs::getCollectSettingItem));
+ /*
Map<Long, String> settings = (Map) this.workstationWcsService.list(((ExtraLambdaQueryWrapper) Lambda.in((v0) -> {
return v0.getWorkstationId();
}, vo.getWorkStationIdList()).eq((v0) -> {
@@ -642,8 +581,8 @@
return v0.getWorkstationId();
}, (v0) -> {
return v0.getCollectSettingItem();
- }));
- Map<String, Long> statusCollect = (Map) vo.getWorkStationIdList().stream().map(id -> {
+ }));*/
+ Map<String, Long> statusCollect = vo.getWorkStationIdList().stream().map(id -> {
return WorkstationCache.getWorkstationRealTime(id, (String) settings.getOrDefault(id, MdcConstant.DEVICE_STATUS));
}).filter((v0) -> {
return Objects.nonNull(v0);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java
index 16dd01f..cb8b6cd 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java
@@ -1,15 +1,9 @@
package com.qianwen.smartman.modules.visual.utils;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
@@ -19,13 +13,18 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.commons.lang3.StringUtils;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.SimpleHttpClient;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.qianwen.core.oss.OssTemplate;
import com.qianwen.core.oss.enums.OssStatusEnum;
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.tool.utils.SpringUtil;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.SimpleHttpClient;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.resource.service.IOssService;
import com.qianwen.smartman.modules.visual.dto.VisualDTO;
@@ -33,32 +32,13 @@
import com.qianwen.smartman.modules.visual.entity.Visual;
import com.qianwen.smartman.modules.visual.entity.VisualConfig;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
+
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/utils/VisualUtils.class */
public class VisualUtils {
private static final IOssService ossService = (IOssService) SpringUtil.getBean(IOssService.class);
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public static VisualTimeDTO getTimeSectionByLevel(String level) {
LocalDateTime now = LocalDateTime.now();
@@ -82,7 +62,7 @@
public static List<BladeFile> uploadToOss(File... imageFiles) {
OssTemplate template = getOssTemplate();
- List<BladeFile> bladeFiles = (List) Arrays.asList(imageFiles).parallelStream().map(item -> {
+ List<BladeFile> bladeFiles = Arrays.asList(imageFiles).parallelStream().map(item -> {
try {
FileInputStream inputStream = new FileInputStream(item);
BladeFile bladeFile = template.putFile(item.getName(), inputStream);
@@ -102,8 +82,8 @@
public static String[] replaceImageURL(List<BladeFile> files, String... jsFilesText) {
String[] replaceText = (String[]) Arrays.asList(jsFilesText).parallelStream().map(text -> {
return replaceImageURL(text, files);
- }).toArray(x$0 -> {
- return new String[x$0];
+ }).toArray(xx -> {
+ return new String[xx];
});
return replaceText;
}
@@ -125,7 +105,7 @@
}
public static List<VisualDTO> createVisualDTO(Integer category, String... replaceText) {
- List<VisualDTO> visualDTOS = (List) Arrays.asList(replaceText).parallelStream().map(item -> {
+ List<VisualDTO> visualDTOS = Arrays.asList(replaceText).parallelStream().map(item -> {
String textItem = item.replace("const option =", "");
JSONObject jsonObject = JSONObject.parseObject(textItem);
JSONObject detail = jsonObject.getJSONObject("detail");
@@ -167,8 +147,8 @@
Arrays.asList(jsText).parallelStream().forEach(text -> {
Matcher m = p.matcher(text);
while (m.find()) {
- String text = m.group(0);
- array.add(text.startsWith("\"") ? text.substring(1) : text);
+ String text1 = m.group(0);
+ array.add(text1.startsWith("\"") ? text1.substring(1) : text1);
}
});
});
@@ -196,7 +176,7 @@
return v0.getEndpoint();
}).orElse("");
urls.parallelStream().forEach(url -> {
- String url = url.startsWith("upload") ? host.concat("/visual/").concat(url) : url;
+ url = url.startsWith("upload") ? host.concat("/visual/").concat(url) : url;
String name = getUrlFileName(url, "jpeg|jpg|png|gif");
if (StringUtils.isNotBlank(name)) {
try {
@@ -213,15 +193,15 @@
}
public static String[] visualFileUpload(File[] files) {
- File imagesDir = (File) Stream.of((Object[]) files).filter(file -> {
+ File imagesDir = Stream.of(files).filter(file -> {
return file.isDirectory() && "images".equalsIgnoreCase(file.getName());
}).findFirst().orElse(null);
- String[] jsFilesText = (String[]) Stream.of((Object[]) files).filter(file2 -> {
+ String[] jsFilesText = (String[]) Stream.of(files).filter(file2 -> {
return file2.isFile() && file2.getName().endsWith("js");
}).map(item -> {
return FileUtil.readString(item, "utf-8");
- }).toArray(x$0 -> {
- return new String[x$0];
+ }).toArray(xx -> {
+ return new String[xx];
});
File[] imageFiles = imagesDir.listFiles();
List<BladeFile> bladeFiles = uploadToOss(imageFiles);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualUsagePolicyEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualUsagePolicyEnum.java
index 51dd2c4..a72529e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualUsagePolicyEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualUsagePolicyEnum.java
@@ -5,7 +5,6 @@
import com.qianwen.smartman.modules.visual.dto.DynamicCountDateAggregateDTO;
import com.qianwen.smartman.modules.visual.wrapper.VisualCountPulseWrapper;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/vo/VisualUsagePolicyEnum.class */
public enum VisualUsagePolicyEnum {
HOUR("杩憂灏忔椂缁熻", VisualCountPulseWrapper::visualCountDataByHour),
DAY("杩憂澶╃粺璁�", VisualCountPulseWrapper::visualCountDataByDay),
@@ -14,10 +13,15 @@
private String label;
private final Function<DynamicCountDateAggregateDTO, ChartSeriesDataVO> policy;
+ VisualUsagePolicyEnum(String label, Function<DynamicCountDateAggregateDTO, ChartSeriesDataVO> policy) {
+ this.label = label;
+ this.policy = policy;
+ }
+ /*
VisualUsagePolicyEnum(String label, Function policy) {
this.label = label;
this.policy = policy;
- }
+ }*/
public ChartSeriesDataVO wrapper(DynamicCountDateAggregateDTO aggregateDataDTO) {
return this.policy.apply(aggregateDataDTO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/StatusWrapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/StatusWrapper.java
index 1ff6b91..85bb4a4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/StatusWrapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/StatusWrapper.java
@@ -58,11 +58,11 @@
public ChartNameValueDataVO entityToEfficiencyAverageVo(List<SuperAggregateState> superAggregateStates, ProductivityTypeEnum productivityTypeEnum) {
ChartNameValueDataVO vo = new ChartNameValueDataVO();
- Map<Long, List<SuperAggregateState>> collect = (Map) superAggregateStates.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateState>> collect = superAggregateStates.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
AtomicReference<Double> allValue = new AtomicReference<>(Double.valueOf(0.0d));
- collect.forEach(workstationId, superAggregateStateList -> {
+ collect.forEach((workstationId, superAggregateStateList) -> {
Double value = EifficiencyUtils.calculationResults(superAggregateStateList, productivityTypeEnum);
allValue.updateAndGet(v -> {
return Double.valueOf(v.doubleValue() + value.doubleValue());
@@ -87,18 +87,18 @@
public ChartGanttStatusDataVO entityVO(List<Workstation> workstations, List<SuperAggregateState> superAggregateStateList) {
Map<Long, List<SuperAggregateState>> map = new HashMap<>(32);
if (Func.isNotEmpty(superAggregateStateList)) {
- map = (Map) superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
+ map = superAggregateStateList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
}
ChartGanttStatusDataVO chartGanttStatusDataVO = new ChartGanttStatusDataVO();
List<SeriesItem<GanttStatusVO>> series = new ArrayList<>();
- List<ChartGanttStatusDataVO.ColorStatus> colorStatusList = (List) WorkstationCache.getDefaultWcs().stream().map(globalWcs -> {
+ List<ChartGanttStatusDataVO.ColorStatus> colorStatusList = WorkstationCache.getDefaultWcs().stream().map(globalWcs -> {
return new ChartGanttStatusDataVO.ColorStatus(globalWcs.getColor(), Integer.valueOf(globalWcs.getCode()), globalWcs.getName());
}).collect(Collectors.toList());
for (Workstation workstation : workstations) {
List<SuperAggregateState> superAggregateStates = map.getOrDefault(workstation.getId(), new ArrayList<>());
- List<GanttStatusVO> list = (List) superAggregateStates.stream().map(superAggregateState -> {
+ List<GanttStatusVO> list = superAggregateStates.stream().map(superAggregateState -> {
return GanttStatusVO.builder().startTime(superAggregateState.getStartTime()).endTime(superAggregateState.getEndTime()).status(superAggregateState.getWcs()).build();
}).collect(Collectors.toList());
SeriesItem seriesItem = new SeriesItem(workstation.getName(), list);
@@ -112,12 +112,12 @@
public ChartNameValueDataVO entityToChartName(List<SuperAggregateState> data) {
ChartNameValueDataVO vo = new ChartNameValueDataVO();
List<GlobalWcs> defaultWcs = WorkstationCache.getDefaultWcs();
- Map<Integer, GlobalWcs> wcsMap = (Map) defaultWcs.stream().collect(Collectors.toMap(k -> {
+ Map<Integer, GlobalWcs> wcsMap = defaultWcs.stream().collect(Collectors.toMap(k -> {
return Integer.valueOf(Integer.parseInt(k.getCode()));
}, v -> {
return v;
}));
- Map<Integer, Long> durationMap = (Map) data.stream().filter(c -> {
+ Map<Integer, Long> durationMap = data.stream().filter(c -> {
return wcsMap.containsKey(c.getValueCollect());
}).collect(Collectors.groupingBy((v0) -> {
return v0.getWcs();
@@ -159,23 +159,23 @@
}
public ChartSeriesDataVO entityToEfficiencyTopVo(List<SuperAggregateState> statusByCondition, ProductivityTypeEnum productivityTypeEnum, Integer top, List<Workstation> workstations, String name) {
- Map<Long, Workstation> workstationMap = (Map) workstations.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, Workstation> workstationMap = workstations.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, Function.identity()));
- Map<Long, List<SuperAggregateState>> collect = (Map) statusByCondition.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateState>> collect = statusByCondition.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
Map<Long, Double> idToValue = new HashMap<>();
- collect.forEach(workstationId, statusByConditionList -> {
+ collect.forEach((workstationId, statusByConditionList) -> {
Double value = EifficiencyUtils.calculationResults(statusByConditionList, productivityTypeEnum);
double v = BigDecimal.valueOf(value.doubleValue()).multiply(BigDecimal.valueOf(100L)).doubleValue();
idToValue.put(workstationId, Double.valueOf(v));
});
- LinkedHashMap<Long, Double> collectSorted = (LinkedHashMap) idToValue.entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(top.intValue()).collect(Collectors.toMap((v0) -> {
+ LinkedHashMap<Long, Double> collectSorted = idToValue.entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(top.intValue()).collect(Collectors.toMap((v0) -> {
return v0.getKey();
}, (v0) -> {
return v0.getValue();
- }, oldValue, newValue -> {
+ }, (oldValue, newValue) -> {
return oldValue;
}, LinkedHashMap::new));
WorkstationChartSeriesDataVO chartSeriesDataVO = new WorkstationChartSeriesDataVO();
@@ -183,7 +183,7 @@
SeriesItem seriesItem = new SeriesItem();
seriesItem.setName(name);
List<Workstation> categories = new ArrayList<>();
- collectSorted.forEach(workstationId2, value -> {
+ collectSorted.forEach((workstationId2, value) -> {
data.add(value);
categories.add(workstationMap.get(workstationId2));
});
@@ -220,15 +220,15 @@
public ChartNameValueDataVO entityToEfficiencyTodayVo(List<SuperAggregateState> superAggregateStates, List<Workstation> workstations, ProductivityTypeEnum productivityTypeEnum) {
ChartNameValueDataVO vo = new ChartNameValueDataVO();
- Map<Long, String> workstationIdToName = (Map) workstations.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, String> workstationIdToName = workstations.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, (v0) -> {
return v0.getName();
}));
- Map<Long, List<SuperAggregateState>> collect = (Map) superAggregateStates.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateState>> collect = superAggregateStates.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
- collect.forEach(workstationId, superAggregateStateList -> {
+ collect.forEach((workstationId, superAggregateStateList) -> {
Double value = EifficiencyUtils.calculationResults(superAggregateStateList, productivityTypeEnum);
vo.addValue((String) workstationIdToName.get(workstationId), value);
});
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/VisualCountPulseWrapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/VisualCountPulseWrapper.java
index fbc6968..fc9b0ff 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/VisualCountPulseWrapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/wrapper/VisualCountPulseWrapper.java
@@ -23,11 +23,7 @@
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/wrapper/VisualCountPulseWrapper.class */
public class VisualCountPulseWrapper {
- static final /* synthetic */ boolean $assertionsDisabled;
-
- static {
- $assertionsDisabled = !VisualCountPulseWrapper.class.desiredAssertionStatus();
- }
+
public static ChartSeriesDataVO<Long> visualCountDataByHour(DynamicCountDateAggregateDTO countAggregateDataDTO) {
return visualCountDataByCondition(countAggregateDataDTO, ChronoUnit.HOURS, date -> {
@@ -42,13 +38,13 @@
}
public static ChartSeriesDataVO<Long> visualCountDataByShift(DynamicCountDateAggregateDTO countAggregateDataDTO) {
- Map<Long, Long> aggregateData = (Map) countAggregateDataDTO.getList().stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, Long> aggregateData = countAggregateDataDTO.getList().stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}, Collectors.summingLong((v0) -> {
return v0.getOutput();
})));
WorkstationChartSeriesDataVO<Long> chartSeriesDataVO = new WorkstationChartSeriesDataVO<>();
- List<Long> data = (List) countAggregateDataDTO.getWorkstationList().stream().map(workstation -> {
+ List<Long> data = countAggregateDataDTO.getWorkstationList().stream().map(workstation -> {
return (Long) aggregateData.getOrDefault(workstation.getId(), 0L);
}).collect(Collectors.toList());
SeriesItem<Long> item = new SeriesItem<>(VisualConstant.SHIFT_OUTPUT, data);
@@ -58,57 +54,57 @@
}
private static ChartSeriesDataVO<Long> visualCountDataByCondition(DynamicCountDateAggregateDTO countAggregateDataDTO, ChronoUnit chronoUnit, Function<LocalDateTime, String> categoriesFormat) {
- UnaryOperator<LocalDateTime> unaryOperator;
- if ($assertionsDisabled || countAggregateDataDTO.getStartTime() != null) {
- if ($assertionsDisabled || countAggregateDataDTO.getEndTime() != null) {
- List<Workstation> workstationList = countAggregateDataDTO.getWorkstationList();
- Map<Long, String> categoriesSuffix = (Map) workstationList.stream().collect(Collectors.toMap((v0) -> {
- return v0.getId();
- }, (v0) -> {
- return v0.getName();
- }));
- List<SuperAggregateOutput> list = countAggregateDataDTO.getList();
- LocalDateTime startTime = countAggregateDataDTO.getStartTime();
- LocalDateTime endTime = countAggregateDataDTO.getEndTime();
- long between = chronoUnit.between(startTime, endTime);
- if (chronoUnit.equals(ChronoUnit.HOURS)) {
- unaryOperator = date -> {
- return date.plusHours(1L);
- };
- } else {
- unaryOperator = chronoUnit.equals(ChronoUnit.DAYS) ? date2 -> {
- return date2.plusDays(1L);
- } : null;
- }
- UnaryOperator<LocalDateTime> operator = unaryOperator;
- if ($assertionsDisabled || operator != null) {
- List<String> categories = (List) Stream.iterate(startTime, operator).limit(between + 1).map(categoriesFormat).collect(Collectors.toList());
- ChartSeriesDataVO<Long> chartSeriesDataVO = new ChartSeriesDataVO<>();
- Map<Long, SeriesItem<Long>> seriesMap = new HashMap<>();
- ((Map) list.stream().collect(Collectors.groupingBy((v0) -> {
- return v0.getWorkstationId();
- }))).forEach(id, aggregateOutputs -> {
- Map<String, Long> collectMap = (Map) aggregateOutputs.stream().collect(Collectors.groupingBy(aggregate -> {
- return (String) categoriesFormat.apply(aggregate.getTs().toLocalDateTime());
- }, Collectors.summingLong((v0) -> {
- return v0.getOutput();
- })));
- seriesMap.put(id, new SeriesItem((String) categoriesSuffix.get(id), (List) categories.stream().map(it -> {
- return (Long) collectMap.getOrDefault(it, 0L);
- }).collect(Collectors.toList())));
- });
- chartSeriesDataVO.setCategories(categories);
- chartSeriesDataVO.setSeries((List) countAggregateDataDTO.getWorkstationList().stream().map(item -> {
- return (SeriesItem) seriesMap.get(item.getId());
- }).filter((v0) -> {
- return Objects.nonNull(v0);
- }).collect(Collectors.toList()));
- return chartSeriesDataVO;
- }
- throw new AssertionError();
- }
- throw new AssertionError();
+ assert countAggregateDataDTO.getStartTime() != null;
+ assert countAggregateDataDTO.getEndTime() != null;
+ //UnaryOperator<LocalDateTime> unaryOperator;
+
+ List<Workstation> workstationList = countAggregateDataDTO.getWorkstationList();
+ Map<Long, String> categoriesSuffix = workstationList.stream().collect(Collectors.toMap((v0) -> {
+ return v0.getId();
+ }, (v0) -> {
+ return v0.getName();
+ }));
+ List<SuperAggregateOutput> list = countAggregateDataDTO.getList();
+ LocalDateTime startTime = countAggregateDataDTO.getStartTime();
+ LocalDateTime endTime = countAggregateDataDTO.getEndTime();
+ long between = chronoUnit.between(startTime, endTime);
+
+ UnaryOperator<LocalDateTime> operator = chronoUnit.equals(ChronoUnit.HOURS) ? (date -> date.plusHours(1L)) : (chronoUnit.equals(ChronoUnit.DAYS) ? (date -> date.plusDays(1L)) : null);
+ /*
+ if (chronoUnit.equals(ChronoUnit.HOURS)) {
+ unaryOperator = date -> {
+ return date.plusHours(1L);
+ };
+ } else {
+ unaryOperator = chronoUnit.equals(ChronoUnit.DAYS) ? date2 -> {
+ return date2.plusDays(1L);
+ } : null;
}
- throw new AssertionError();
+ UnaryOperator<LocalDateTime> operator = unaryOperator;
+ */
+ assert operator != null;
+
+ List<String> categories = Stream.iterate(startTime, operator).limit(between + 1).map(categoriesFormat).collect(Collectors.toList());
+ ChartSeriesDataVO<Long> chartSeriesDataVO = new ChartSeriesDataVO<>();
+ Map<Long, SeriesItem<Long>> seriesMap = new HashMap<>();
+ list.stream().collect(Collectors.groupingBy((v0) -> {
+ return v0.getWorkstationId();
+ })).forEach((id, aggregateOutputs) -> {
+ Map<String, Long> collectMap = aggregateOutputs.stream().collect(Collectors.groupingBy(aggregate -> {
+ return (String) categoriesFormat.apply(aggregate.getTs().toLocalDateTime());
+ }, Collectors.summingLong((v0) -> {
+ return v0.getOutput();
+ })));
+ seriesMap.put(id, new SeriesItem((String) categoriesSuffix.get(id), categories.stream().map(it -> {
+ return (Long) collectMap.getOrDefault(it, 0L);
+ }).collect(Collectors.toList())));
+ });
+ chartSeriesDataVO.setCategories(categories);
+ chartSeriesDataVO.setSeries(countAggregateDataDTO.getWorkstationList().stream().map(item -> {
+ return (SeriesItem) seriesMap.get(item.getId());
+ }).filter((v0) -> {
+ return Objects.nonNull(v0);
+ }).collect(Collectors.toList()));
+ return chartSeriesDataVO;
}
}
--
Gitblit v1.9.3