From 6923315545b3f97c86719148f85dac1220a14a63 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 14 一月 2026 19:23:54 +0800
Subject: [PATCH] agv空托入库接口以及机器人组站点配置
---
src/main/java/com/zy/asrs/controller/AppVersionController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AppVersionController.java b/src/main/java/com/zy/asrs/controller/AppVersionController.java
index 0d5d98e..2b5aed4 100644
--- a/src/main/java/com/zy/asrs/controller/AppVersionController.java
+++ b/src/main/java/com/zy/asrs/controller/AppVersionController.java
@@ -12,6 +12,10 @@
import com.zy.asrs.entity.AppVersion;
import com.zy.asrs.service.AppVersionService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Permission;
+import com.zy.system.entity.RolePermission;
+import com.zy.system.service.PermissionService;
+import com.zy.system.service.RolePermissionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;
@@ -22,10 +26,15 @@
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class AppVersionController extends BaseController {
+ @Autowired
+ private PermissionService permissionService;
+ @Autowired
+ private RolePermissionService rolePermissionService;
@Autowired
private AppVersionService appVersionService;
@@ -57,6 +66,7 @@
public R checkUpdate(@PathVariable("version") String version,
@PathVariable("type") Integer type) {
EntityWrapper<AppVersion> wrapper = new EntityWrapper<>();
+ wrapper.eq("type", type);
AppVersion appVersion = appVersionService.selectOne(wrapper);
if (Cools.isEmpty(appVersion)) {
return R.ok("宸叉槸鏈�鏂扮増鏈�");
@@ -220,4 +230,23 @@
response.setStatus(404);
}
}
+ @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