From 187f40fe0c37872a982890c89621da3200b8c21b Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期一, 10 十一月 2025 13:00:27 +0800
Subject: [PATCH] 更改为sql server的方式并且补充缺失的类
---
src/main/java/com/gs/simple/service/impl/MesSimpleServiceImpl.java | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/gs/simple/service/impl/MesSimpleServiceImpl.java b/src/main/java/com/gs/simple/service/impl/MesSimpleServiceImpl.java
index e684a20..c3e9a08 100644
--- a/src/main/java/com/gs/simple/service/impl/MesSimpleServiceImpl.java
+++ b/src/main/java/com/gs/simple/service/impl/MesSimpleServiceImpl.java
@@ -3,14 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gs.simple.common.ResultDto;
-import com.gs.simple.domain.Children;
-import com.gs.simple.domain.MesSimplesimple;
-import com.gs.simple.domain.TreeView;
+import com.gs.simple.domain.*;
+import com.gs.simple.mapper.BiViewMapper;
import com.gs.simple.mapper.MesSimpleMapper;
import com.gs.simple.service.MesSimpleService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.gs.simple.domain.BiView;
import java.util.ArrayList;
import java.util.List;
@@ -19,20 +19,12 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
-/**
- * @author 28567
- * @description 閽堝琛ㄣ�怣ES_SIMPLE(鑿滃崟缁存姢琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
- * @createDate 2023-11-08 14:19:52
- */
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class MesSimpleServiceImpl extends ServiceImpl<MesSimpleMapper, MesSimplesimple> implements MesSimpleService {
-
-
- // 鍒涘缓涓�涓寘鍚�10涓嚎绋嬬殑绾跨▼姹狅紝鐢ㄤ簬鏁版嵁搴撴搷浣�
+ private final BiViewMapper biViewMapper;
private final Executor dbExecutor = Executors.newFixedThreadPool(10);
-
@Override
public ResultDto<List<TreeView>> getTree() {
List<TreeView> tree = toTree();
@@ -44,42 +36,67 @@
return convertToTreeViewList(getTopList());
}
+ //GetTree鏍戝舰
@Override
- public ResultDto<List<MesSimplesimple>> getMenuList() {
+ public ResultDto getMenuList() {
LambdaQueryWrapper<MesSimplesimple> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MesSimplesimple::getDisabled, 0).gt(MesSimplesimple::getIsTop, 0);
List<MesSimplesimple> list = list(wrapper);
return ResultDto.ok(list, list.size());
}
- /**
- * <p>
- * 鑾峰彇鏍硅妭鐐�
- * </p>
- *
- * @return java.util.List<com.gs.simple.domain.MesSimplesimple>
- * @author tjx
- * @date 2023/11/8 14:39
- */
+ //List鍒楄〃
+// @Override
+// public ResultDto<List<MesSimplesimple>> getMenuList() {
+// LambdaQueryWrapper<MesSimplesimple> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(MesSimplesimple::getDisabled, 0)
+// .gt(MesSimplesimple::getIsTop, 0)
+// .orderByAsc(MesSimplesimple::getIsTop);
+//
+// List<MesSimplesimple> list = list(wrapper);
+//
+//
+// return ResultDto.ok(list, list.size());
+// }
+
+
+ @Override
+ public ResultDto<List<BiView>> getBiViewsByMenuId(Integer menuId) {
+
+ LambdaQueryWrapper<BiView> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(BiView::getPid, menuId)
+ .isNotNull(BiView::getHref);
+ List<BiView> list = biViewMapper.selectList(wrapper);
+
+ if (!list.isEmpty()) {
+ LambdaQueryWrapper<MesSimplesimple> simpleWrapper = new LambdaQueryWrapper<>();
+ simpleWrapper.eq(MesSimplesimple::getId, menuId);
+ MesSimplesimple simple = getOne(simpleWrapper);
+ if (simple != null) {
+ list.forEach(biView -> biView.setLbtime(simple.getLbtime()));
+ }
+ }
+ return ResultDto.ok(list, list.size());
+ }
+
private List<MesSimplesimple> getTopList() {
LambdaQueryWrapper<MesSimplesimple> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MesSimplesimple::getIsTop, 0).eq(MesSimplesimple::getDisabled, 0);
return list(queryWrapper);
}
- // 灏哅esSimplesimple鍒楄〃杞崲涓篢reeView鍒楄〃
private List<TreeView> convertToTreeViewList(List<MesSimplesimple> mesSimplesimpleList) {
- // 浣跨敤CompletableFuture寮傛澶勭悊姣忎釜MesSimplesimple瀵硅薄锛屽苟鏀堕泦涓轰竴涓狢ompletableFuture鍒楄〃
- List<CompletableFuture<TreeView>> treeViewFutures = mesSimplesimpleList.stream().map(mesSimplesimple -> convertToTreeViewAsync(mesSimplesimple, dbExecutor)).toList();
+ List<CompletableFuture<TreeView>> treeViewFutures = mesSimplesimpleList.stream()
+ .map(mesSimplesimple -> convertToTreeViewAsync(mesSimplesimple, dbExecutor))
+ .toList();
- // 鍒涘缓涓�涓狢ompletableFuture锛岀瓑寰呮墍鏈夊紓姝ヤ换鍔″畬鎴�
CompletableFuture<Void> allFutures = CompletableFuture.allOf(treeViewFutures.toArray(new CompletableFuture[0]));
-
- // 鍦ㄦ墍鏈夊紓姝ヤ换鍔″畬鎴愬悗锛屽皢缁撴灉鏀堕泦涓轰竴涓猅reeView鍒楄〃
- return allFutures.thenApply(v -> treeViewFutures.stream().map(CompletableFuture::join).collect(Collectors.toList())).join();
+ return allFutures.thenApply(v -> treeViewFutures.stream()
+ .map(CompletableFuture::join)
+ .collect(Collectors.toList()))
+ .join();
}
- // 灏哅esSimplesimple瀵硅薄杞崲涓篢reeView瀵硅薄锛屽苟浣跨敤鑷畾涔夌嚎绋嬫睜鎵ц寮傛浠诲姟
private CompletableFuture<TreeView> convertToTreeViewAsync(MesSimplesimple mesSimplesimple, Executor executor) {
return CompletableFuture.supplyAsync(() -> convertToTreeView(mesSimplesimple), executor);
}
@@ -91,7 +108,6 @@
treeView.setField(mesSimplesimple.getField());
treeView.setSpread(mesSimplesimple.getSpread() == 1);
- //鎼滅储瀛愯妭鐐�
LambdaQueryWrapper<MesSimplesimple> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MesSimplesimple::getDisabled, 0).eq(MesSimplesimple::getFid, mesSimplesimple.getId());
List<MesSimplesimple> list = list(wrapper);
@@ -102,15 +118,15 @@
children.setId(s.getId());
children.setTitle(s.getTitle());
children.setField(s.getField());
- children.setHref(s.getHref());
+ if ("杞挱".equals(s.getHref())) {
+ children.setHref("bi_view.html?menuId=" + s.getId() + "&lbsj=" + s.getLbtime()); // 璺宠浆鍒颁腑闂撮〉闈�
+ } else {
+ children.setHref(s.getHref());
+ }
childrenList.add(children);
});
treeView.setChildren(childrenList);
return treeView;
}
-}
-
-
-
-
+}
\ No newline at end of file
--
Gitblit v1.9.3