Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature]:新增获取权限列表接口及单元测试 #386

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.xiaojusurvey.engine.common.enums;

import lombok.Getter;

/**
* @author zhongbo
*/

@Getter
public enum SurveyPermission {
SURVEY_CONF_MANAGE("SURVEY_CONF_MANAGE"),
SURVEY_RESPONSE_MANAGE("SURVEY_RESPONSE_MANAGE"),
SURVEY_COOPERATION_MANAGE("SURVEY_COOPERATION_MANAGE");

private final String permissionDescription;

SurveyPermission(String permissionDescription) {
this.permissionDescription = permissionDescription;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public UserVo register(UserParam userParam) {
user.setUsername(userParam.getUsername());
user.setPassword(AuthUtil.hash256(userParam.getPassword()));
mongoRepository.save(user);
userParam.setId(user.getId());
return createTokenAndDeleteCaptcha(userParam);
}

Expand All @@ -88,7 +89,8 @@ public UserVo login(UserParam userParam) {
//验证码
checkCaptchaIsCorrect(userParam.getCaptchaId(), userParam.getCaptcha());
//用户验证
userService.loadUserByUsernameAndPassword(userParam.getUsername(), userParam.getPassword());
User user = userService.loadUserByUsernameAndPassword(userParam.getUsername(), userParam.getPassword());
userParam.setId(user.getId());
//生成token
return createTokenAndDeleteCaptcha(userParam);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.xiaojusurvey.engine.core.survey;

import com.xiaojusurvey.engine.common.entity.survey.SurveyMeta;
import com.xiaojusurvey.engine.core.reslut.IdResult;

public interface CollaboratorService {
IdResult createSurvey(SurveyMeta surveyMeta);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.xiaojusurvey.engine.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaojusurvey.engine.common.enums.SurveyPermission;
import com.xiaojusurvey.engine.common.rpc.RpcResult;
import com.xiaojusurvey.engine.common.util.RpcResultUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
* @author zhongbo
*/
@RequestMapping("/api/collaborator")
@RestController
@Slf4j
public class CollaboratorController {

/**
* 获取权限列表
*/
@GetMapping("/getPermissionList")
public RpcResult<JSONArray> getPermissionList() {
JSONArray jsonArray = new JSONArray();
JSONObject surveyConfManage = new JSONObject();
surveyConfManage.put("name", "问卷配置管理");
surveyConfManage.put("value", SurveyPermission.SURVEY_CONF_MANAGE);

JSONObject surveyResManage = new JSONObject();
surveyResManage.put("name", "问卷分析管理");
surveyResManage.put("value", SurveyPermission.SURVEY_RESPONSE_MANAGE);

JSONObject surveyCoManage = new JSONObject();
surveyCoManage.put("name", "协作者管理");
surveyCoManage.put("value", SurveyPermission.SURVEY_COOPERATION_MANAGE);

jsonArray.add(surveyConfManage);
jsonArray.add(surveyResManage);
jsonArray.add(surveyCoManage);

return RpcResultUtil.createSuccessResult(jsonArray);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.xiaojusurvey.engine.controller;

import com.alibaba.fastjson.JSONArray;
import com.xiaojusurvey.engine.common.entity.user.User;
import com.xiaojusurvey.engine.common.rpc.RpcResult;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import javax.servlet.http.HttpServletRequest;

@RunWith(SpringJUnit4ClassRunner.class)
public class CollaboratorControllerTest {
@InjectMocks
CollaboratorController collaboratorController;

private HttpServletRequest httpServletRequest;

@Before
public void initBean() {
httpServletRequest = new MockHttpServletRequest();
User user = new User();
user.setId("123");
user.setUsername("maple");
httpServletRequest.setAttribute("user", user);
}

@Test
public void getPermissionList() {
RpcResult<JSONArray> permissionListResult = collaboratorController.getPermissionList();
Assert.assertTrue(permissionListResult.getSuccess());
Assert.assertEquals(new Integer(200), permissionListResult.getCode());
}
}