From ed4a5236bab800094be4a8378f5098eebe3de6ac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 四月 2024 23:30:30 +0800
Subject: [PATCH] 清楚不不要的mapstruct文件
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/UserController.java | 107 +++++++++++++++++++----------------------------------
1 files changed, 39 insertions(+), 68 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/UserController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/UserController.java
index 88080b6..f350875 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/UserController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/UserController.java
@@ -1,22 +1,21 @@
package com.qianwen.smartman.modules.system.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.ArrayList;
import java.util.List;
import java.util.Map;
+
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.cache.UserCache;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
+
+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.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.cache.utils.CacheUtil;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.annotation.ApiLog;
@@ -32,6 +31,9 @@
import com.qianwen.core.tenant.annotation.NonDS;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.common.cache.UserCache;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
import com.qianwen.smartman.modules.system.convert.UserConvert;
import com.qianwen.smartman.modules.system.dto.PasswordModifyValidInfo;
import com.qianwen.smartman.modules.system.entity.User;
@@ -48,11 +50,12 @@
import com.qianwen.smartman.modules.system.vo.UserSimpleVO;
import com.qianwen.smartman.modules.system.vo.UserVO;
import com.qianwen.smartman.modules.system.wrapper.UserWrapper;
-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.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import springfox.documentation.annotations.ApiIgnore;
@Api(value = "鐢ㄦ埛", tags = {"鐢ㄦ埛"})
@@ -65,51 +68,6 @@
private final InitPasswordModifyLink initPasswordModifyLink;
private final AccountPasswordModifyLink accountPasswordModifyLink;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- case 961079513:
- if (implMethodName.equals("getIsDeleted")) {
- 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.getIsDeleted();
- };
- }
- 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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- 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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- 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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public UserController(final IUserService userService, final InitPasswordModifyLink initPasswordModifyLink, final AccountPasswordModifyLink accountPasswordModifyLink) {
this.userService = userService;
@@ -139,10 +97,14 @@
@GetResource({"/list"})
@ApiOperation(value = "鍒楄〃", notes = "浼犲叆account鍜宺ealName")
public R<IPage<UserVO>> list(@RequestParam @ApiIgnore Map<String, Object> user, Query query, BladeUser bladeUser) {
- Wrapper queryWrapper = Condition.getQueryWrapper(user, User.class);
+
+ QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
+ IPage<User> pages = this.userService.page(Condition.getPage(query), !bladeUser.getTenantId().equals("000000") ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+ /*
+
IPage<User> pages = this.userService.page(Condition.getPage(query), !bladeUser.getTenantId().equals("000000") ? (Wrapper) queryWrapper.lambda().eq((v0) -> {
return v0.getTenantId();
- }, bladeUser.getTenantId()) : queryWrapper);
+ }, bladeUser.getTenantId()) : queryWrapper);*/
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -230,10 +192,13 @@
@GetResource({"/user-list"})
@ApiOperation(value = "鐢ㄦ埛鍒楄〃", notes = "浼犲叆user")
public R<List<User>> userList(User user, BladeUser bladeUser) {
+ QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
+ List<User> list = this.userService.list(!AuthUtil.isAdministrator() ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+ /*
Wrapper queryWrapper = Condition.getQueryWrapper(user);
List<User> list = this.userService.list(!AuthUtil.isAdministrator() ? (Wrapper) queryWrapper.lambda().eq((v0) -> {
return v0.getTenantId();
- }, bladeUser.getTenantId()) : queryWrapper);
+ }, bladeUser.getTenantId()) : queryWrapper);*/
return R.data(list);
}
@@ -252,15 +217,21 @@
@GetResource({"export-user"})
@ApiOperation(value = "瀵煎嚭鐢ㄦ埛", notes = "浼犲叆user")
public void exportUser(@RequestParam @ApiIgnore Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
- Wrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
+ //Wrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
+ QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
if (!AuthUtil.isAdministrator()) {
+ queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
+ /*
queryWrapper.lambda().eq((v0) -> {
return v0.getTenantId();
- }, bladeUser.getTenantId());
+ }, bladeUser.getTenantId());*/
}
+
+ queryWrapper.lambda().eq(User::getIsDeleted, 0);
+ /*
queryWrapper.lambda().eq((v0) -> {
return v0.getIsDeleted();
- }, 0);
+ }, 0);*/
List<UserExcel> list = this.userService.exportUser(queryWrapper);
ExcelUtil.export(response, "鐢ㄦ埛鏁版嵁" + DateUtil.time(), "鐢ㄦ埛鏁版嵁琛�", list, UserExcel.class);
}
--
Gitblit v1.9.3