From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期四, 14 十二月 2023 13:30:49 +0800 Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件; --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index cc2573e..80e6733 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -6,6 +6,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import com.ruoyi.utils.result.Results; import io.swagger.annotations.*; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -237,4 +238,25 @@ public AjaxResult deptTree(SysDept dept) { return success(deptService.selectDeptTreeList(dept)); } + + /** + * 淇敼瀵嗙爜 + */ + @ApiOperation("淇敼瀵嗙爜") +// @PreAuthorize("@ss.hasPermi('system:user:changePwd')") + @PutMapping("/changePwd") + public Results changePwd(String newPassword) { + String userId = SecurityUtils.getUserId(); + SysUser sysUser = userService.selectUserById(userId); + userService.checkUserAllowed(sysUser); + userService.checkUserDataScope(userId); + sysUser.setPassword(SecurityUtils.encryptPassword(newPassword)); + sysUser.setUpdateBy(getUsername()); + int num = userService.resetPwd(sysUser); + if(num == 0){ + return Results.error("淇敼瀵嗙爜澶辫触锛�"); + }else { + return Results.succeed("淇敼瀵嗙爜鎴愬姛锛�"); + } + } } -- Gitblit v1.9.3