申述数据存储修改，申述修改密码逻辑修改

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

@@ -1,19 +1,18 @@
 package com.uas.sso.controller;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.uas.sso.SSOHelper;
+import com.uas.sso.SSOToken;
 import com.uas.sso.entity.*;
 import com.uas.sso.service.*;
 import com.uas.sso.support.SystemSession;
-import com.uas.sso.util.FastjsonUtils;
-import com.uas.sso.util.FileUrl;
-import com.uas.sso.util.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+
 
 /**
  * @author wangmh
@@ -81,7 +80,8 @@ public class AppealController extends BaseController {
     @RequestMapping(value = "/resetPwd", method = RequestMethod.POST)
     public ModelMap resetPwd(Appeal appeal, @RequestParam String token, String code, String password) {
         // 获取申述人
-        UserAccount loginUser = SystemSession.getUserAccount();
+        SSOToken ssoToken = SSOHelper.getToken(request);
+        UserAccount loginUser = JSON.parseObject(ssoToken.getData(), UserAccount.class);
         Long submitterUU = loginUser == null ? (Long) request.getSession().getAttribute("userUU") : loginUser.getUserUU();
 
         // 校验token
@@ -122,7 +122,7 @@ public class AppealController extends BaseController {
 
         // 保存申述信息
         appeal.setSubmitterUU(userAccount.getUserUU());
-        appealService.submitChangeAdmin(appeal, userspace);
+        appealService.submitChangeAdmin(appeal, userspace, userAccount.getSpaceUU());
         return success();
     }
 

sso-server/src/main/java/com/uas/sso/service/AppealService.java

@@ -21,8 +21,9 @@ public interface AppealService {
      * 提交更换管理员申述
      * @param appeal 申述信息
      * @param userspace 企业信息
+     * @param spaceUU 更换管理员的企业uu号
      */
-    void submitChangeAdmin(Appeal appeal, Userspace userspace);
+    void submitChangeAdmin(Appeal appeal, Userspace userspace, Long spaceUU);
 
     /**
      * 提交验证账号申述

sso-server/src/main/java/com/uas/sso/service/impl/AppealServiceImpl.java

@@ -6,8 +6,10 @@ import com.uas.sso.dao.AppealDao;
 import com.uas.sso.entity.Appeal;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.service.AppealService;
+import com.uas.sso.service.UserspaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import java.sql.Timestamp;
 
@@ -22,11 +24,14 @@ public class AppealServiceImpl implements AppealService {
     @Autowired
     private AppealDao appealDao;
 
+    @Autowired
+    private UserspaceService userspaceService;
+
     @Override
     public void submitResetPwd(Appeal appeal, String password) {
         // 设置默认信息
         appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
-        appeal.setSubmitInfo(JSON.toJSONString(password));
+        appeal.setSubmitInfo(JSON.toJSONString(new ModelMap("password", password)));
         appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
         appeal.setType(Appeal.Type.RESET_PASSWORD.getDesc());
 
@@ -35,7 +40,12 @@ public class AppealServiceImpl implements AppealService {
     }
 
     @Override
-    public void submitChangeAdmin(Appeal appeal, Userspace userspace) {
+    public void submitChangeAdmin(Appeal appeal, Userspace userspace, Long spaceUU) {
+        // 设置企业信息
+        userspace.setSpaceUU(spaceUU);
+        Userspace oldSpace = userspaceService.findOne(spaceUU);
+        userspace.setAdmin(oldSpace.getAdmin());
+
         // 设置默认信息
         appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
         appeal.setSubmitInfo(JSON.toJSONString(userspace));
@@ -51,7 +61,7 @@ public class AppealServiceImpl implements AppealService {
     public void submitValidAccount(Appeal appeal, String password) {
         // 设置默认信息
         appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
-        appeal.setSubmitInfo(JSON.toJSONString(password));
+        appeal.setSubmitInfo(JSON.toJSONString(new ModelMap("password", password)));
         appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
         appeal.setType(Appeal.Type.VALID_ACCOUNT.getDesc());