Browse Source

申述添加申述来源

wangmh 7 years ago
parent
commit
3c31cf970e

+ 6 - 3
sso-server/src/main/java/com/uas/sso/controller/AppealController.java

@@ -81,7 +81,7 @@ public class AppealController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/resetPwd", method = RequestMethod.POST)
-    public ModelMap resetPwd(Appeal appeal, @RequestParam String token, String code, String password) {
+    public ModelMap resetPwd(Appeal appeal, @RequestParam String token, String code, String password, @RequestParam(defaultValue = "sso") String appId) {
         // 获取申述人,将修改的账号作为申述人
         User user = userService.findByMobile(appeal.getMobile());
         if (user == null) {
@@ -102,12 +102,13 @@ public class AppealController extends BaseController {
 
         // 保存申述信息
         appeal.setSubmitterUU(submitterUU);
+        appeal.setFromApp(appId);
         appealService.submitResetPwd(appeal, password);
         return success();
     }
 
     @RequestMapping(value = "/changeAdmin", method = RequestMethod.POST)
-    public ModelMap changeAdmin(Appeal appeal, @RequestParam String token, String code, Userspace userspace) {
+    public ModelMap changeAdmin(Appeal appeal, @RequestParam String token, String code, Userspace userspace, @RequestParam(defaultValue = "sso") String appId) {
         // 校验token
         Token existToken = tokenService.findOne(token);
         if (existToken == null || existToken.isExpired()) {
@@ -128,6 +129,7 @@ public class AppealController extends BaseController {
         // 保存申述信息,把新管理员当作申请人
         User submitter = userService.findByMobile(appeal.getMobile());
         appeal.setSubmitterUU(submitter == null ? null : submitter.getUserUU());
+        appeal.setFromApp(appId);
         appealService.submitChangeAdmin(appeal, userspace, checkSpace.getSpaceUU());
 
         // 发送短信和邮件通知审核人
@@ -139,7 +141,7 @@ public class AppealController extends BaseController {
     }
 
     @RequestMapping(value = "/account", method = RequestMethod.POST)
-    public ModelMap validAccount(Appeal appeal, String token, String code, String password) {
+    public ModelMap validAccount(Appeal appeal, String token, String code, String password, @RequestParam(defaultValue = "sso") String appId) {
         // 校验用户是否登录
         SSOToken ssoToken = SSOHelper.getToken(request);
         if (ssoToken == null) {
@@ -162,6 +164,7 @@ public class AppealController extends BaseController {
         checkMobileCode(token, appeal.getMobile(), code);
 
         // 保存申述信息
+        appeal.setFromApp(appId);
         appealService.submitValidAccount(appeal, password);
         return success();
     }

+ 14 - 0
sso-server/src/main/java/com/uas/sso/entity/Appeal.java

@@ -109,6 +109,12 @@ public class Appeal implements Serializable {
     @Column(name = "status", nullable = false)
     private short status;
 
+    /**
+     * 注册来源
+     */
+    @Column(name = "from_app", length = 30)
+    private String fromApp;
+
     public Long getId() {
         return id;
     }
@@ -229,6 +235,14 @@ public class Appeal implements Serializable {
         this.appealName = appealName;
     }
 
+    public String getFromApp() {
+        return fromApp;
+    }
+
+    public void setFromApp(String fromApp) {
+        this.fromApp = fromApp;
+    }
+
     /**
      * 申述类型枚举
      */