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/service/impl/DictBizServiceImpl.java |  153 +++++++++-----------------------------------------
 1 files changed, 28 insertions(+), 125 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictBizServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictBizServiceImpl.java
index 38fc317..7da3f15 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictBizServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/DictBizServiceImpl.java
@@ -1,17 +1,15 @@
 package com.qianwen.smartman.modules.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import com.qianwen.smartman.common.cache.DictBizCache;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qianwen.core.cache.utils.CacheUtil;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.support.Condition;
@@ -19,125 +17,18 @@
 import com.qianwen.core.tool.constant.BladeConstant;
 import com.qianwen.core.tool.node.ForestNodeMerger;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.DictBizCache;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
 import com.qianwen.smartman.modules.system.entity.DictBiz;
 import com.qianwen.smartman.modules.system.mapper.DictBizMapper;
 import com.qianwen.smartman.modules.system.service.IDictBizService;
 import com.qianwen.smartman.modules.system.vo.DictBizVO;
 import com.qianwen.smartman.modules.system.wrapper.DictBizWrapper;
-import org.springframework.stereotype.Service;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/DictBizServiceImpl.class */
 public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> implements IDictBizService {
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1601031533:
-                if (implMethodName.equals("getDictKey")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case -1041904421:
-                if (implMethodName.equals("getParentId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75622813:
-                if (implMethodName.equals("getCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75145708:
-                if (implMethodName.equals("getSort")) {
-                    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/system/entity/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDictKey();
-                    };
-                }
-                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/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getSort();
-                    };
-                }
-                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/DictBiz") && 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/system/entity/DictBiz") && 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/modules/system/entity/DictBiz") && 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/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/DictBiz") && 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/system/entity/DictBiz") && 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/system/entity/DictBiz") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
+    
 
     @Override // org.springblade.modules.system.service.IDictBizService
     public List<DictBizVO> tree() {
@@ -161,6 +52,9 @@
 
     @Override // org.springblade.modules.system.service.IDictBizService
     public boolean submit(DictBiz dict) {
+    	LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dict.getCode()).eq(DictBiz::getDictKey, dict.getDictKey());
+        Long cnt = ((DictBizMapper)this.baseMapper).selectCount(Func.isEmpty(dict.getId()) ? lqw : lqw.notIn(DictBiz::getId, new Object[] { dict.getId() }));
+        /*
         Wrapper wrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getCode();
         }, dict.getCode())).eq((v0) -> {
@@ -168,19 +62,22 @@
         }, dict.getDictKey());
         Long cnt = ((DictBizMapper) this.baseMapper).selectCount(Func.isEmpty(dict.getId()) ? wrapper : (Wrapper) wrapper.notIn((v0) -> {
             return v0.getId();
-        }, new Object[]{dict.getId()}));
+        }, new Object[]{dict.getId()}));*/
         if (cnt.longValue() > 0) {
             throw new ServiceException("褰撳墠瀛楀吀閿�煎凡瀛樺湪!");
         }
         if (Func.isNotEmpty(dict.getId()) && dict.getParentId().longValue() == BladeConstant.TOP_PARENT_ID.longValue()) {
             DictBiz parent = DictBizCache.getById(dict.getId());
+            update(Wrappers.<DictBiz>update().lambda().set(DictBiz::getCode, dict.getCode()).eq(DictBiz::getCode, parent.getCode()).ne(DictBiz::getParentId, BladeConstant.TOP_PARENT_ID));
+            
+            /*
             update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().set((v0) -> {
                 return v0.getCode();
             }, dict.getCode())).eq((v0) -> {
                 return v0.getCode();
             }, parent.getCode())).ne((v0) -> {
                 return v0.getParentId();
-            }, BladeConstant.TOP_PARENT_ID));
+            }, BladeConstant.TOP_PARENT_ID));*/
         }
         if (Func.isEmpty(dict.getParentId())) {
             dict.setParentId(BladeConstant.TOP_PARENT_ID);
@@ -192,9 +89,11 @@
 
     @Override // org.springblade.modules.system.service.IDictBizService
     public boolean removeDict(String ids) {
+    	Long cnt = this.baseMapper.selectCount(Wrappers.<DictBiz>query().lambda().in(DictBiz::getParentId, Func.toLongList(ids)));
+    	/*
         Long cnt = ((DictBizMapper) this.baseMapper).selectCount((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getParentId();
-        }, Func.toLongList(ids)));
+        }, Func.toLongList(ids)));*/
         if (cnt.longValue() > 0) {
             throw new ServiceException("璇峰厛鍒犻櫎瀛愯妭鐐�!");
         }
@@ -203,28 +102,32 @@
 
     @Override // org.springblade.modules.system.service.IDictBizService
     public IPage<DictBizVO> parentList(Map<String, Object> dict, Query query) {
+    	IPage<DictBiz> page = page(Condition.getPage(query), Condition.getQueryWrapper(dict, DictBiz.class).lambda().eq(DictBiz::getParentId, BladeConstant.TOP_PARENT_ID).orderByAsc(DictBiz::getSort));
+    	/*
         IPage<DictBiz> page = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Condition.getQueryWrapper(dict, DictBiz.class).lambda().eq((v0) -> {
             return v0.getParentId();
         }, BladeConstant.TOP_PARENT_ID)).orderByAsc((v0) -> {
             return v0.getSort();
-        }));
+        }));*/
         return DictBizWrapper.build().pageVO(page);
     }
 
     @Override // org.springblade.modules.system.service.IDictBizService
     public List<DictBizVO> childList(Map<String, Object> dict, Long parentId) {
         if (parentId.longValue() < 0) {
-            return new ArrayList();
+            return new ArrayList<>();
         }
         dict.remove("parentId");
         DictBiz parentDict = DictBizCache.getById(parentId);
+        List<DictBiz> list = list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().ne(DictBiz::getId, parentId).eq(DictBiz::getCode, parentDict.getCode()).orderByAsc(DictBiz::getSort));
+        /*
         List<DictBiz> list = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Condition.getQueryWrapper(dict, DictBiz.class).lambda().ne((v0) -> {
             return v0.getId();
         }, parentId)).eq((v0) -> {
             return v0.getCode();
         }, parentDict.getCode())).orderByAsc((v0) -> {
             return v0.getSort();
-        }));
+        }));*/
         return DictBizWrapper.build().listNodeVO(list);
     }
 }

--
Gitblit v1.9.3