From e74403cc7340bf0e2721573cf907a16f27ea957b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期日, 23 六月 2024 10:11:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/AuthController.java | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 3c67ff7..e311882 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.*;
+import com.core.common.AesUtils;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
import com.zy.common.entity.Parameter;
@@ -22,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2019-07-30
@@ -40,6 +44,8 @@
@Autowired
private ResourceService resourceService;
@Autowired
+ private PdaResourceService pdaResourceService;
+ @Autowired
private RoleResourceService roleResourceService;
@Autowired
private PermissionService permissionService;
@@ -49,6 +55,12 @@
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String username, String password){
+ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
+// LicenseVerify licenseVerify = new LicenseVerify();
+// boolean verify = licenseVerify.verify();
+// if (!verify) {//璁稿彲璇佸凡澶辨晥
+// return R.parse(CodeRes.SYSTEM_20001);
+// }
if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
res.put("username", username);
@@ -68,14 +80,15 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system", "WMS"));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
+ userLogin.setSystem("WMS");
userLoginService.insert(userLogin);
Map<String, Object> res = new HashMap<>();
- res.put("username", user.getNickname());
+ res.put("username", user.getUsername());
res.put("token", token);
return R.ok(res);
}
@@ -219,18 +232,45 @@
// 鍔熻兘妯″潡
Map<String, Object> functions = new HashMap<>();
- functions.put("title", "鎸囧畾鍔熻兘");
+ functions.put("title", "pda鍔熻兘");
functions.put("id", "function");
functions.put("spread", true);
+ functions.put("checked", false);
List<Map> funcs = new ArrayList<>();
functions.put("children", funcs);
- List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
- for (Permission permission : permissions) {
- Map<String, Object> func = new HashMap<>();
- func.put("title", permission.getName());
- func.put("id", permission.getAction());
- func.put("spread", true);
- funcs.add(func);
+ List<PdaResource> oneLevs = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ // 涓�绾�
+ for (PdaResource oneLev : oneLevs) {
+ List<Map> twoLevelsList = new ArrayList<>();
+ Map<String, Object> oneLevelMap = new HashMap<>();
+ oneLevelMap.put("title", oneLev.getName());
+ oneLevelMap.put("id", oneLev.getId());
+ oneLevelMap.put("spread", true);
+ oneLevelMap.put("checked", true);
+ oneLevelMap.put("children", twoLevelsList);
+
+ List<PdaResource> twoLevels = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", oneLev.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
+ // 浜岀骇
+ for (PdaResource twoLevel : twoLevels){
+ Map<String, Object> twoLevelMap = new HashMap<>();
+ twoLevelMap.put("title", twoLevel.getName());
+ twoLevelMap.put("id", twoLevel.getId());
+ twoLevelMap.put("spread", false);
+ twoLevelMap.put("checked", true);
+ List<Map> threeLevelsList = new ArrayList<>();
+ twoLevelMap.put("children", threeLevelsList);
+ // 涓夌骇
+ List<PdaResource> threeLevels = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
+ for (PdaResource threeLevel : threeLevels){
+ Map<String, Object> threeLevelMap = new HashMap<>();
+ threeLevelMap.put("title", threeLevel.getName());
+ threeLevelMap.put("id", threeLevel.getId());
+ threeLevelMap.put("checked", true);
+ threeLevelsList.add(threeLevelMap);
+ }
+ twoLevelsList.add(twoLevelMap);
+ }
+ funcs.add(oneLevelMap);
}
result.add(functions);
@@ -273,19 +313,21 @@
if (!Cools.isEmpty(powers)){
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
- Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
- if (!Cools.isEmpty(resource)) {
- // 鏍￠獙涓婄骇鏉冮檺
- if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
- if (null == roleResource) {
- throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+ if (isNumber(dto.getTwo())) {
+ Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
+ if (!Cools.isEmpty(resource)) {
+ // 鏍￠獙涓婄骇鏉冮檺
+ if (leaderId != null) {
+ RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
+ if (null == roleResource) {
+ throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+ }
}
+ RoleResource roleResource = new RoleResource();
+ roleResource.setRoleId(roleId);
+ roleResource.setResourceId(resource.getId());
+ roleResourceService.insert(roleResource);
}
- RoleResource roleResource = new RoleResource();
- roleResource.setRoleId(roleId);
- roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
} else {
Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
if (!Cools.isEmpty(permission)){
@@ -302,7 +344,7 @@
if (leaderId != null) {
RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
if (null == roleResource) {
- throw new CoolException(resource.getName().concat("鐨�").concat(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())));
+ throw new CoolException(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
}
RoleResource roleResource = new RoleResource();
@@ -375,4 +417,23 @@
return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime));
}
+ @RequestMapping("/menu/pda/auth")
+ @ManagerAuth
+ public R menuPda(){
+ Long userId = getUserId();
+ List<RolePermission> rolePermissions;
+ if (userId == 9527L) {
+ rolePermissions = rolePermissionService.selectList(new EntityWrapper<>());
+ } else {
+ Long roleId = getUser().getRoleId();
+ rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ }
+ if (Cools.isEmpty(rolePermissions)) {
+ return R.ok();
+ }
+ List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
+ List<Permission> permissions = permissionService.selectBatchIds(collect);
+ return R.ok().add(permissions);
+ }
+
}
--
Gitblit v1.9.1