From 7077d3a7819de3229482e5a9edb4bd895ea2a49f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 29 Oct 2025 16:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-oss/src/main/java/com/ard/oss/service/impl/MinIOServiceImpl.java | 25 ++
ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java | 18 ++
ard-work/src/main/java/com/ard/work/component/netty/handler/MessageProtocolEncoder.java | 2
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java | 22 ++-
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java | 13 +
ard-work/src/main/java/com/ard/work/domain/receiver/BoxHistoryReceiver.java | 5
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 6
ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java | 263 +++++++++++++++++-------------------
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java | 40 +++++
ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java | 1
ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java | 10 +
ard-common/src/main/java/com/ard/common/constant/CacheConstants.java | 5
12 files changed, 253 insertions(+), 157 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
index d33b084..45fd229 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
@@ -45,6 +45,7 @@
caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
caches.add(new SysCache(CacheConstants.CAMERA_LIST_KEY, "相机列表"));
caches.add(new SysCache(CacheConstants.UAV_ONLINE_KEY, "在线无人机"));
+ caches.add(new SysCache(CacheConstants.SYS_USER_KEY, "用户列表"));
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java
index fc0f9a8..2ea62dc 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java
@@ -4,25 +4,20 @@
import javax.servlet.http.HttpServletResponse;
import com.ard.common.utils.poi.ExcelUtil;
+import com.ard.oss.model.MinioUploadResult;
import com.ard.route.domain.route.ArdRouteInformation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ard.common.annotation.Log;
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.enums.BusinessType;
import com.ard.route.service.IArdRouteInformationService;
import com.ard.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 航线(kmz)Controller
@@ -108,4 +103,15 @@
return toAjax(ardRouteInformationService.deleteArdRouteInformationByIds(ids));
}
+ /**
+ * 导入航线(kmz)文件
+ */
+ @ApiOperation("导入航线(kmz)文件")
+ @PreAuthorize("@ss.hasPermi('route:information:upload')")
+ @PostMapping("/upload")
+ public AjaxResult upload(@RequestPart("file") MultipartFile file) {
+ MinioUploadResult minioUploadResult = ardRouteInformationService.uploadArdRouteInformation(file);
+ return success(minioUploadResult);
+ }
+
}
diff --git a/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java b/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java
index c1abb0a..208e64b 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java
@@ -66,4 +66,22 @@
}
}
+ /**
+ * minio文件删除-指定桶
+ */
+ @ApiOperation("minio文件删除-指定桶")
+ @DeleteMapping("/deleteMinio/{bucketName}")
+ public AjaxResult deleteKmzFile(@PathVariable String bucketName,
+ @RequestParam String filePath) {
+ try {
+ boolean result = ossService.deleteObject(bucketName, filePath);
+ if (result) {
+ return AjaxResult.success("文件删除成功");
+ } else {
+ return AjaxResult.error("文件删除失败");
+ }
+ } catch (Exception e) {
+ return AjaxResult.error("删除文件失败: " + e.getMessage());
+ }
+ }
}
diff --git a/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java b/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java
index 227b406..a7adf51 100644
--- a/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java
@@ -56,4 +56,9 @@
* 在线无人机 redis key
*/
public static final String UAV_ONLINE_KEY = "uav_online:";
+
+ /**
+ * 用户列表 redis key
+ */
+ public static final String SYS_USER_KEY = "sys_user:";
}
diff --git a/ard-oss/src/main/java/com/ard/oss/service/impl/MinIOServiceImpl.java b/ard-oss/src/main/java/com/ard/oss/service/impl/MinIOServiceImpl.java
index 5097bce..e38cfb0 100644
--- a/ard-oss/src/main/java/com/ard/oss/service/impl/MinIOServiceImpl.java
+++ b/ard-oss/src/main/java/com/ard/oss/service/impl/MinIOServiceImpl.java
@@ -127,13 +127,28 @@
@Override
public Boolean deleteObject(String bucket, String objectKey) {
try {
- client.removeObject(RemoveObjectArgs.builder().bucket(bucket).object(objectKey).build());
- } catch (MinioException | NoSuchAlgorithmException | IOException | InvalidKeyException e) {
- log.error("Failed to delete file.");
- e.printStackTrace();
+ // 检查文件是否存在
+ client.statObject(StatObjectArgs.builder()
+ .bucket(bucket)
+ .object(objectKey)
+ .build());
+
+ // 文件存在，执行删除
+ client.removeObject(RemoveObjectArgs.builder()
+ .bucket(bucket)
+ .object(objectKey)
+ .build());
+
+ log.info("成功删除文件: {}/{}", bucket, objectKey);
+ return true;
+ } catch (ErrorResponseException e) {
+ // 文件不存在的情况
+ log.warn("文件不存在: {}/{}", bucket, objectKey);
return false;
+ } catch (Exception e) {
+ log.error("删除文件失败: {}/{}", bucket, objectKey, e);
+ throw new RuntimeException("删除文件失败: " + e.getMessage(), e);
}
- return true;
}
@Override
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
index 41cd1f5..59e687d 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
@@ -1,6 +1,8 @@
package com.ard.route.service;
+import com.ard.oss.model.MinioUploadResult;
import com.ard.route.domain.route.ArdRouteInformation;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -60,4 +62,12 @@
*/
public int deleteArdRouteInformationById(String id);
+ /**
+ * 导入航线(kmz)文件
+ *
+ * @param file 文件
+ * @return 结果
+ */
+ public MinioUploadResult uploadArdRouteInformation(MultipartFile file);
+
}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
index a05968e..b9d2823 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
@@ -2,12 +2,18 @@
import java.util.List;
import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.file.FileUtils;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.oss.model.MinioUploadResult;
+import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.domain.route.ArdRouteInformation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteInformationMapper;
import com.ard.route.service.IArdRouteInformationService;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.ard.route.util.ToolUtils.getFileNameWithoutExtension;
/**
* 航线(kmz)Service业务层处理
@@ -20,6 +26,9 @@
@Autowired
private ArdRouteInformationMapper ardRouteInformationMapper;
+
+ @Autowired
+ private OssServiceContext ossService;
/**
* 查询航线(kmz)
@@ -76,6 +85,11 @@
*/
@Override
public int deleteArdRouteInformationByIds(String[] ids) {
+ // 删除航线(kmz)文件
+ for (String id : ids) {
+ ArdRouteInformation information = ardRouteInformationMapper.selectArdRouteInformationById(id);
+ ossService.deleteObject("kmz", information.getUpPath());
+ }
return ardRouteInformationMapper.deleteArdRouteInformationByIds(ids);
}
@@ -90,4 +104,30 @@
return ardRouteInformationMapper.deleteArdRouteInformationById(id);
}
+ /**
+ * 导入航线(kmz)文件
+ *
+ * @param file 文件
+ * @return 结果
+ */
+ @Override
+ public MinioUploadResult uploadArdRouteInformation(MultipartFile file) {
+ try {
+ String url = ossService.upload("kmz",file);
+ ArdRouteInformation information = new ArdRouteInformation();
+ information.setFileName(file.getOriginalFilename());
+ information.setFileNameNew(getFileNameWithoutExtension(url));
+ information.setUpPath(url);
+ information.setUpFileSize((double) file.getSize());
+ insertArdRouteInformation(information);
+ return MinioUploadResult.builder()
+ .url(url)
+ .newFileName(FileUtils.getName(url))
+ .originalFilename(file.getOriginalFilename())
+ .build();
+ }catch (Exception e){
+ return null;
+ }
+ }
+
}
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
index 5b512e6..81066c5 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
@@ -3,8 +3,12 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import javax.validation.Validator;
+import com.ard.common.constant.CacheConstants;
+import com.ard.common.core.redis.RedisCache;
import com.ard.system.service.ISysConfigService;
import com.ard.system.service.ISysDeptService;
import com.ard.system.service.ISysUserService;
@@ -34,12 +38,11 @@
/**
* 用户 业务层处理
- *
+ *
* @author ard
*/
@Service
-public class SysUserServiceImpl implements ISysUserService
-{
+public class SysUserServiceImpl implements ISysUserService {
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired
@@ -66,81 +69,94 @@
@Autowired
protected Validator validator;
+ @Resource
+ private RedisCache redisCache;
+
+
+ /**
+ * 程序启动时将所有用户信息加载到 Redis 中
+ */
+ @PostConstruct
+ public void loadUsersToRedis() {
+ // 查询所有用户
+ List<SysUser> userList = userMapper.selectUserList(new SysUser());
+
+ // 将用户列表存入 Redis，使用用户 ID 作为 Redis 键
+ userList.forEach(user -> {
+ redisCache.setCacheObject(CacheConstants.SYS_USER_KEY + user.getUserId(), user);
+ });
+
+ log.info("用户信息已成功加载到 Redis！");
+ }
+
/**
* 根据条件分页查询用户列表
- *
+ *
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectUserList(SysUser user)
- {
+ public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
}
/**
* 根据条件分页查询已分配用户角色列表
- *
+ *
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectAllocatedList(SysUser user)
- {
+ public List<SysUser> selectAllocatedList(SysUser user) {
return userMapper.selectAllocatedList(user);
}
/**
* 根据条件分页查询未分配用户角色列表
- *
+ *
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectUnallocatedList(SysUser user)
- {
+ public List<SysUser> selectUnallocatedList(SysUser user) {
return userMapper.selectUnallocatedList(user);
}
/**
* 通过用户名查询用户
- *
+ *
* @param userName 用户名
* @return 用户对象信息
*/
@Override
- public SysUser selectUserByUserName(String userName)
- {
+ public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
}
/**
* 通过用户ID查询用户
- *
+ *
* @param userId 用户ID
* @return 用户对象信息
*/
@Override
- public SysUser selectUserById(Long userId)
- {
+ public SysUser selectUserById(Long userId) {
return userMapper.selectUserById(userId);
}
/**
* 查询用户所属角色组
- *
+ *
* @param userName 用户名
* @return 结果
*/
@Override
- public String selectUserRoleGroup(String userName)
- {
+ public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- if (CollectionUtils.isEmpty(list))
- {
+ if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
}
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -148,16 +164,14 @@
/**
* 查询用户所属岗位组
- *
+ *
* @param userName 用户名
* @return 结果
*/
@Override
- public String selectUserPostGroup(String userName)
- {
+ public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- if (CollectionUtils.isEmpty(list))
- {
+ if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
}
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@@ -165,17 +179,15 @@
/**
* 校验用户名称是否唯一
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
- public boolean checkUserNameUnique(SysUser user)
- {
+ public boolean checkUserNameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
- {
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -188,12 +200,10 @@
* @return
*/
@Override
- public boolean checkPhoneUnique(SysUser user)
- {
+ public boolean checkPhoneUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
- {
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -206,12 +216,10 @@
* @return
*/
@Override
- public boolean checkEmailUnique(SysUser user)
- {
+ public boolean checkEmailUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
- {
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -219,33 +227,28 @@
/**
* 校验用户是否允许操作
- *
+ *
* @param user 用户信息
*/
@Override
- public void checkUserAllowed(SysUser user)
- {
- if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
- {
+ public void checkUserAllowed(SysUser user) {
+ if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
throw new ServiceException("不允许操作超级管理员用户");
}
}
/**
* 校验用户是否有数据权限
- *
+ *
* @param userId 用户id
*/
@Override
- public void checkUserDataScope(Long userId)
- {
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
- {
+ public void checkUserDataScope(Long userId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
- if (StringUtils.isEmpty(users))
- {
+ if (StringUtils.isEmpty(users)) {
throw new ServiceException("没有权限访问用户数据！");
}
}
@@ -253,16 +256,17 @@
/**
* 新增保存用户信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
@Transactional
- public int insertUser(SysUser user)
- {
+ public int insertUser(SysUser user) {
// 新增用户信息
int rows = userMapper.insertUser(user);
+ // 同步到 Redis
+ redisCache.setCacheObject(CacheConstants.SYS_USER_KEY + user.getUserId(), user);
// 新增用户岗位关联
insertUserPost(user);
// 新增用户与角色管理
@@ -272,26 +276,24 @@
/**
* 注册用户信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
- public boolean registerUser(SysUser user)
- {
+ public boolean registerUser(SysUser user) {
return userMapper.insertUser(user) > 0;
}
/**
* 修改保存用户信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
@Transactional
- public int updateUser(SysUser user)
- {
+ public int updateUser(SysUser user) {
Long userId = user.getUserId();
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId);
@@ -301,109 +303,103 @@
userPostMapper.deleteUserPostByUserId(userId);
// 新增用户与岗位管理
insertUserPost(user);
- return userMapper.updateUser(user);
+ // 更新用户信息
+ int result = userMapper.updateUser(user);
+ // 同步到 Redis
+ redisCache.setCacheObject(CacheConstants.SYS_USER_KEY + user.getUserId(), user);
+ return result;
}
/**
* 用户授权角色
- *
- * @param userId 用户ID
+ *
+ * @param userId 用户ID
* @param roleIds 角色组
*/
@Override
@Transactional
- public void insertUserAuth(Long userId, Long[] roleIds)
- {
+ public void insertUserAuth(Long userId, Long[] roleIds) {
userRoleMapper.deleteUserRoleByUserId(userId);
insertUserRole(userId, roleIds);
}
/**
* 修改用户状态
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
- public int updateUserStatus(SysUser user)
- {
+ public int updateUserStatus(SysUser user) {
return userMapper.updateUser(user);
}
/**
* 修改用户基本信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
- public int updateUserProfile(SysUser user)
- {
+ public int updateUserProfile(SysUser user) {
return userMapper.updateUser(user);
}
/**
* 修改用户头像
- *
+ *
* @param userName 用户名
- * @param avatar 头像地址
+ * @param avatar 头像地址
* @return 结果
*/
@Override
- public boolean updateUserAvatar(String userName, String avatar)
- {
+ public boolean updateUserAvatar(String userName, String avatar) {
return userMapper.updateUserAvatar(userName, avatar) > 0;
}
/**
* 重置用户密码
- *
+ *
* @param user 用户信息
* @return 结果
*/
@Override
- public int resetPwd(SysUser user)
- {
+ public int resetPwd(SysUser user) {
return userMapper.updateUser(user);
}
/**
* 重置用户密码
- *
+ *
* @param userName 用户名
* @param password 密码
* @return 结果
*/
@Override
- public int resetUserPwd(String userName, String password)
- {
+ public int resetUserPwd(String userName, String password) {
return userMapper.resetUserPwd(userName, password);
}
/**
* 新增用户角色信息
- *
+ *
* @param user 用户对象
*/
- public void insertUserRole(SysUser user)
- {
+ public void insertUserRole(SysUser user) {
this.insertUserRole(user.getUserId(), user.getRoleIds());
}
/**
* 新增用户岗位信息
- *
+ *
* @param user 用户对象
*/
- public void insertUserPost(SysUser user)
- {
+ public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
- if (StringUtils.isNotEmpty(posts))
- {
+ if (StringUtils.isNotEmpty(posts)) {
// 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
- for (Long postId : posts)
- {
+ for (Long postId : posts) {
SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId());
up.setPostId(postId);
@@ -415,18 +411,15 @@
/**
* 新增用户角色信息
- *
- * @param userId 用户ID
+ *
+ * @param userId 用户ID
* @param roleIds 角色组
*/
- public void insertUserRole(Long userId, Long[] roleIds)
- {
- if (StringUtils.isNotEmpty(roleIds))
- {
+ public void insertUserRole(Long userId, Long[] roleIds) {
+ if (StringUtils.isNotEmpty(roleIds)) {
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
- for (Long roleId : roleIds)
- {
+ for (Long roleId : roleIds) {
SysUserRole ur = new SysUserRole();
ur.setUserId(userId);
ur.setRoleId(roleId);
@@ -438,33 +431,34 @@
/**
* 通过用户ID删除用户
- *
+ *
* @param userId 用户ID
* @return 结果
*/
@Override
@Transactional
- public int deleteUserById(Long userId)
- {
+ public int deleteUserById(Long userId) {
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表
userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ // 删除用户信息
+ int result = userMapper.deleteUserById(userId);
+ // 从 Redis 删除用户信息
+ redisCache.deleteObject(CacheConstants.SYS_USER_KEY + userId);
+ return result;
}
/**
* 批量删除用户信息
- *
+ *
* @param userIds 需要删除的用户ID
* @return 结果
*/
@Override
@Transactional
- public int deleteUserByIds(Long[] userIds)
- {
- for (Long userId : userIds)
- {
+ public int deleteUserByIds(Long[] userIds) {
+ for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
@@ -472,36 +466,38 @@
userRoleMapper.deleteUserRole(userIds);
// 删除用户与岗位关联
userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ // 批量删除用户信息
+ int result = userMapper.deleteUserByIds(userIds);
+
+ // 批量删除 Redis 中的用户信息
+ for (Long userId : userIds) {
+ redisCache.deleteObject(CacheConstants.SYS_USER_KEY + userId);
+ }
+ return result;
}
/**
* 导入用户数据
- *
- * @param userList 用户数据列表
+ *
+ * @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
- * @param operName 操作用户
+ * @param operName 操作用户
* @return 结果
*/
@Override
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
- {
- if (StringUtils.isNull(userList) || userList.size() == 0)
- {
+ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+ if (StringUtils.isNull(userList) || userList.size() == 0) {
throw new ServiceException("导入用户数据不能为空！");
}
int successNum = 0;
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
- for (SysUser user : userList)
- {
- try
- {
+ for (SysUser user : userList) {
+ try {
// 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName());
- if (StringUtils.isNull(u))
- {
+ if (StringUtils.isNull(u)) {
BeanValidators.validateWithException(validator, user);
deptService.checkDeptDataScope(user.getDeptId());
String password = configService.selectConfigByKey("sys.user.initPassword");
@@ -510,9 +506,7 @@
userMapper.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
- }
- else if (isUpdateSupport)
- {
+ } else if (isUpdateSupport) {
BeanValidators.validateWithException(validator, user);
checkUserAllowed(u);
checkUserDataScope(u.getUserId());
@@ -522,28 +516,21 @@
userMapper.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
- }
- else
- {
+ } else {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
}
- if (failureNum > 0)
- {
+ if (failureNum > 0) {
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString());
- }
- else
- {
+ } else {
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
}
return successMsg.toString();
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/handler/MessageProtocolEncoder.java b/ard-work/src/main/java/com/ard/work/component/netty/handler/MessageProtocolEncoder.java
index 2ab6411..ec54797 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/handler/MessageProtocolEncoder.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/handler/MessageProtocolEncoder.java
@@ -27,6 +27,6 @@
// log.warn("Encoded message bytes: {}", Arrays.toString(encodedBytes));
// 将字节数组转换为十六进制格式
String hexString = ByteUtils.bytesToHexWithSpaces(encodedBytes);
- log.warn("Encoded message in hex: {}", hexString);
+ log.debug("Encoded message in hex: {}", hexString);
}
}
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
index 8f389ee..72c2fe7 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
@@ -1,5 +1,8 @@
package com.ard.work.component.websocket.handler;
+import com.ard.common.constant.CacheConstants;
+import com.ard.common.core.domain.entity.SysUser;
+import com.ard.common.core.redis.RedisCache;
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
@@ -8,10 +11,12 @@
import com.ard.work.domain.dto.telemetry.TelemetryData;
import com.ard.work.service.control.UavControlService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -20,6 +25,8 @@
@Resource
private UavControlService uavControlService;
+ @Autowired
+ private RedisCache redisCache;
@Override
protected Map<String, Object> getData(String boxSn) {
@@ -34,12 +41,14 @@
map.put("signal", uavSignalInfo);
// 获取当前控制飞行的用户ID
Long flyUserId = uavControlService.getCurrentController(boxSn, "fly");
+ SysUser flyUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + flyUserId);
// 将飞行当前控制者用户ID添加到映射中
- map.put("flyController", flyUserId);
+ map.put("flyController", flyUser);
// 获取当前控制载荷的用户ID
Long payloadUserId = uavControlService.getCurrentController(boxSn, "payload");
+ SysUser payloadUser = redisCache.getCacheObject(CacheConstants.SYS_USER_KEY + payloadUserId);
// 将载荷当前控制者用户ID添加到映射中
- map.put("payloadController", payloadUserId);
+ map.put("payloadController", payloadUser);
return map;
}
diff --git a/ard-work/src/main/java/com/ard/work/domain/receiver/BoxHistoryReceiver.java b/ard-work/src/main/java/com/ard/work/domain/receiver/BoxHistoryReceiver.java
index a89de4c..de84960 100644
--- a/ard-work/src/main/java/com/ard/work/domain/receiver/BoxHistoryReceiver.java
+++ b/ard-work/src/main/java/com/ard/work/domain/receiver/BoxHistoryReceiver.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BoxHistoryReceiver {
@@ -35,4 +37,7 @@
@JsonProperty("endTime")
private String endTime;
+ @JsonProperty("videoPathList")
+ private List<String> videoPathList;
+
}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index ef5925e..bb541a8 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -904,7 +904,7 @@
//公共日志打印
private void logPrint(String message, Object obj) {
- String text = String.format("收到%s回复%s", message, obj);
+ String text = String.format("收到%s回复 %s", message, obj);
ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
WebSocketUtil.sendMessage("reply", serverReplyMessage);
log.debug(text);
@@ -913,9 +913,9 @@
//公共日志打印
private void logPrint(String message, byte result, Integer errorCode) {
String text = String.format(
- "收到%s回复:%s 错误码：%d【%s】",
+ "收到%s回复 状态码：%d【%s】",
message,
- ByteUtils.byteToHex(result),
+ //ByteUtils.byteToHex(result),
errorCode,
ErrorCodeEnum.getDescByCode(errorCode)
);
--
Gitblit v1.9.3