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/RegionController.java | 76 +++++++++++--------------------------
1 files changed, 23 insertions(+), 53 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RegionController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RegionController.java
index c6987d1..9ab5c46 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RegionController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RegionController.java
@@ -1,21 +1,20 @@
package com.qianwen.smartman.modules.system.controller;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-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 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.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.mp.support.Condition;
@@ -26,16 +25,19 @@
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.modules.system.entity.Region;
import com.qianwen.smartman.modules.system.excel.RegionExcel;
import com.qianwen.smartman.modules.system.excel.RegionImporter;
import com.qianwen.smartman.modules.system.service.IRegionService;
import com.qianwen.smartman.modules.system.vo.RegionVO;
import com.qianwen.smartman.modules.system.wrapper.RegionWrapper;
-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 = {"琛屾斂鍖哄垝"})
@@ -45,42 +47,6 @@
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/RegionController.class */
public class RegionController extends BladeController {
private final IRegionService regionService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -542933587:
- if (implMethodName.equals("getParentCode")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- 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/system/entity/Region") && 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/Region") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getParentCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public RegionController(final IRegionService regionService) {
this.regionService = regionService;
@@ -98,9 +64,11 @@
@GetResource({"/list"})
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆region")
public R<IPage<Region>> list(Region region, Query query) {
+ IPage<Region> pages = this.regionService.page(Condition.getPage(query), Condition.getQueryWrapper(region).lambda().orderByAsc(Region::getSort));
+ /*
IPage<Region> pages = this.regionService.page(Condition.getPage(query), (Wrapper) Condition.getQueryWrapper(region).lambda().orderByAsc((v0) -> {
return v0.getSort();
- }));
+ }));*/
return R.data(pages);
}
@@ -154,9 +122,11 @@
@GetResource({"/select"})
@ApiOperation(value = "涓嬫媺鏁版嵁婧�", notes = "浼犲叆tenant")
public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code) {
+ List<Region> list = this.regionService.list(Wrappers.<Region>query().lambda().eq(Region::getParentCode, code));
+ /*
List<Region> list = this.regionService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getParentCode();
- }, code));
+ }, code));*/
return R.data(list);
}
--
Gitblit v1.9.3