From 91b634447914e204d4cce36315f7e0e6c9276afb Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 26 Jul 2024 11:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cms/web/CategoryController.java | 4 +--- .../biz/web/BizCategoryController.java | 3 +-- .../modules/sys/web/AreaController.java | 5 ++-- .../modules/sys/web/CompanyController.java | 7 +++--- .../modules/sys/web/DictDataController.java | 5 ++-- .../modules/sys/web/MenuController.java | 4 ++-- .../modules/sys/web/OfficeController.java | 5 ++-- .../sys/web/user/CorpAdminController.java | 6 ++--- .../templates/modules/gen/crud/controller.xml | 3 +-- .../modules/gen/crud_cloud/controller.xml | 3 +-- .../modules/test/web/TestTreeController.java | 24 +++++++++---------- 11 files changed, 29 insertions(+), 40 deletions(-) diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java index e88dd2d5..118a355a 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java @@ -9,7 +9,6 @@ import com.jeesite.common.collect.MapUtils; import com.jeesite.common.config.Global; import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.StringUtils; -import com.jeesite.common.lang.TimeUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.cms.entity.Article; import com.jeesite.modules.cms.entity.Category; @@ -19,7 +18,6 @@ import com.jeesite.modules.cms.service.FileTempleteService; import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.utils.DictUtils; -import com.jeesite.modules.sys.utils.UserUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -325,7 +323,7 @@ public class CategoryController extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(Category category) { - if (!UserUtils.getUser().isAdmin()) { + if (!category.currentUser().isAdmin()) { return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); } categoryService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java b/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java index 69a836f8..65eaba7a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java +++ b/modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java @@ -12,7 +12,6 @@ import com.jeesite.common.lang.StringUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.biz.entity.BizCategory; import com.jeesite.modules.biz.service.BizCategoryService; -import com.jeesite.modules.sys.utils.UserUtils; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -236,7 +235,7 @@ public class BizCategoryController extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(BizCategory bizCategory){ - if (!UserUtils.getUser().isAdmin()){ + if (!bizCategory.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); } bizCategoryService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java index 042c389b..2bc157dc 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java @@ -14,7 +14,6 @@ import com.jeesite.common.web.BaseController; import com.jeesite.modules.sys.entity.Area; import com.jeesite.modules.sys.service.AreaService; import com.jeesite.modules.sys.utils.AreaUtils; -import com.jeesite.modules.sys.utils.UserUtils; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -257,8 +256,8 @@ public class AreaController extends BaseController { @RequiresPermissions("sys:area:edit") @RequestMapping(value = "fixTreeData") @ResponseBody - public String fixTreeData(){ - if (!UserUtils.getUser().isAdmin()){ + public String fixTreeData(Area area){ + if (!area.currentUser().isAdmin()){ return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); } areaService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index 0a8b3492..952bb306 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -14,8 +14,8 @@ import com.jeesite.modules.sys.entity.Company; import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.service.CompanyService; import com.jeesite.modules.sys.service.OfficeService; -import com.jeesite.modules.sys.utils.UserUtils; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -271,8 +270,8 @@ public class CompanyController extends BaseController { @RequiresPermissions("sys:company:edit") @RequestMapping(value = "fixTreeData") @ResponseBody - public String fixTreeData() { - if (!UserUtils.getUser().isAdmin()){ + public String fixTreeData(Company company) { + if (!company.currentUser().isAdmin()){ return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); } companyService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java index edd8e683..7e6a0032 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java @@ -15,7 +15,6 @@ import com.jeesite.modules.sys.entity.DictType; import com.jeesite.modules.sys.service.DictDataService; import com.jeesite.modules.sys.service.DictTypeService; import com.jeesite.modules.sys.utils.DictUtils; -import com.jeesite.modules.sys.utils.UserUtils; import io.swagger.v3.oas.annotations.Hidden; import jakarta.servlet.http.HttpServletRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -286,8 +285,8 @@ public class DictDataController extends BaseController { @RequiresPermissions("sys:dictData:edit") @RequestMapping(value = "fixTreeData") @ResponseBody - public String fixTreeData(){ - if (!UserUtils.getUser().isAdmin()){ + public String fixTreeData(DictData dictData){ + if (!dictData.currentUser().isAdmin()){ return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); } dictDataService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/MenuController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/MenuController.java index bab1cc63..f113e036 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/MenuController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/MenuController.java @@ -271,8 +271,8 @@ public class MenuController extends BaseController { @RequiresPermissions("sys:menu:edit") @RequestMapping(value = "fixTreeData") @ResponseBody - public String fixTreeData(){ - if (!UserUtils.getUser().isAdmin()){ + public String fixTreeData(Menu menu){ + if (!menu.currentUser().isAdmin()){ return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); } menuService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index 11ead6f9..05792455 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -15,7 +15,6 @@ import com.jeesite.common.utils.excel.annotation.ExcelField.Type; import com.jeesite.common.web.BaseController; import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.service.OfficeService; -import com.jeesite.modules.sys.utils.UserUtils; import com.jeesite.modules.sys.web.user.EmpUserController; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; @@ -352,8 +351,8 @@ public class OfficeController extends BaseController { @RequiresPermissions("sys:office:edit") @RequestMapping(value = "fixTreeData") @ResponseBody - public String fixTreeData() { - if (!UserUtils.getUser().isAdmin()){ + public String fixTreeData(Office office) { + if (!office.currentUser().isAdmin()){ return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); } officeService.fixTreeData(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index 0a90d7da..546aa9ee 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -132,7 +132,7 @@ public class CorpAdminController extends BaseController { User where = new User(); where.setCorpCode_(user.getCorpCode_()); List list = userService.findCorpList(where); - if (list.size() > 0){ + if (!list.isEmpty()){ // 新增租户，如果已存在，则不能保存 if ("addCorp".equals(op)){ return renderResult(Global.FALSE, text("保存租户失败，租户代码已存在")); @@ -151,7 +151,7 @@ public class CorpAdminController extends BaseController { userService.save(user); userService.saveAuth(user); // 如果修改的是当前用户，则清除当前用户缓存 - if (user.getUserCode().equals(UserUtils.getUser().getUserCode())) { + if (user.getUserCode().equals(user.currentUser().getUserCode())) { UserUtils.clearCache(); } return renderResult(Global.TRUE, text("保存管理员''{0}''成功", user.getLoginCode())); @@ -275,7 +275,7 @@ public class CorpAdminController extends BaseController { where.setCorpCode_(corpCode); where.setPage(new Page<>(1, 1, -1)); List list = userService.findCorpList(where); - if (list.size() > 0){ + if (!list.isEmpty()){ User user = list.get(0); Session session = UserUtils.getSession(); session.setAttribute("corpCode", user.getCorpCode_()); diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index aa4c9cae..1f61a435 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -35,7 +35,6 @@ import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.idgen.IdGen; -import com.jeesite.modules.sys.utils.UserUtils; <% }else{ %> import com.jeesite.common.entity.Page; <% } %> @@ -368,7 +367,7 @@ public class ${ClassName}Controller extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(${ClassName} ${className}){ - if (!UserUtils.getUser().isAdmin()){ + if (!${className}.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); } ${className}Service.fixTreeData(); diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml index a5f82a45..ba0cdca9 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml @@ -35,7 +35,6 @@ import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.idgen.IdGen; -import com.jeesite.modules.sys.utils.UserUtils; <% }else{ %> import com.jeesite.common.entity.Page; <% } %> @@ -370,7 +369,7 @@ public class ${ClassName}Controller extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(${ClassName} ${className}){ - if (!UserUtils.getUser().isAdmin()){ + if (!${className}.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); } ${className}Service.fixTreeData(); diff --git a/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java b/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java index a93002eb..208112c0 100644 --- a/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java +++ b/modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java @@ -4,9 +4,14 @@ */ package com.jeesite.modules.test.web; -import java.util.List; -import java.util.Map; - +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.collect.MapUtils; +import com.jeesite.common.config.Global; +import com.jeesite.common.idgen.IdGen; +import com.jeesite.common.lang.StringUtils; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.test.entity.TestTree; +import com.jeesite.modules.test.service.TestTreeService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,15 +22,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.jeesite.common.config.Global; -import com.jeesite.common.collect.ListUtils; -import com.jeesite.common.collect.MapUtils; -import com.jeesite.common.lang.StringUtils; -import com.jeesite.common.idgen.IdGen; -import com.jeesite.modules.sys.utils.UserUtils; -import com.jeesite.common.web.BaseController; -import com.jeesite.modules.test.entity.TestTree; -import com.jeesite.modules.test.service.TestTreeService; +import java.util.List; +import java.util.Map; /** * 测试树表Controller @@ -214,7 +212,7 @@ public class TestTreeController extends BaseController { @RequestMapping(value = "fixTreeData") @ResponseBody public String fixTreeData(TestTree testTree){ - if (!UserUtils.getUser().isAdmin()){ + if (!testTree.currentUser().isAdmin()){ return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); } testTreeService.fixTreeData();