|
|
@@ -11,6 +11,7 @@ import com.seecoder.dataanalysis.data.entity.eval.User;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Optional;
|
|
|
|
|
|
@@ -31,6 +32,21 @@ public class DisplayServiceImpl implements DisplayService {
|
|
|
return users;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<User> getAllDevcloudUsers(){
|
|
|
+ List<DevcloudUser> devcloudUsers = devcloudUserDao.findAll();
|
|
|
+ List<User> users = new ArrayList<>();
|
|
|
+ for(DevcloudUser devcloudUser:devcloudUsers){
|
|
|
+ Optional<User> result = userDao.findById(devcloudUser.getUserId());
|
|
|
+ if(!result.isPresent()){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ User user = userDao.findByUserId(devcloudUser.getUserId());
|
|
|
+ users.add(user);
|
|
|
+ }
|
|
|
+ return users;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public FormatGroup getGroupAnalysisById(Integer user_id){
|
|
|
Optional<DevcloudUser> result = devcloudUserDao.findById(user_id);
|