Merge branch 'feature-V2.0' into 'PrivateReleaseOfXC'

增加众测调用查看用户详情的接口

See merge request crowd-2019/crowd-test-service-backend!197

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestTaskCommand.java

@@ -2,6 +2,7 @@ package com.mooctest.crowd.site.command;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
 import com.mooctest.crowd.domain.domainobject.EndPoint;
+import com.mooctest.crowd.domain.exception.BaseException;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
@@ -75,31 +76,10 @@ public class CrowdTestTaskCommand {
         crowdTestTask.setFixedPrice(fixedPrice);
         crowdTestTask.setRequirementFile(requirementFile);
         crowdTestTask.setParticipantCount(participantCount);
+        if(endPoint.getThreePageUrl() == ""){
+            throw new BaseException("测试大纲不能为空！");
+        }
         crowdTestTask.setEndPoint(endPoint);
-//        if(endPoint.getServerCode() != null && endPoint.getServerCode() != ""){
-//            String serverCode = endPoint.getServerCode();
-//            try {
-//                String decodeUrl;
-//                decodeUrl = URLDecoder.decode(serverCode,"UTF-8");
-//                byte[] decodedBytes = Base64.getDecoder().decode(decodeUrl);
-//                String url = new String(decodedBytes);
-//
-//                if(url.contains("examId_")){
-//                    endPoint.setExamId(url.split("examId_")[1].split("/")[0]);
-//                    url = url.replaceFirst("examId_","");
-//                }
-//                if(url.contains("caseId_")){
-//                    endPoint.setCaseId(url.split("caseId_")[1].split("/")[0]);
-//                    url = url.replaceFirst("caseId_","");
-//                }
-//                endPoint.setUrl(url);
-//                crowdTestTask.setEndPoint(endPoint);
-//            }catch (IllegalArgumentException e){
-//                throw new CrowdTestEndPointException();
-//            }catch (UnsupportedEncodingException e){
-//                e.printStackTrace();
-//            }
-//        }
         return crowdTestTask;
     }
 

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

@@ -70,6 +70,11 @@ public class UserController extends BaseController{
         return userService.getUser(userId);
     }
 
+    @RequestMapping(value = "/user/info/{userId}", method = RequestMethod.GET)
+    public UserVO getUserInfo(@PathVariable Long userId) {
+        return userService.getUserInfo(userId);
+    }
+
     /**
      * 获取用户头像接口
      * @param userId

site/src/main/java/com/mooctest/crowd/site/data/vo/EndPointVO.java

@@ -16,6 +16,8 @@ public class EndPointVO {
     private String token;
     private int collaborativeType;
     private String threePageUrl;
+    private String caseId;
+    private String examId;
 
     public EndPointVO(EndPoint endPoint){
         BeanUtils.copyProperties(endPoint, this);

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

@@ -72,6 +72,8 @@ public interface ViewMediator {
 
     UserDTO renderUser(User user);
 
+    UserVO renderUserInfo(User user);
+
     List<EvaluationAgencyVO> renderAgencyList();
 
     List<TestUserOrAgencyVO> renderAgencyAndTestUserList();

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

@@ -941,6 +941,17 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
+    public UserVO renderUserInfo(User user) {
+        UserVO userVO = new UserVO();
+        userVO.setName(user.getName());
+        userVO.setProvince(user.getProvince());
+        userVO.setCity(user.getCity());
+        log.info("众测调用：");
+        log.info(userVO.toString());
+        return userVO;
+    }
+
+    @Override
     public List<RegionalManagerVO> renderRegionManagerList() {
         List<Long> userIdList = userRepo.getUserIdListByRoleName(RoleType.REGIONAL_MANAGER.getName());
         return userIdList.stream().map(userId -> new RegionalManagerVO(userId, userRepo.getByIDJustInfo(userId).getName())).collect(Collectors.toList());

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

@@ -330,6 +330,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         params.add("fileName", threePageUrl.substring(threePageUrl.lastIndexOf("/")+1));
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+        log.info("调用众测端新建众测任务");
         ResponseEntity<String> responseEntity = restTemplate.postForEntity
                 (reviewServiceBaseUrl  + "/addCrowdTaskDefault", params, String.class);
         if (responseEntity.getStatusCode().equals(HttpStatus.OK)){