|
@@ -55,7 +55,7 @@ import java.util.stream.Collectors;
|
|
@Service
|
|
@Service
|
|
public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
@Autowired
|
|
@Autowired
|
|
- private CrowdTestProjectDao projectDao;
|
|
|
|
|
|
+ private CrowdTestProjectDao projectDao;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private UserToRoleDao userToRoleDao;
|
|
private UserToRoleDao userToRoleDao;
|
|
@@ -90,6 +90,12 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
@Autowired
|
|
@Autowired
|
|
private ThemeSchedulerService themeSchedulerService;
|
|
private ThemeSchedulerService themeSchedulerService;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 众测广场首页展示的项目
|
|
|
|
+ *
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<CrowdTestProjectVO> findIndexProject() {
|
|
public List<CrowdTestProjectVO> findIndexProject() {
|
|
List<CrowdTestProjectVO> authingList = new ArrayList<>();
|
|
List<CrowdTestProjectVO> authingList = new ArrayList<>();
|
|
@@ -101,13 +107,20 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
return authingList;
|
|
return authingList;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 更多热门项目
|
|
|
|
+ *
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<CrowdTestProjectVO> findAllMoreHotProjects() {
|
|
public List<CrowdTestProjectVO> findAllMoreHotProjects() {
|
|
return viewMediator.hotCrowdTestProjects();
|
|
return viewMediator.hotCrowdTestProjects();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<CrowdProjectVO> findAllMoreHotProjectList(String keyword){
|
|
|
|
|
|
+ public List<CrowdProjectVO> findAllMoreHotProjectList(String keyword) {
|
|
List<CrowdProjectVO> crowdProjectVOS = projectDao.findAllHotProject().stream().map(crowdTestProjectPO -> {
|
|
List<CrowdProjectVO> crowdProjectVOS = projectDao.findAllHotProject().stream().map(crowdTestProjectPO -> {
|
|
CrowdTestProject crowdTestProject = new CrowdTestProject();
|
|
CrowdTestProject crowdTestProject = new CrowdTestProject();
|
|
BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
|
|
BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
|
|
@@ -116,8 +129,8 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
crowdTestProject.setApplicationType(applicationName);
|
|
crowdTestProject.setApplicationType(applicationName);
|
|
return new CrowdProjectVO(crowdTestProject);
|
|
return new CrowdProjectVO(crowdTestProject);
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
- if(keyword != null && keyword != ""){
|
|
|
|
- System.out.println("keyword " + keyword);
|
|
|
|
|
|
+ if (keyword != null && keyword != "") {
|
|
|
|
+ System.out.println("keyword " + keyword);
|
|
crowdProjectVOS = crowdProjectVOS.stream().filter(crowdProjectVO -> crowdProjectVO.getName().contains(keyword)).collect(Collectors.toList());
|
|
crowdProjectVOS = crowdProjectVOS.stream().filter(crowdProjectVO -> crowdProjectVO.getName().contains(keyword)).collect(Collectors.toList());
|
|
}
|
|
}
|
|
return crowdProjectVOS;
|
|
return crowdProjectVOS;
|
|
@@ -125,7 +138,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<CrowdTestProjectVO> findByNameLike(String name) {
|
|
public List<CrowdTestProjectVO> findByNameLike(String name) {
|
|
- if (name == null || name.trim().equals("")){
|
|
|
|
|
|
+ if (name == null || name.trim().equals("")) {
|
|
System.out.println("进来进来");
|
|
System.out.println("进来进来");
|
|
return viewMediator.AllByPage();
|
|
return viewMediator.AllByPage();
|
|
}
|
|
}
|
|
@@ -164,9 +177,9 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
public ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command, long userId) {
|
|
public ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command, long userId) {
|
|
// 获取用户所有角色
|
|
// 获取用户所有角色
|
|
List<UserToRolePO> userToRole = userToRoleDao.findByUserId(userId);
|
|
List<UserToRolePO> userToRole = userToRoleDao.findByUserId(userId);
|
|
- if(userToRole.stream().anyMatch(userToRolePO -> userToRolePO.getRoleId().equals(RoleType.PARTY_USER.getId()) ||
|
|
|
|
|
|
+ if (userToRole.stream().anyMatch(userToRolePO -> userToRolePO.getRoleId().equals(RoleType.PARTY_USER.getId()) ||
|
|
userToRolePO.getRoleId().equals(RoleType.PARTY_AGENCY.getId()) || userToRolePO.getRoleId().equals(RoleType.AGENCY.getId()) ||
|
|
userToRolePO.getRoleId().equals(RoleType.PARTY_AGENCY.getId()) || userToRolePO.getRoleId().equals(RoleType.AGENCY.getId()) ||
|
|
- userToRolePO.getRoleId().equals(RoleType.REGIONAL_MANAGER.getId()) || userToRolePO.getRoleId().equals(RoleType.SYSTEM_ADMIN.getId()))){
|
|
|
|
|
|
+ userToRolePO.getRoleId().equals(RoleType.REGIONAL_MANAGER.getId()) || userToRolePO.getRoleId().equals(RoleType.SYSTEM_ADMIN.getId()))) {
|
|
CrowdTestProject project = command.toCrowdProject();
|
|
CrowdTestProject project = command.toCrowdProject();
|
|
project.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
|
|
project.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
|
|
log.info("\n" + project.toString() + "\n");
|
|
log.info("\n" + project.toString() + "\n");
|
|
@@ -180,7 +193,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
|
|
projectDetailsDTO.setProjectDetails(new CrowdProjectVO(project));
|
|
projectDetailsDTO.setProjectDetails(new CrowdProjectVO(project));
|
|
themeSchedulerService.createNewThemeScheduler(project);
|
|
themeSchedulerService.createNewThemeScheduler(project);
|
|
return projectDetailsDTO;
|
|
return projectDetailsDTO;
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
throw new BaseException("用户权限不足无法创建项目,需要认证为发包用户或者发包机构!");
|
|
throw new BaseException("用户权限不足无法创建项目,需要认证为发包用户或者发包机构!");
|
|
}
|
|
}
|
|
}
|
|
}
|