From b2001a7042d511cea1c1b2000edca57253d992ad Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 20 十二月 2025 16:21:51 +0800
Subject: [PATCH] 时间控制修改

---
 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 3796ae0..84a37de 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -24,6 +24,7 @@
 import com.ycl.service.redis.RedisService;
 import com.ycl.service.user.UmsAdminService;
 import com.ycl.service.user.UmsMenuService;
+import com.ycl.utils.AesEncryptUtil;
 import com.ycl.utils.EasyExcelUtils;
 import com.ycl.utils.redis.RedisKey;
 import com.ycl.vo.user.UserVO;
@@ -80,8 +81,10 @@
     @ApiOperation(value = "鐧诲綍浠ュ悗杩斿洖token")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ResponseBody
-    public CommonResult login(@Validated @RequestBody UmsAdminLoginParam umsAdminLoginParam) {
-        String token = adminService.login(umsAdminLoginParam.getUsername(), umsAdminLoginParam.getPassword());
+    public CommonResult login(@Validated @RequestBody UmsAdminLoginParam umsAdminLoginParam) throws Exception {
+        String password = AesEncryptUtil.desEncrypt(umsAdminLoginParam.getPassword());
+//        String password = umsAdminLoginParam.getPassword();
+        String token = adminService.login(umsAdminLoginParam.getUsername(), password);
         if (token == null) {
             return CommonResult.validateFailed("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
         }
@@ -161,6 +164,7 @@
     private DataDictionary2Mapper dataDictionary2Mapper;
     @Resource
     private UmsDepartMapper umsDepartMapper;
+
     @ApiOperation("鐢ㄦ埛瀵煎叆")
     @PostMapping("/import")
     public CommonResult importUser(MultipartFile file) throws IOException {
@@ -175,20 +179,20 @@
                         param.setNickName(item.getNickName());
 
                         String sex = item.getSex();
-                        if (sex.equals("鐢�")){
+                        if (sex.equals("鐢�")) {
                             param.setSex((byte) 1);
                         } else if (sex.equals("濂�")) {
                             param.setSex((byte) 0);
-                        }else {
+                        } else {
                             throw new RuntimeException("鎬у埆杈撳叆鏈夎");
                         }
 
                         String isDy = item.getIsDy();
-                        if (isDy.equals("鏄�")){
+                        if (isDy.equals("鏄�")) {
                             param.setSex((byte) 1);
                         } else if (isDy.equals("鍚�")) {
                             param.setSex((byte) 0);
-                        }else {
+                        } else {
                             throw new RuntimeException("鍏氬憳杈撳叆鏈夎");
                         }
 
@@ -197,9 +201,9 @@
 
                         String role = item.getRole();
                         UmsRole umsRole = umsRoleMapper.selectOne(new LambdaQueryWrapper<UmsRole>().eq(UmsRole::getName, role));
-                        if (Objects.isNull(umsRole)){
+                        if (Objects.isNull(umsRole)) {
                             param.setRoleIds(null);
-                        }else {
+                        } else {
                             List list = new ArrayList<>();
                             list.add(umsRole.getId());
                             param.setRoleIds(list);
@@ -207,17 +211,17 @@
 
                         String userType = item.getUserType();
                         DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
-                        if (Objects.isNull(dataDictionary)){
+                        if (Objects.isNull(dataDictionary)) {
                             throw new RuntimeException("鐢ㄦ埛绫诲瀷涓嶅瓨鍦�");
-                        }else {
+                        } else {
                             param.setUserType(dataDictionary.getId().intValue());
                         }
 
                         String department = item.getDepartment();
                         UmsDepart umsDepart = umsDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, department));
-                        if (Objects.isNull(umsDepart)){
+                        if (Objects.isNull(umsDepart)) {
                             throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
-                        }else {
+                        } else {
                             param.setDepartmentId(umsDepart.getId());
                         }
 
@@ -234,7 +238,6 @@
                 }).sheet().doRead();
         return CommonResult.success(true, "瀵煎叆鎴愬姛");
     }
-
 
 
     @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
@@ -271,7 +274,7 @@
             return CommonResult.failed("鎵句笉鍒拌鐢ㄦ埛");
         } else if (status == -3) {
             return CommonResult.failed("鏃у瘑鐮侀敊璇�");
-        }else if (status == -4) {
+        } else if (status == -4) {
             return CommonResult.failed("瀵嗙爜涓嶈兘鍜岀櫥褰曞悕瀹屽叏涓�鑷�");
         } else {
             return CommonResult.failed();
@@ -361,4 +364,11 @@
     public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
         return CommonResult.success(adminService.getDepartUser(departId));
     }
+
+    @GetMapping(value = "/systemInfo")
+    @ResponseBody
+    public String getImages(HttpServletRequest request, HttpServletResponse response) {
+        return "閬傛槍缁煎悎鎵ф硶骞冲彴";
+
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0