添加认证日志

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

@@ -2,9 +2,11 @@ package com.uas.sso.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.entity.User;
+import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.service.UserService;
 import com.uas.sso.service.UserspaceService;
+import com.uas.sso.support.SystemSession;
 import com.uas.sso.util.FastjsonUtils;
 import com.uas.sso.util.FileUrl;
 import com.uas.sso.util.HttpUtils;
@@ -50,7 +52,7 @@ public class ValidController extends BaseController {
      * @return
      * @throws Exception
      */
-    @RequestMapping(value = "/userspace/submit", method = RequestMethod.POST)
+    @RequestMapping(value = "/userspace/submit")
     public ModelMap submitSpaceInfo(Userspace userspace, @RequestBody MultipartFile businessImage) throws Exception {
         // 获取参数
         String spaceName = userspace.getSpaceName();
@@ -58,6 +60,10 @@ public class ValidController extends BaseController {
         String corporation = userspace.getCorporation();
         String regAddress = userspace.getRegAddress();
 
+        // 获取申请者
+        UserAccount loginUser = SystemSession.getUserAccount();
+        User submitter = userService.findOne(loginUser.getUserUU());
+
         // 参数空校验
         Map<String, String> params = new HashMap<>(4);
         params.put("企业名", spaceName);
@@ -82,7 +88,7 @@ public class ValidController extends BaseController {
         }
 
         // 将企业添加到待认证
-        userspaceService.submitValidInfo(userspace);
+        userspaceService.submitValidInfo(userspace, submitter);
 
         return success();
     }
@@ -97,7 +103,7 @@ public class ValidController extends BaseController {
      * @return
      * @throws Exception
      */
-    @RequestMapping(value = "/user/identity/submit", method = RequestMethod.POST)
+    @RequestMapping(value = "/user/identity/submit")
     public ModelMap submitUserIdentityInfo(String realName, String idCard) throws Exception {
         // 参数空校验
         Map<String, String> params = new HashMap<>(2);

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

@@ -0,0 +1,138 @@
+package com.uas.sso.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * @author wangmh
+ * @create 2018-01-17 19:42
+ * @desc 用户申请日志
+ **/
+@Entity
+@Table(name = "sso$user$valid")
+public class UserValid implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @Id
+    @Column(name = "_id")
+    @SequenceGenerator(name="sso$user$log_gen", sequenceName="sso$user$log_seq", allocationSize=1)
+    @GeneratedValue(strategy= GenerationType.IDENTITY, generator="sso$user$log_gen")
+    private Long id;
+
+    /**
+     * 提交者uu号
+     */
+    @Column(name = "submitter_uu", nullable = false)
+    private Long submitterUU;
+
+    /**
+     * 提交信息
+     */
+    @Column(name = "submitter_info", nullable = false, length = 1000)
+    private String submitInfo;
+
+    /**
+     * 提交日期
+     */
+    @Column(name = "submit_date", nullable = false)
+    private Timestamp submitDate;
+
+    /**
+     * 审核状态
+     */
+    @Column(name = "valid_code", nullable = false)
+    private Short validCode;
+
+    /**
+     * 审核人
+     */
+    @Column(name = "auditor", nullable = false)
+    private String auditor;
+
+    /**
+     * 审核日期
+     */
+    @Column(name = "valid_date", nullable = false)
+    private String validDate;
+
+    /**
+     * 审核不通过原因
+     */
+    @Column(name = "invalid_reason", nullable = false, length = 1000)
+    private String invalidReason;
+
+    public UserValid() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSubmitterUU() {
+        return submitterUU;
+    }
+
+    public void setSubmitterUU(Long submitterUU) {
+        this.submitterUU = submitterUU;
+    }
+
+    public String getSubmitInfo() {
+        return submitInfo;
+    }
+
+    public void setSubmitInfo(String submitInfo) {
+        this.submitInfo = submitInfo;
+    }
+
+    public Timestamp getSubmitDate() {
+        return submitDate;
+    }
+
+    public void setSubmitDate(Timestamp submitDate) {
+        this.submitDate = submitDate;
+    }
+
+    public Short getValidCode() {
+        return validCode;
+    }
+
+    public void setValidCode(Short validCode) {
+        this.validCode = validCode;
+    }
+
+    public String getAuditor() {
+        return auditor;
+    }
+
+    public void setAuditor(String auditor) {
+        this.auditor = auditor;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+
+    public String getInvalidReason() {
+        return invalidReason;
+    }
+
+    public void setInvalidReason(String invalidReason) {
+        this.invalidReason = invalidReason;
+    }
+}

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

@@ -0,0 +1,152 @@
+package com.uas.sso.entity;
+
+import com.alibaba.fastjson.JSON;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * @author wangmh
+ * @create 2018-01-17 16:28
+ * @desc 企业信息认证日志
+ **/
+@Entity
+@Table(name = "sso$us$valid")
+public class UserspaceValid implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @Id
+    @Column(name = "_id")
+    @SequenceGenerator(name="sso$user$log_gen", sequenceName="sso$user$log_seq", allocationSize=1)
+    @GeneratedValue(strategy=GenerationType.IDENTITY, generator="sso$user$log_gen")
+    private Long id;
+
+    /**
+     * 提交日期
+     */
+    @Column(name = "submit_date", nullable = false)
+    private Timestamp submitDate;
+
+    /**
+     * 认证企业uu号
+     */
+    @Column(name = "space_uu", nullable = false)
+    private Long spaceUU;
+
+    /**
+     * 提交者uu号
+     */
+    @Column(name = "submitter_uu", nullable = false)
+    private Long submitterUU;
+
+    /**
+     * 提交信息
+     */
+    @Column(name = "submitter_info", nullable = false, length = 2000)
+    private String submitInfo;
+
+    /**
+     * 审核状态
+     */
+    @Column(name = "valid_code", nullable = false)
+    private Short validCode;
+
+    /**
+     * 审核人
+     */
+    @Column(name = "auditor", nullable = false)
+    private String auditor;
+
+    /**
+     * 审核日期
+     */
+    @Column(name = "valid_date", nullable = false)
+    private String validDate;
+
+    /**
+     * 审核不通过原因
+     */
+    @Column(name = "invalid_reason", nullable = false)
+    private String invalidReason;
+
+    public UserspaceValid() {
+    }
+
+    public UserspaceValid(Userspace userspace, User submitter) {
+        this.setSpaceUU(userspace.getSpaceUU());
+        this.setSubmitInfo(JSON.toJSONString(userspace));
+        this.setSubmitterUU(submitter.getUserUU());
+    }
+
+    public Timestamp getSubmitDate() {
+        return submitDate;
+    }
+
+    public void setSubmitDate(Timestamp submitDate) {
+        this.submitDate = submitDate;
+    }
+
+    public Long getSpaceUU() {
+        return spaceUU;
+    }
+
+    public void setSpaceUU(Long spaceUU) {
+        this.spaceUU = spaceUU;
+    }
+
+    public Long getSubmitterUU() {
+        return submitterUU;
+    }
+
+    public void setSubmitterUU(Long submitterUU) {
+        this.submitterUU = submitterUU;
+    }
+
+    public String getSubmitInfo() {
+        return submitInfo;
+    }
+
+    public void setSubmitInfo(String submitInfo) {
+        this.submitInfo = submitInfo;
+    }
+
+    public Short getValidCode() {
+        return validCode;
+    }
+
+    public void setValidCode(Short validCode) {
+        this.validCode = validCode;
+    }
+
+    public String getAuditor() {
+        return auditor;
+    }
+
+    public void setAuditor(String auditor) {
+        this.auditor = auditor;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+
+    public String getInvalidReason() {
+        return invalidReason;
+    }
+
+    public void setInvalidReason(String invalidReason) {
+        this.invalidReason = invalidReason;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.uas.sso.service;
+
+import com.uas.sso.entity.User;
+
+/**
+ * @author wangmh
+ * @create 2018-01-17 19:37
+ * @desc 用户审核日志service
+ **/
+public interface UserValidService {
+
+    /**
+     * 用户提交审核
+     * @param user 用户提交的信息
+     * @param submitterUU 提交信息的用户uu号
+     */
+    void submitValid(User user, Long submitterUU);
+}

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

@@ -63,8 +63,9 @@ public interface UserspaceService {
      * @author wangmh
      * @date 2018/1/11 14:23
      * @param userspace 企业信息
+     * @param submitter 申请人
      */
-    void submitValidInfo(Userspace userspace);
+    void submitValidInfo(Userspace userspace, User submitter);
 
     /**
      * 根据企业uu号查找企业信息

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

@@ -1,5 +1,6 @@
 package com.uas.sso.service;
 
+import com.uas.sso.entity.User;
 import com.uas.sso.entity.Userspace;
 
 /**
@@ -15,6 +16,7 @@ public interface UserspaceValidService {
      * @author wangmh
      * @date 2018/1/11 14:09
      * @param userspace 企业信息
+     * @param submitter 提交申请信息人
      */
-    void submitValid(Userspace userspace);
+    void submitValid(Userspace userspace, User submitter);
 }

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

@@ -9,11 +9,11 @@ import com.uas.sso.dao.UserRecordDao;
 import com.uas.sso.entity.User;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.UserRecord;
-import com.uas.sso.entity.Userspace;
 import com.uas.sso.exception.VisibleError;
 import com.uas.sso.logging.LoggerManager;
 import com.uas.sso.logging.UserBufferedLogger;
 import com.uas.sso.service.UserService;
+import com.uas.sso.service.UserValidService;
 import com.uas.sso.support.SystemSession;
 import com.uas.sso.util.AccountTypeUtils;
 import com.uas.sso.util.BeanUtil;
@@ -42,6 +42,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private UserRecordDao userRecordDao;
 
+    @Autowired
+    private UserValidService userValidService;
+
     private UserBufferedLogger userLog = LoggerManager.getLogger(UserBufferedLogger.class);
 
     @Override
@@ -267,7 +270,8 @@ public class UserServiceImpl implements UserService {
         // 保存用户信息
         userDao.save(oldUser);
 
-        // TODO 保存日志
+        // 保存日志
+        userValidService.submitValid(user, oldUser.getUserUU());
     }
 
     @Override

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

@@ -0,0 +1,37 @@
+package com.uas.sso.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.sso.core.Status;
+import com.uas.sso.dao.UserValidDao;
+import com.uas.sso.entity.User;
+import com.uas.sso.entity.UserValid;
+import com.uas.sso.service.UserValidService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+
+/**
+ * @author wangmh
+ * @create 2018-01-17 19:39
+ * @desc
+ **/
+@Service
+public class UserValidServiceImpl implements UserValidService {
+
+    @Autowired
+    private UserValidDao userValidDao;
+
+    @Override
+    public void submitValid(User user, Long submitterUU) {
+        // 初始化提交日志
+        UserValid userValid = new UserValid();
+        userValid.setSubmitDate(new Timestamp(System.currentTimeMillis()));
+        userValid.setValidCode((short) Status.TO_BE_CERTIFIED.getCode());
+        userValid.setSubmitInfo(JSON.toJSONString(user));
+        userValid.setSubmitterUU(submitterUU);
+
+        // 保存提交日志
+        userValidDao.save(userValid);
+    }
+}

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

@@ -7,6 +7,7 @@ import com.uas.sso.entity.Userspace;
 import com.uas.sso.exception.VisibleError;
 import com.uas.sso.service.UserService;
 import com.uas.sso.service.UserspaceService;
+import com.uas.sso.service.UserspaceValidService;
 import com.uas.sso.util.BeanUtil;
 import com.uas.sso.util.ChineseUtils;
 import com.uas.sso.util.StringUtil;
@@ -32,6 +33,9 @@ public class UserspaceServiceImpl implements UserspaceService {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private UserspaceValidService userspaceValidService;
+
     /**
      * 企业初始uu号
      */
@@ -156,7 +160,7 @@ public class UserspaceServiceImpl implements UserspaceService {
     }
 
     @Override
-    public void submitValidInfo(Userspace userspace) {
+    public void submitValidInfo(Userspace userspace, User submitter) {
         // 校验企业名和营业执照是否被认证
         boolean isValid = spaceNameIsValid(userspace.getSpaceName());
         if (isValid) {
@@ -179,8 +183,8 @@ public class UserspaceServiceImpl implements UserspaceService {
         // 保存企业信息
         userspaceDao.save(oldUserspace);
 
-        // TODO 保存日志
-
+        // 添加提交申请日志
+        userspaceValidService.submitValid(oldUserspace, submitter);
     }
 
     @Override

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

@@ -1,9 +1,16 @@
 package com.uas.sso.service.impl;
 
+import com.uas.sso.core.Status;
+import com.uas.sso.dao.UserspaceValidDao;
+import com.uas.sso.entity.User;
 import com.uas.sso.entity.Userspace;
+import com.uas.sso.entity.UserspaceValid;
 import com.uas.sso.service.UserspaceValidService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
+
 /**
  * @author wangmh
  * @create 2018-01-11 14:10
@@ -12,8 +19,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserspaceValidServiceImpl implements UserspaceValidService {
 
+    @Autowired
+    private UserspaceValidDao userspaceValidDao;
 
     @Override
-    public void submitValid(Userspace userspace) {
+    public void submitValid(Userspace userspace, User submitter) {
+        UserspaceValid userspaceValid = new UserspaceValid(userspace, submitter);
+        userspaceValid.setValidCode((short) Status.TO_BE_CERTIFIED.getCode());
+        userspaceValid.setSubmitDate(new Timestamp(System.currentTimeMillis()));
+        userspaceValidDao.save(userspaceValid);
     }
 }

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

@@ -1,8 +1,9 @@
-package com.uas.sso.service;
+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;