申述方法修改

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

@@ -2,10 +2,7 @@ package com.uas.sso.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.entity.*;
-import com.uas.sso.service.ChangeAdminAppealService;
-import com.uas.sso.service.ResetPwdAppealService;
-import com.uas.sso.service.UserService;
-import com.uas.sso.service.ValidAccountAppealService;
+import com.uas.sso.service.*;
 import com.uas.sso.support.SystemSession;
 import com.uas.sso.util.FastjsonUtils;
 import com.uas.sso.util.FileUrl;
@@ -32,13 +29,7 @@ public class AppealController extends BaseController {
     private UserService userService;
 
     @Autowired
-    private ResetPwdAppealService resetPwdAppealService;
-
-    @Autowired
-    private ChangeAdminAppealService changeAdminAppealService;
-
-    @Autowired
-    private ValidAccountAppealService validAccountAppealService;
+    private AppealService appealService;
 
     /**
      * 获取手机号验证码
@@ -50,12 +41,10 @@ public class AppealController extends BaseController {
      */
     @RequestMapping(value = "/check/mobile", method = RequestMethod.GET)
     public ModelMap checkMobile(String mobile) {
-        if (!userService.mobileHasRegistered(mobile)) {
-            return error("用户手机号未被注册");
-        }
-
         String token = getMobileCode(mobile);
-        return success(new ModelMap("token", token));
+        ModelMap data = new ModelMap("token", token);
+        data.put("code", request.getSession().getAttribute("code"));
+        return success(data);
     }
 
     /**
@@ -84,13 +73,13 @@ public class AppealController extends BaseController {
 
     /**
      * 找回密码申述
-     * @param resetPwdAppeal 申述信息
+     * @param appeal 申述信息
      * @param token 验证码tokenId
      * @param code 验证码
      * @return
      */
     @RequestMapping(value = "/resetPwd", method = RequestMethod.POST)
-    public ModelMap resetPwd(ResetPwdAppeal resetPwdAppeal, @RequestParam String token, String code) {
+    public ModelMap resetPwd(Appeal appeal, @RequestParam String token, String code, String password) {
         // 校验token
         Token existToken = tokenService.findOne(token);
         if (existToken == null || existToken.isExpired()) {
@@ -100,15 +89,15 @@ public class AppealController extends BaseController {
         // TODO 参数空检验
 
         // 校验验证码
-        checkMobileCode(token, resetPwdAppeal.getMobile(), code);
+        checkMobileCode(token, appeal.getMobile(), code);
 
         // 保存申述信息
-        resetPwdAppealService.submit(resetPwdAppeal);
+        appealService.submitResetPwd(appeal, password);
         return success();
     }
 
     @RequestMapping(value = "/changeAdmin", method = RequestMethod.POST)
-    public ModelMap changeAdmin(ChangeAdminAppeal changeAdminAppeal, @RequestParam String token, String code, MultipartFile businessImage) throws Exception {
+    public ModelMap changeAdmin(Appeal appeal, @RequestParam String token, String code, MultipartFile businessImage, Userspace userspace) throws Exception {
         // 校验用户是否登录
         UserAccount userAccount = SystemSession.getUserAccount();
         if (userAccount == null) {
@@ -124,7 +113,7 @@ public class AppealController extends BaseController {
         // TODO 参数空检验
 
         // 校验验证码
-        checkMobileCode(token, changeAdminAppeal.getMobile(), code);
+        checkMobileCode(token, appeal.getMobile(), code);
 
         // 上传营业执照
         if (!(businessImage == null || businessImage.isEmpty())) {
@@ -135,20 +124,20 @@ public class AppealController extends BaseController {
             JSONObject obj = FastjsonUtils.parseObject(response.getResponseText());
             String path = (String) obj.get("path");
             if (path != null) {
-                changeAdminAppeal.setBusinessCodeImage(path);
+                userspace.setBusinessCodeImage(path);
             } else {
                 return error("请检查您的营业执照附件");
             }
         }
 
         // 保存申述信息
-        changeAdminAppeal.setSubmitterUU(userAccount.getUserUU());
-        changeAdminAppealService.submit(changeAdminAppeal);
+        appeal.setSubmitterUU(userAccount.getUserUU());
+        appealService.submitChangeAdmin(appeal, userspace);
         return success();
     }
 
     @RequestMapping(value = "/account", method = RequestMethod.POST)
-    public ModelMap validAccount(ValidAccountAppeal validAccountAppeal, String token, String code) {
+    public ModelMap validAccount(Appeal appeal, String token, String code, String password) {
         // 校验用户是否登录
         UserAccount userAccount = SystemSession.getUserAccount();
         if (userAccount == null) {
@@ -164,11 +153,11 @@ public class AppealController extends BaseController {
         // TODO 参数空检验
 
         // 校验验证码
-        checkMobileCode(token, validAccountAppeal.getMobile(), code);
+        checkMobileCode(token, appeal.getMobile(), code);
 
         // 保存申述信息
-        validAccountAppeal.setSubmitterUU(userAccount.getUserUU());
-        validAccountAppealService.submit(validAccountAppeal);
+        appeal.setSubmitterUU(userAccount.getUserUU());
+        appealService.submitValidAccount(appeal, password);
         return success();
     }
 }

sso-server/src/main/java/com/uas/sso/dao/ResetPwdAppealDao.java → sso-server/src/main/java/com/uas/sso/dao/AppealDao.java

@@ -1,13 +1,13 @@
 package com.uas.sso.dao;
 
-import com.uas.sso.entity.ResetPwdAppeal;
+import com.uas.sso.entity.Appeal;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
  * @author wangmh
- * @create 2018-01-16 14:27
+ * @create 2018-01-20 10:43
  * @desc
  **/
-public interface ResetPwdAppealDao extends JpaRepository<ResetPwdAppeal, Long>, JpaSpecificationExecutor<ResetPwdAppeal> {
+public interface AppealDao extends JpaRepository<Appeal, Long>, JpaSpecificationExecutor<Appeal> {
 }

sso-server/src/main/java/com/uas/sso/dao/ChangeAdminAppealDao.java

@@ -1,13 +0,0 @@
-package com.uas.sso.dao;
-
-import com.uas.sso.entity.ChangeAdminAppeal;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
- * @author wangmh
- * @create 2018-01-16 16:39
- * @desc
- **/
-public interface ChangeAdminAppealDao extends JpaRepository<ChangeAdminAppeal, Long>, JpaSpecificationExecutor<ChangeAdminAppeal> {
-}

sso-server/src/main/java/com/uas/sso/dao/ValidAccountAppealDao.java

@@ -1,13 +0,0 @@
-package com.uas.sso.dao;
-
-import com.uas.sso.entity.ValidAccountAppeal;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
- * @author wangmh
- * @create 2018-01-16 17:04
- * @desc
- **/
-public interface ValidAccountAppealDao extends JpaRepository<ValidAccountAppeal, Long>, JpaSpecificationExecutor<ValidAccountAppeal> {
-}

sso-server/src/main/java/com/uas/sso/entity/ValidAccountAppeal.java → sso-server/src/main/java/com/uas/sso/entity/Appeal.java

@@ -6,12 +6,12 @@ import java.sql.Timestamp;
 
 /**
  * @author wangmh
- * @create 2018-01-16 16:52
- * @desc 验证账号申述
+ * @create 2018-01-19 18:45
+ * @desc 认证申述实体
  **/
 @Entity
-@Table(name = "sso$appeal$account")
-public class ValidAccountAppeal implements Serializable {
+@Table(name = "sso$valid$appeal")
+public class Appeal implements Serializable {
 
     /**
      *
@@ -23,21 +23,27 @@ public class ValidAccountAppeal implements Serializable {
      */
     @Id
     @Column(name = "_id")
-    @SequenceGenerator(name = "sso$appeal$account_gen", sequenceName = "sso$appeal$account_seq", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "sso$appeal$account_gen")
+    @SequenceGenerator(name = "sso$valid$appeal_gen", sequenceName = "sso$valid$appeal_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "sso$valid$appeal_gen")
     private Long id;
 
     /**
      * 新手机号
      */
-    @Column(name = "mobile")
+    @Column(name = "mobile", nullable = false)
     private String mobile;
 
     /**
-     * 登录密码
+     * 申述类型（resetPwd or validAccount or changeAdmin）
      */
-    @Column(name = "_password")
-    private String password;
+    @Column(name = "type", nullable = false)
+    private String type;
+
+    /**
+     * 提交信息
+     */
+    @Column(name = "submit_info", nullable = false, length = 2000)
+    private String submitInfo;
 
     /**
      * 申述说明
@@ -110,12 +116,20 @@ public class ValidAccountAppeal implements Serializable {
         this.mobile = mobile;
     }
 
-    public String getPassword() {
-        return password;
+    public String getType() {
+        return type;
     }
 
-    public void setPassword(String password) {
-        this.password = password;
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getSubmitInfo() {
+        return submitInfo;
+    }
+
+    public void setSubmitInfo(String submitInfo) {
+        this.submitInfo = submitInfo;
     }
 
     public String getDescription() {
@@ -189,4 +203,34 @@ public class ValidAccountAppeal implements Serializable {
     public void setStatus(short status) {
         this.status = status;
     }
+
+    /**
+     * 申述类型枚举
+     */
+    public enum Type {
+        /**
+         * 重置密码
+         */
+        RESET_PASSWORD("resetPassword"),
+
+        /**
+         * 更换管理员
+         */
+        CHANGE_ADMIN("changeAdmin"),
+
+        /**
+         * 认证账号
+         */
+        VALID_ACCOUNT("validAccount");
+
+        private String desc;
+
+        Type(String desc) {
+            this.desc = desc;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+    }
 }

sso-server/src/main/java/com/uas/sso/entity/ChangeAdminAppeal.java

@@ -1,303 +0,0 @@
-package com.uas.sso.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * @author wangmh
- * @create 2018-01-16 16:03
- * @desc 更换管理员申述
- **/
-@Entity
-@Table(name = "sso$appeal$admin")
-public class ChangeAdminAppeal implements Serializable {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @Id
-    @Column(name = "_id")
-    @SequenceGenerator(name = "sso$appeal$admin_gen", sequenceName = "sso$appeal$admin_seq", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "sso$appeal$admin_gen")
-    private Long id;
-
-    /**
-     * 新管理员手机号
-     */
-    @Column(name = "mobile")
-    private String mobile;
-
-    /**
-     * 企业名称
-     */
-    @Column(name = "space_name")
-    private String spaceName;
-
-    /**
-     * 企业营业执照号
-     */
-    @Column(name = "business_code")
-    private String businessCode;
-
-    /**
-     * 企业营业执照
-     */
-    @Column(name = "business_code_image")
-    private String businessCodeImage;
-
-    /**
-     * 法定代表人
-     */
-    @Column(name = "corporation")
-    private String corporation;
-
-    /**
-     * 注册地址
-     */
-    @Column(name = "reg_address")
-    private String regAddress;
-
-    /**
-     * 注册地址所在省份、州、直辖市、行政区
-     */
-    @Column(name = "reg_province")
-    private String province;
-
-    /**
-     * 注册地址所在城市
-     */
-    @Column(name = "reg_city")
-    private String city;
-
-    /**
-     * 注册地址所在区域
-     */
-    @Column(name = "reg_district")
-    private String district;
-
-    /**
-     * 注册地址所在街道
-     */
-    @Column(name = "reg_street")
-    private String street;
-    /**
-     * 申述说明
-     */
-    @Column(name = "description", nullable = false, length = 2000)
-    private String description;
-
-    /**
-     * 申请人uu号
-     */
-    @Column(name = "submitter_uu", nullable = false)
-    private Long submitterUU;
-
-    /**
-     * 联系人
-     */
-    @Column(name = "contact_name", nullable = false)
-    private String contactName;
-
-    /**
-     * 联系电话
-     */
-    @Column(name = "contact_tel", nullable = false)
-    private String contactTel;
-
-    /**
-     * 联系邮箱
-     */
-    @Column(name = "contact_email", nullable = false)
-    private String contactEmail;
-
-
-    /**
-     * 提交日期
-     */
-    @Column(name = "submit_date")
-    private Timestamp submitDate;
-
-    /**
-     * 审核人
-     */
-    @Column(name = "auditor")
-    private String auditor;
-
-    /**
-     * 审核日期
-     */
-    @Column(name = "audit_date")
-    private Timestamp auditDate;
-
-    /**
-     * 审核状态（Status枚举）
-     */
-    @Column(name = "status", nullable = false)
-    private short status;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getSpaceName() {
-        return spaceName;
-    }
-
-    public void setSpaceName(String spaceName) {
-        this.spaceName = spaceName;
-    }
-
-    public String getBusinessCode() {
-        return businessCode;
-    }
-
-    public void setBusinessCode(String businessCode) {
-        this.businessCode = businessCode;
-    }
-
-    public String getBusinessCodeImage() {
-        return businessCodeImage;
-    }
-
-    public void setBusinessCodeImage(String businessCodeImage) {
-        this.businessCodeImage = businessCodeImage;
-    }
-
-    public String getCorporation() {
-        return corporation;
-    }
-
-    public void setCorporation(String corporation) {
-        this.corporation = corporation;
-    }
-
-    public String getRegAddress() {
-        return regAddress;
-    }
-
-    public void setRegAddress(String regAddress) {
-        this.regAddress = regAddress;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getDistrict() {
-        return district;
-    }
-
-    public void setDistrict(String district) {
-        this.district = district;
-    }
-
-    public String getStreet() {
-        return street;
-    }
-
-    public void setStreet(String street) {
-        this.street = street;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getSubmitterUU() {
-        return submitterUU;
-    }
-
-    public void setSubmitterUU(Long submitterUU) {
-        this.submitterUU = submitterUU;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
-    public String getContactTel() {
-        return contactTel;
-    }
-
-    public void setContactTel(String contactTel) {
-        this.contactTel = contactTel;
-    }
-
-    public String getContactEmail() {
-        return contactEmail;
-    }
-
-    public void setContactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-    }
-
-    public Timestamp getSubmitDate() {
-        return submitDate;
-    }
-
-    public void setSubmitDate(Timestamp submitDate) {
-        this.submitDate = submitDate;
-    }
-
-    public String getAuditor() {
-        return auditor;
-    }
-
-    public void setAuditor(String auditor) {
-        this.auditor = auditor;
-    }
-
-    public Timestamp getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Timestamp auditDate) {
-        this.auditDate = auditDate;
-    }
-
-    public short getStatus() {
-        return status;
-    }
-
-    public void setStatus(short status) {
-        this.status = status;
-    }
-}

sso-server/src/main/java/com/uas/sso/entity/ResetPwdAppeal.java

@@ -1,179 +0,0 @@
-package com.uas.sso.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * @author wangmh
- * @create 2018-01-16 10:58
- * @desc 找回密码申述实体
- **/
-@Entity
-@Table(name = "sso$appeal$password")
-public class ResetPwdAppeal implements Serializable {
-
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @Id
-    @Column(name = "_id")
-    @SequenceGenerator(name = "sso$appeal$password_gen", sequenceName = "sso$appeal$password_seq", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "sso$appeal$password_gen")
-    private Long id;
-
-    /**
-     * 手机号
-     */
-    @Column(name = "mobile", nullable = false)
-    private String mobile;
-
-    /**
-     * 申述密码
-     */
-    @Column(name = "_password", nullable = false)
-    private String password;
-
-    /**
-     * 申述说明
-     */
-    @Column(name = "description", nullable = false, length = 2000)
-    private String description;
-
-    /**
-     * 联系人
-     */
-    @Column(name = "contact_name", nullable = false)
-    private String contactName;
-
-    /**
-     * 联系人手机号
-     */
-    @Column(name = "contact_tel", nullable = false)
-    private String contactTel;
-
-    /**
-     * 联系人邮箱
-     */
-    @Column(name = "contact_email", nullable = false)
-    private String contactEmail;
-
-
-    /**
-     * 提交日期
-     */
-    @Column(name = "submit_date")
-    private Timestamp submitDate;
-
-    /**
-     * 审核人
-     */
-    @Column(name = "auditor")
-    private String auditor;
-
-    /**
-     * 审核日期
-     */
-    @Column(name = "audit_date")
-    private Timestamp auditDate;
-
-    /**
-     * 审核状态（Status枚举）
-     */
-    @Column(name = "status", nullable = false)
-    private short status;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
-    public String getContactTel() {
-        return contactTel;
-    }
-
-    public void setContactTel(String contactTel) {
-        this.contactTel = contactTel;
-    }
-
-    public String getContactEmail() {
-        return contactEmail;
-    }
-
-    public void setContactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-    }
-
-    public Timestamp getSubmitDate() {
-        return submitDate;
-    }
-
-    public void setSubmitDate(Timestamp submitDate) {
-        this.submitDate = submitDate;
-    }
-
-    public String getAuditor() {
-        return auditor;
-    }
-
-    public void setAuditor(String auditor) {
-        this.auditor = auditor;
-    }
-
-    public Timestamp getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Timestamp auditDate) {
-        this.auditDate = auditDate;
-    }
-
-    public short getStatus() {
-        return status;
-    }
-
-    public void setStatus(short status) {
-        this.status = status;
-    }
-}

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

@@ -0,0 +1,33 @@
+package com.uas.sso.service;
+
+import com.uas.sso.entity.Appeal;
+import com.uas.sso.entity.Userspace;
+
+/**
+ * @author wangmh
+ * @create 2018-01-20 10:30
+ * @desc 申述service
+ **/
+public interface AppealService {
+
+    /**
+     * 提交重置密码申述
+     * @param appeal 重置密码申述信息
+     * @param password 密码
+     */
+    void submitResetPwd(Appeal appeal, String password);
+
+    /**
+     * 提交更换管理员申述
+     * @param appeal 申述信息
+     * @param userspace 企业信息
+     */
+    void submitChangeAdmin(Appeal appeal, Userspace userspace);
+
+    /**
+     * 提交验证账号申述
+     * @param appeal 申述信息
+     * @param password 密码
+     */
+    void submitValidAccount(Appeal appeal, String password);
+}

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

@@ -1,20 +0,0 @@
-package com.uas.sso.service;
-
-import com.uas.sso.entity.ChangeAdminAppeal;
-
-/**
- * @author wangmh
- * @create 2018-01-16 16:36
- * @desc
- **/
-public interface ChangeAdminAppealService {
-
-    /**
-     * 提交更换管理员信息
-     *
-     * @author wangmh
-     * @date 2018/1/16 16:38
-     * @param changeAdminAppeal 更换管理员信息
-     */
-    void submit(ChangeAdminAppeal changeAdminAppeal);
-}

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

@@ -1,17 +0,0 @@
-package com.uas.sso.service;
-
-import com.uas.sso.entity.ResetPwdAppeal;
-
-/**
- * @author wangmh
- * @create 2018-01-16 13:31
- * @desc 重置密码申述service
- **/
-public interface ResetPwdAppealService {
-
-    /**
-     * 提交申述
-     * @param resetPwdAppeal 重置密码申述信息
-     */
-    void submit(ResetPwdAppeal resetPwdAppeal);
-}

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

@@ -1,17 +0,0 @@
-package com.uas.sso.service;
-
-import com.uas.sso.entity.ValidAccountAppeal;
-
-/**
- * @author wangmh
- * @create 2018-01-16 17:02
- * @desc 验证账号申述
- **/
-public interface ValidAccountAppealService {
-
-    /**
-     * 提交验证账号信息
-     * @param validAccountAppeal 验证账号信息
-     */
-    void submit(ValidAccountAppeal validAccountAppeal);
-}

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

@@ -1,9 +0,0 @@
-package com.uas.sso.service;
-
-/**
- * @author wangmh
- * @create 2018-01-16 15:50
- * @desc 验证手机号service
- **/
-public interface ValidMobileAppealService {
-}

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

@@ -0,0 +1,61 @@
+package com.uas.sso.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.sso.core.Status;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+
+/**
+ * @author wangmh
+ * @create 2018-01-20 10:42
+ * @desc 申述service实现
+ **/
+@Service
+public class AppealServiceImpl implements AppealService {
+
+    @Autowired
+    private AppealDao appealDao;
+
+    @Override
+    public void submitResetPwd(Appeal appeal, String password) {
+        // 设置默认信息
+        appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
+        appeal.setSubmitInfo(JSON.toJSONString(password));
+        appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
+        appeal.setType(Appeal.Type.RESET_PASSWORD.getDesc());
+
+        // 保存申述信息
+        appealDao.save(appeal);
+    }
+
+    @Override
+    public void submitChangeAdmin(Appeal appeal, Userspace userspace) {
+        // 设置默认信息
+        appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
+        appeal.setSubmitInfo(JSON.toJSONString(userspace));
+        appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
+        appeal.setType(Appeal.Type.CHANGE_ADMIN.getDesc());
+
+        // 保存申述信息
+        appealDao.save(appeal);
+
+    }
+
+    @Override
+    public void submitValidAccount(Appeal appeal, String password) {
+        // 设置默认信息
+        appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
+        appeal.setSubmitInfo(JSON.toJSONString(password));
+        appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
+        appeal.setType(Appeal.Type.VALID_ACCOUNT.getDesc());
+
+        // 保存申述信息
+        appealDao.save(appeal);
+    }
+}

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

@@ -1,31 +0,0 @@
-package com.uas.sso.service.impl;
-
-import com.uas.sso.core.Status;
-import com.uas.sso.dao.ChangeAdminAppealDao;
-import com.uas.sso.entity.ChangeAdminAppeal;
-import com.uas.sso.service.ChangeAdminAppealService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-
-/**
- * @author wangmh
- * @create 2018-01-16 16:39
- * @desc
- **/
-@Service
-public class ChangeAdminAppealServiceImpl implements ChangeAdminAppealService {
-
-    @Autowired
-    private ChangeAdminAppealDao changeAdminAppealDao;
-
-    @Override
-    public void submit(ChangeAdminAppeal changeAdminAppeal) {
-        changeAdminAppeal.setAuditor(null);
-        changeAdminAppeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
-        changeAdminAppeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
-
-        changeAdminAppealDao.save(changeAdminAppeal);
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.uas.sso.service.impl;
-
-import com.uas.sso.core.Status;
-import com.uas.sso.dao.ResetPwdAppealDao;
-import com.uas.sso.entity.ResetPwdAppeal;
-import com.uas.sso.service.ResetPwdAppealService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-
-/**
- * @author wangmh
- * @create 2018-01-16 13:33
- * @desc 重置密码申述service实现
- **/
-@Service
-public class ResetPwdAppealServiceImpl implements ResetPwdAppealService {
-
-    @Autowired
-    private ResetPwdAppealDao resetPwdAppealDao;
-
-    @Override
-    public void submit(ResetPwdAppeal resetPwdAppeal) {
-        resetPwdAppeal.setAuditDate(null);
-        resetPwdAppeal.setAuditor(null);
-        resetPwdAppeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
-        resetPwdAppeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
-
-        // 保存信息
-        resetPwdAppealDao.save(resetPwdAppeal);
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.uas.sso.service.impl;
-
-import com.uas.sso.core.Status;
-import com.uas.sso.dao.ValidAccountAppealDao;
-import com.uas.sso.entity.ValidAccountAppeal;
-import com.uas.sso.service.ValidAccountAppealService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-
-
-/**
- * @author wangmh
- * @create 2018-01-16 17:03
- * @desc
- **/
-@Service
-public class ValidAccountAppealServiceImpl implements ValidAccountAppealService {
-
-    @Autowired
-    private ValidAccountAppealDao validAccountAppealDao;
-
-    @Override
-    public void submit(ValidAccountAppeal validAccountAppeal) {
-        validAccountAppeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
-        validAccountAppeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
-        validAccountAppealDao.save(validAccountAppeal);
-    }
-}