添加目录字段

one-certificate-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -2,13 +2,12 @@ package com.mortals.xhx.base.system.user.web;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.IBaseEnum;
-import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.annotation.Operlog;
 import com.mortals.xhx.base.system.role.model.RoleQuery;
 import com.mortals.xhx.base.system.role.model.RoleUserEntity;
@@ -18,13 +17,20 @@ import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.UserStatus;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -42,6 +48,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     private RoleService roleService;
     @Autowired
     private RoleUserService roleUserService;
+    @Autowired
+    private DeptService deptService;
+
 
     public UserController() {
         super.setModuleDesc("用户信息");
@@ -49,9 +58,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "userType", IBaseEnum.getEnumMap(UserType.class));
         this.addDict(model, "status", UserStatus.getEnumMap());
         this.addDict(model, "roleIds", roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
 
     }
 
@@ -70,26 +79,20 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException {
         RoleUserQuery roleUserQuery = new RoleUserQuery();
         roleUserQuery.setUserId(entity.getId());
-        String roleIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(","));
+        List<Long> roleIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getRoleId).collect(Collectors.toList());
         entity.setRoleIds(roleIds);
         return super.editAfter(id, model, entity, context);
     }
 
     @Override
     protected int saveAfter(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
+        if (entity.getId() == getCurUser().getId()) {
+            // TODO: 2022/8/15 更新redis session信息
+            //saveCurrUserForSession(request, response, userService.get(form.getEntity().getId(), false));
+        }
         return super.saveAfter(entity, model, context);
     }
 
-
-//    @Override
-//    protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
-//        if (!ObjectUtils.isEmpty(entity.getLoginName()) && service.existUser(entity.getLoginName(), entity.getId())) {
-//            throw new AppException("登录名已存在！");
-//        }
-//        super.saveBefore(entity, model, context);
-//    }
-
-
     @RequestMapping(value = "change/password", method = RequestMethod.POST)
     @Operlog(msg = "密码修改成功!")
     public String changePassword(@RequestParam String oldPwd, @RequestParam String newPwd) {
@@ -106,12 +109,28 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     }
 
 
-    @PostMapping({"refreshUser"})
-    @UnAuth
-    public Rest<Object> refreshUser() {
-        log.info("刷新用户");
-        this.service.refreshUser();
-        return Rest.ok("用户同步刷新操作成功");
+    @RequestMapping(value = "repassword", method = RequestMethod.POST)
+    public String rePassword(@RequestBody UserEntity userEntity) {
+        JSONObject ret = new JSONObject();
+        try {
+            //查询用户是否存在
+            boolean existUser = service.existUser(userEntity.getLoginName(), userEntity.getId());
+            if(!existUser) throw  new AppException("用户不存在！");
+
+            //修改密码
+            //service.doHandlerUser(userEntity);
+
+            service.update(userEntity,getContext());
+            //更新密码
+
+
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_MSG, "密码修改成功！");
+        } catch (Exception e) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return ret.toJSONString();
     }