Merge branch 'feature-V2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-backend into feature-V2.0

site/src/main/java/com/mooctest/crowd/site/controller/PersonalDataController.java

@@ -11,8 +11,6 @@ import org.codehaus.jettison.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.UnsupportedEncodingException;
-
 @RestController
 @RequestMapping("/api/personal")
 public class PersonalDataController {
@@ -36,7 +34,7 @@ public class PersonalDataController {
     }
 
     @RequestMapping(value = "/addqualification/{userId:\\d+}", method = RequestMethod.POST)
-    public QualificationDTO addQualification(@PathVariable("userId") long userId, @RequestBody QualificationVO qualificationVO) throws UnsupportedEncodingException {
+    public QualificationDTO addQualification(@PathVariable("userId") long userId, @RequestBody QualificationVO qualificationVO){
         return  personalDataService.addQualification(userId,qualificationVO);
     }
 

site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -14,7 +14,6 @@ import com.mooctest.crowd.site.data.vo.*;
 import org.codehaus.jettison.json.JSONException;
 import org.springframework.data.domain.Pageable;
 
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 /**
@@ -88,7 +87,7 @@ public interface ViewMediator {
 
     QualificationDTO getQualification(long userId);
 
-    QualificationDTO addQualification(long userId, QualificationVO qualificationVO) throws UnsupportedEncodingException;
+    QualificationDTO addQualification(long userId, QualificationVO qualificationVO);
 
     QualificationDTO updateQualification(long id, long userId, QualificationVO qualificationVO);
 

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -33,7 +33,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1134,10 +1134,15 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public QualificationDTO addQualification(long userId, QualificationVO qualificationVO) throws UnsupportedEncodingException {
-        if (qualificationVO.getNumber().getBytes("UTF-8").length != qualificationVO.getNumber().length()) {
+    public QualificationDTO addQualification(long userId, QualificationVO qualificationVO){
+        String regex = "^[a-z0-9A-Z]+$";
+        if (!qualificationVO.getNumber().matches(regex)) {
             throw new HttpBadRequestException("请输入正确的证书编号");
         }
+        Date now = new Date();
+        if(qualificationVO.getTime().after(now)){
+            throw new HttpBadRequestException("请输入正确的发证时间");
+        }
         QualificationPO qualificationPO = new QualificationPO();
         List<QualificationPO> qualificationPOList = qualificationDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
         for (int i = 0; i < qualificationPOList.size(); i++) {

site/src/main/java/com/mooctest/crowd/site/service/PersonalDataService.java

@@ -8,7 +8,6 @@ import com.mooctest.crowd.site.data.vo.QualificationVO;
 import com.mooctest.crowd.site.data.vo.UserVO;
 import org.codehaus.jettison.json.JSONException;
 
-import java.io.UnsupportedEncodingException;
 
 
 public interface PersonalDataService {
@@ -18,7 +17,7 @@ public interface PersonalDataService {
 
     QualificationDTO getQualification(long userId);
 
-    QualificationDTO addQualification(long userId,QualificationVO qualificationVO) throws UnsupportedEncodingException;
+    QualificationDTO addQualification(long userId,QualificationVO qualificationVO);
 
     QualificationDTO updateQualification(long id,long userId,QualificationVO qualificationVO);
 

site/src/main/java/com/mooctest/crowd/site/service/impl/PersonalDataServiceImpl.java

@@ -12,8 +12,6 @@ import org.codehaus.jettison.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.UnsupportedEncodingException;
-
 @Service
 public class PersonalDataServiceImpl implements PersonalDataService {
 
@@ -36,7 +34,7 @@ public class PersonalDataServiceImpl implements PersonalDataService {
     }
 
     @Override
-    public QualificationDTO addQualification(long userId,QualificationVO qualificationVO) throws UnsupportedEncodingException {
+    public QualificationDTO addQualification(long userId,QualificationVO qualificationVO){
         return viewMediator.addQualification(userId,qualificationVO);
     }