manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
thinkgem
2024-07-26 11:04:08 +08:00
parent 35a32ce799
commit 91b6344479
11 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java
View File

@@ -9,7 +9,6 @@ import com.jeesite.common.collect.MapUtils;
import com.jeesite.common.config.Global; import com.jeesite.common.config.Global;
import com.jeesite.common.idgen.IdGen; import com.jeesite.common.idgen.IdGen;
import com.jeesite.common.lang.StringUtils; import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.lang.TimeUtils;
import com.jeesite.common.web.BaseController; import com.jeesite.common.web.BaseController;
import com.jeesite.modules.cms.entity.Article; import com.jeesite.modules.cms.entity.Article;
import com.jeesite.modules.cms.entity.Category; 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.cms.utils.CmsUtils;
import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.entity.Office;
import com.jeesite.modules.sys.utils.DictUtils; 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.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -325,7 +323,7 @@ public class CategoryController extends BaseController {
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(Category category) { public String fixTreeData(Category category) {
if (!UserUtils.getUser().isAdmin()) { if (!category.currentUser().isAdmin()) {
return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！");
} }
categoryService.fixTreeData(); categoryService.fixTreeData();

3
modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java
View File

@@ -12,7 +12,6 @@ import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.web.BaseController; import com.jeesite.common.web.BaseController;
import com.jeesite.modules.biz.entity.BizCategory; import com.jeesite.modules.biz.entity.BizCategory;
import com.jeesite.modules.biz.service.BizCategoryService; import com.jeesite.modules.biz.service.BizCategoryService;
import com.jeesite.modules.sys.utils.UserUtils;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -236,7 +235,7 @@ public class BizCategoryController extends BaseController {
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(BizCategory bizCategory){ public String fixTreeData(BizCategory bizCategory){
if (!UserUtils.getUser().isAdmin()){ if (!bizCategory.currentUser().isAdmin()){
return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！");
} }
bizCategoryService.fixTreeData(); bizCategoryService.fixTreeData();

5
modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
View File

@@ -14,7 +14,6 @@ import com.jeesite.common.web.BaseController;
import com.jeesite.modules.sys.entity.Area; import com.jeesite.modules.sys.entity.Area;
import com.jeesite.modules.sys.service.AreaService; import com.jeesite.modules.sys.service.AreaService;
import com.jeesite.modules.sys.utils.AreaUtils; import com.jeesite.modules.sys.utils.AreaUtils;
import com.jeesite.modules.sys.utils.UserUtils;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@@ -257,8 +256,8 @@ public class AreaController extends BaseController {
@RequiresPermissions("sys:area:edit") @RequiresPermissions("sys:area:edit")
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(){ public String fixTreeData(Area area){
if (!UserUtils.getUser().isAdmin()){ if (!area.currentUser().isAdmin()){
return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！"));
} }
areaService.fixTreeData(); areaService.fixTreeData();

7
modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
View File

@@ -14,8 +14,8 @@ import com.jeesite.modules.sys.entity.Company;
import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.entity.Office;
import com.jeesite.modules.sys.service.CompanyService; import com.jeesite.modules.sys.service.CompanyService;
import com.jeesite.modules.sys.service.OfficeService; import com.jeesite.modules.sys.service.OfficeService;
import com.jeesite.modules.sys.utils.UserUtils;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -271,8 +270,8 @@ public class CompanyController extends BaseController {
@RequiresPermissions("sys:company:edit") @RequiresPermissions("sys:company:edit")
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData() { public String fixTreeData(Company company) {
if (!UserUtils.getUser().isAdmin()){ if (!company.currentUser().isAdmin()){
return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！"));
} }
companyService.fixTreeData(); companyService.fixTreeData();

5
modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java
View File

@@ -15,7 +15,6 @@ import com.jeesite.modules.sys.entity.DictType;
import com.jeesite.modules.sys.service.DictDataService; import com.jeesite.modules.sys.service.DictDataService;
import com.jeesite.modules.sys.service.DictTypeService; import com.jeesite.modules.sys.service.DictTypeService;
import com.jeesite.modules.sys.utils.DictUtils; import com.jeesite.modules.sys.utils.DictUtils;
import com.jeesite.modules.sys.utils.UserUtils;
import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Hidden;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -286,8 +285,8 @@ public class DictDataController extends BaseController {
@RequiresPermissions("sys:dictData:edit") @RequiresPermissions("sys:dictData:edit")
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(){ public String fixTreeData(DictData dictData){
if (!UserUtils.getUser().isAdmin()){ if (!dictData.currentUser().isAdmin()){
return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！"));
} }
dictDataService.fixTreeData(); dictDataService.fixTreeData();

4
modules/core/src/main/java/com/jeesite/modules/sys/web/MenuController.java
View File

@@ -271,8 +271,8 @@ public class MenuController extends BaseController {
@RequiresPermissions("sys:menu:edit") @RequiresPermissions("sys:menu:edit")
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(){ public String fixTreeData(Menu menu){
if (!UserUtils.getUser().isAdmin()){ if (!menu.currentUser().isAdmin()){
return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！"));
} }
menuService.fixTreeData(); menuService.fixTreeData();

5
modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
View File

@@ -15,7 +15,6 @@ import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
import com.jeesite.common.web.BaseController; import com.jeesite.common.web.BaseController;
import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.entity.Office;
import com.jeesite.modules.sys.service.OfficeService; import com.jeesite.modules.sys.service.OfficeService;
import com.jeesite.modules.sys.utils.UserUtils;
import com.jeesite.modules.sys.web.user.EmpUserController; import com.jeesite.modules.sys.web.user.EmpUserController;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@@ -352,8 +351,8 @@ public class OfficeController extends BaseController {
@RequiresPermissions("sys:office:edit") @RequiresPermissions("sys:office:edit")
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData() { public String fixTreeData(Office office) {
if (!UserUtils.getUser().isAdmin()){ if (!office.currentUser().isAdmin()){
return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！")); return renderResult(Global.FALSE, text("操作失败，只有管理员才能进行修复！"));
} }
officeService.fixTreeData(); officeService.fixTreeData();

6
modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
View File

@@ -132,7 +132,7 @@ public class CorpAdminController extends BaseController {
User where = new User(); User where = new User();
where.setCorpCode_(user.getCorpCode_()); where.setCorpCode_(user.getCorpCode_());
List<User> list = userService.findCorpList(where); List<User> list = userService.findCorpList(where);
if (list.size() > 0){ if (!list.isEmpty()){
// 新增租户，如果已存在，则不能保存 // 新增租户，如果已存在，则不能保存
if ("addCorp".equals(op)){ if ("addCorp".equals(op)){
return renderResult(Global.FALSE, text("保存租户失败，租户代码已存在")); return renderResult(Global.FALSE, text("保存租户失败，租户代码已存在"));
@@ -151,7 +151,7 @@ public class CorpAdminController extends BaseController {
userService.save(user); userService.save(user);
userService.saveAuth(user); userService.saveAuth(user);
// 如果修改的是当前用户，则清除当前用户缓存 // 如果修改的是当前用户，则清除当前用户缓存
if (user.getUserCode().equals(UserUtils.getUser().getUserCode())) { if (user.getUserCode().equals(user.currentUser().getUserCode())) {
UserUtils.clearCache(); UserUtils.clearCache();
} }
return renderResult(Global.TRUE, text("保存管理员''{0}''成功", user.getLoginCode())); return renderResult(Global.TRUE, text("保存管理员''{0}''成功", user.getLoginCode()));
@@ -275,7 +275,7 @@ public class CorpAdminController extends BaseController {
where.setCorpCode_(corpCode); where.setCorpCode_(corpCode);
where.setPage(new Page<>(1, 1, -1)); where.setPage(new Page<>(1, 1, -1));
List<User> list = userService.findCorpList(where); List<User> list = userService.findCorpList(where);
if (list.size() > 0){ if (!list.isEmpty()){
User user = list.get(0); User user = list.get(0);
Session session = UserUtils.getSession(); Session session = UserUtils.getSession();
session.setAttribute("corpCode", user.getCorpCode_()); session.setAttribute("corpCode", user.getCorpCode_());

3
modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
View File

@@ -35,7 +35,6 @@ import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.collect.MapUtils; import com.jeesite.common.collect.MapUtils;
import com.jeesite.common.lang.StringUtils; import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.idgen.IdGen; import com.jeesite.common.idgen.IdGen;
import com.jeesite.modules.sys.utils.UserUtils;
<% }else{ %> <% }else{ %>
import com.jeesite.common.entity.Page; import com.jeesite.common.entity.Page;
<% } %> <% } %>
@@ -368,7 +367,7 @@ public class ${ClassName}Controller extends BaseController {
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(${ClassName} ${className}){ public String fixTreeData(${ClassName} ${className}){
if (!UserUtils.getUser().isAdmin()){ if (!${className}.currentUser().isAdmin()){
return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！");
} }
${className}Service.fixTreeData(); ${className}Service.fixTreeData();

3
modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
View File

@@ -35,7 +35,6 @@ import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.collect.MapUtils; import com.jeesite.common.collect.MapUtils;
import com.jeesite.common.lang.StringUtils; import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.idgen.IdGen; import com.jeesite.common.idgen.IdGen;
import com.jeesite.modules.sys.utils.UserUtils;
<% }else{ %> <% }else{ %>
import com.jeesite.common.entity.Page; import com.jeesite.common.entity.Page;
<% } %> <% } %>
@@ -370,7 +369,7 @@ public class ${ClassName}Controller extends BaseController {
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(${ClassName} ${className}){ public String fixTreeData(${ClassName} ${className}){
if (!UserUtils.getUser().isAdmin()){ if (!${className}.currentUser().isAdmin()){
return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！");
} }
${className}Service.fixTreeData(); ${className}Service.fixTreeData();

24
modules/test/src/main/java/com/jeesite/modules/test/web/TestTreeController.java
View File

@@ -4,9 +4,14 @@
*/ */
package com.jeesite.modules.test.web; package com.jeesite.modules.test.web;
import java.util.List; import com.jeesite.common.collect.ListUtils;
import java.util.Map; 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.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; 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.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.jeesite.common.config.Global; import java.util.List;
import com.jeesite.common.collect.ListUtils; import java.util.Map;
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;
/** /**
* 测试树表Controller * 测试树表Controller
@@ -214,7 +212,7 @@ public class TestTreeController extends BaseController {
@RequestMapping(value = "fixTreeData") @RequestMapping(value = "fixTreeData")
@ResponseBody @ResponseBody
public String fixTreeData(TestTree testTree){ public String fixTreeData(TestTree testTree){
if (!UserUtils.getUser().isAdmin()){ if (!testTree.currentUser().isAdmin()){
return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！"); return renderResult(Global.FALSE, "操作失败，只有管理员才能进行修复！");
} }
testTreeService.fixTreeData(); testTreeService.fixTreeData();