diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java index 28801d84..a03352ca 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.console.web.UserConsoleController; import com.ibeetl.admin.console.web.query.UserQuery; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; @@ -15,6 +16,7 @@ import com.ibeetl.admin.core.util.HttpRequestLocal; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.UniversitiesColleges; +import com.ibeetl.jlw.entity.UniversitiesCollegesUserInfo; import com.ibeetl.jlw.entity.dto.CreateUserDTO; import com.ibeetl.jlw.service.UniversitiesCollegesService; import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; @@ -87,6 +89,12 @@ public class UniversitiesCollegesController{ } } + @ResponseBody + @PostMapping(API + "/userCenter.do") + public JsonResult info(@SCoreUser CoreUser coreUser) { + return JsonResult.success(universitiesCollegesService.userCenter()); + } + /* 后台页面 */ @@ -251,23 +259,23 @@ public class UniversitiesCollegesController{ } } - @PostMapping(MODEL + "/userCenter.json") - @Function("universitiesColleges.query") - @ResponseBody - public JsonResult info(@SCoreUser CoreUser coreUser) { - return JsonResult.success(universitiesCollegesService.userCenter()); - } - /** + * 学校管理端-用户中心 + * 编辑密码 方法:{@link UserConsoleController#editPassword} 接口地址:/admin/user/editPassword.json + * 修改用户信息 方法:{@link UniversitiesCollegesController#edit} 接口地址:/jlw/universitiesColleges/edit.json + * *@author 姚丹 *@data 2022/11/28 - * 用户中心 */ @GetMapping(MODEL + "/userCenter.do") - @Function("user.query") + @Function("universitiesColleges.query") public ModelAndView userCenter() { ModelAndView view = new ModelAndView("/other/userCenter.html"); view.addObject("search", UserQuery.class.getName()); + + // 用户中心数据 + UniversitiesCollegesUserInfo userCenterData = universitiesCollegesService.userCenter(); + view.addObject("userCenterData", userCenterData); return view; } }