From 86cdd920b68274185233383f69ddb974052b6b6f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 17:55:51 +0800
Subject: [PATCH] system模块修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/ChartTestController.java | 128 ++++++++++++------------------------------
1 files changed, 36 insertions(+), 92 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/ChartTestController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/ChartTestController.java
index a4b3c84..b1466f4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/ChartTestController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/ChartTestController.java
@@ -1,34 +1,34 @@
package com.qianwen.smartman.modules.system.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.lang.invoke.SerializedLambda;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.CommonGroupConstant;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.scanner.modular.annotation.GetResource;
import com.qianwen.core.scanner.modular.annotation.PostResource;
import com.qianwen.core.scanner.modular.stereotype.ApiResource;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.DateConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.cps.convert.CommonGroupConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
@@ -50,9 +50,9 @@
import com.qianwen.smartman.modules.system.vo.ICard;
import com.qianwen.smartman.modules.system.vo.TreeTestVO;
import com.qianwen.smartman.modules.system.vo.WorkstationChartSeriesDataVO;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
@Api(value = "echart鏁版嵁绫诲瀷娴嬭瘯", tags = {"echart鏁版嵁绫诲瀷娴嬭瘯"})
@ApiResource({"blade-system/test"})
@@ -65,72 +65,6 @@
private ICommonGroupService groupService;
private ICommonGroupOfItemService commonGroupOfItemService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = false;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- 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/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- 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/CommonGroupOfItem") && 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/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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public ChartTestController(final IWorkstationService workstationService, final ICommonGroupService groupService, final ICommonGroupOfItemService commonGroupOfItemService) {
this.workstationService = workstationService;
@@ -286,8 +220,8 @@
@GetResource({"/table"})
@ApiOperation("琛ㄦ牸鏁版嵁")
public R<ChartDataTableVO> tableDataVO(@RequestParam int length) {
- List<Workstation> list = this.workstationService.list(Lambda.create().limit(Integer.valueOf(length)));
- List<ICard> workstationVOList = (List) list.stream().map(item -> {
+ List<Workstation> list = this.workstationService.list(Lambda.<Workstation>create().limit(Integer.valueOf(length)));
+ List<ICard> workstationVOList = list.stream().map(item -> {
return WorkstationConvert.INSTANCE.convert(item);
}).collect(Collectors.toList());
ChartDataTableVO chartDataTableVO = new ChartDataTableVO();
@@ -310,26 +244,34 @@
@GetResource({"/tree"})
@ApiOperation("鏍戞暟鎹祴璇�")
public R<List<TreeTestVO>> getTreeSelectVO() {
+ List<CommonGroup> list = this.groupService.list(Wrappers.<CommonGroup>lambdaQuery().orderByAsc(CommonGroup::getSort));
+ /*
List<CommonGroup> list = this.groupService.list((Wrapper) Wrappers.lambdaQuery().orderByAsc((v0) -> {
return v0.getSort();
- }));
- List<TreeTestVO> vos = (List) list.stream().map(item -> {
+ }));*/
+ List<TreeTestVO> vos = list.stream().map(item -> {
return CommonGroupConvert.INSTANCE.convertToChart(item);
}).collect(Collectors.toList());
- List<Long> groupIds = (List) list.stream().map((v0) -> {
+ List<Long> groupIds = list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
+ List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
+ .in(Func.isNotEmpty(groupIds), CommonGroupOfItem::getGroupId, groupIds)
+ .eq(CommonGroupOfItem::getGroupType, "group_workstation"));
+ /*
List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(groupIds), (v0) -> {
return v0.getGroupId();
}, groupIds).eq((v0) -> {
return v0.getGroupType();
- }, CommonGroupConstant.WORKSTATION_TYPE));
+ }, CommonGroupConstant.WORKSTATION_TYPE));*/
+ List<Workstation> workstations = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getStatus, CommonConstant.ENABLE));
+ /*
List<Workstation> workstations = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
- List<TreeTestVO> workstationList = (List) workstations.stream().map(work -> {
+ }, CommonConstant.ENABLE));*/
+ List<TreeTestVO> workstationList = workstations.stream().map(work -> {
TreeTestVO treeTestVO = null;
- CommonGroupOfItem commonGroupOfItem = (CommonGroupOfItem) itemList.stream().filter(item2 -> {
+ CommonGroupOfItem commonGroupOfItem = itemList.stream().filter(item2 -> {
return item2.getItemId().equals(work.getId());
}).findFirst().orElse(null);
if (commonGroupOfItem != null) {
@@ -368,10 +310,12 @@
@GetResource({"/workSelect"})
@ApiOperation("涓嬫媺娴嬭瘯")
public R<List<WorkstationVO>> workSelect() {
+ List<Workstation> list = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getStatus, CommonConstant.ENABLE));
+ /*
List<Workstation> list = this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE));
- List<WorkstationVO> workstationVOList = (List) list.stream().map(item -> {
+ }, CommonConstant.ENABLE));*/
+ List<WorkstationVO> workstationVOList = list.stream().map(item -> {
return WorkstationConvert.INSTANCE.convert(item);
}).collect(Collectors.toList());
return R.data(workstationVOList);
--
Gitblit v1.9.3