Merge branch 'move-to-jdk11' into try-vue
# Conflicts: # src/main/java/ru/ulstu/configuration/MvcConfiguration.java # src/main/java/ru/ulstu/core/controller/AdviceController.java # src/main/java/ru/ulstu/paper/controller/PaperRestController.java # src/main/resources/static/papers/paper-status.vue # src/main/resources/templates/activate.html # src/main/resources/templates/admin/commits.html # src/main/resources/templates/admin/userList.html # src/main/resources/templates/admin/userSessions.html # src/main/resources/templates/conferences/conference.html # src/main/resources/templates/conferences/conferences.html # src/main/resources/templates/conferences/dashboard.html # src/main/resources/templates/default.html # src/main/resources/templates/error/403.html # src/main/resources/templates/error/404.html # src/main/resources/templates/error/500.html # src/main/resources/templates/grants/dashboard.html # src/main/resources/templates/grants/fragments/grantDashboardFragment.html # src/main/resources/templates/grants/fragments/grantLineFragment.html # src/main/resources/templates/grants/fragments/grantStatusFragment.html # src/main/resources/templates/grants/grant.html # src/main/resources/templates/grants/grants.html # src/main/resources/templates/index.html # src/main/resources/templates/load.html # src/main/resources/templates/login.html # src/main/resources/templates/papers/dashboard.html # src/main/resources/templates/papers/fragments/paperDashboardFragment.html # src/main/resources/templates/papers/fragments/paperLineFragment.html # src/main/resources/templates/papers/paper.html # src/main/resources/templates/papers/papers.html # src/main/resources/templates/projects/dashboard.html # src/main/resources/templates/projects/fragments/projectStatusFragment.html # src/main/resources/templates/projects/project.html # src/main/resources/templates/projects/projects.html # src/main/resources/templates/reset.html # src/main/resources/templates/resetRequest.html # src/main/resources/templates/timeline.htmlpull/244/head
Anton Romanov
5 years ago
commit
e7b84b766f
@ -0,0 +1,21 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import org.springframework.security.core.AuthenticationException;
|
||||
import org.springframework.security.web.authentication.AuthenticationFailureHandler;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.ulstu.user.error.UserBlockedException;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
|
||||
@Component
|
||||
public class AuthFailureHandler implements AuthenticationFailureHandler {
|
||||
@Override
|
||||
public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
|
||||
AuthenticationException ex) throws IOException {
|
||||
if (ex.getClass() == UserBlockedException.class) {
|
||||
response.sendRedirect("/users/block");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.timeline.model.Event;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface EventSource {
|
||||
List<Deadline> getDeadlines();
|
||||
|
||||
String getTitle();
|
||||
|
||||
List<User> getRecipients();
|
||||
|
||||
void addObjectToEvent(Event event);
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class TreeDto {
|
||||
private Integer id;
|
||||
private String text;
|
||||
private List<TreeDto> children = new ArrayList<>();
|
||||
|
||||
public TreeDto() {
|
||||
}
|
||||
|
||||
public <T extends TreeEntity> TreeDto(TreeEntity item) {
|
||||
this.text = item.toString();
|
||||
this.id = item.getId();
|
||||
}
|
||||
|
||||
public TreeDto(String rootName) {
|
||||
this.text = rootName;
|
||||
}
|
||||
|
||||
public String getText() {
|
||||
return text;
|
||||
}
|
||||
|
||||
public List<TreeDto> getChildren() {
|
||||
return children;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TreeEntity<T> {
|
||||
|
||||
Integer getId();
|
||||
|
||||
List<T> getChildren();
|
||||
|
||||
void setChildren(List<T> children);
|
||||
|
||||
T getParent();
|
||||
|
||||
void setParent(T parent);
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
public interface UserActivity {
|
||||
String getTitle();
|
||||
|
||||
Set<User> getActivityUsers();
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
public interface UserContainer {
|
||||
Set<User> getUsers();
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
package ru.ulstu.core.util;
|
||||
|
||||
public class NumberUtils {
|
||||
public static Double ceil(Double number) {
|
||||
if (number == null) {
|
||||
return 0.0;
|
||||
}
|
||||
return Double.valueOf(Math.ceil(number));
|
||||
}
|
||||
|
||||
public static Double round(Double number) {
|
||||
if (number == null) {
|
||||
return 0.0;
|
||||
}
|
||||
return Double.valueOf(Math.ceil(number * 100)) / 100;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package ru.ulstu.grant.controller;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import ru.ulstu.configuration.Constants;
|
||||
import ru.ulstu.grant.service.GrantService;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
||||
|
||||
import static ru.ulstu.paper.controller.PaperRestController.URL;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(URL)
|
||||
public class GrantRestController {
|
||||
public static final String URL = Constants.API_1_0 + "grants";
|
||||
|
||||
private final GrantService grantService;
|
||||
|
||||
public GrantRestController(GrantService grantService) {
|
||||
this.grantService = grantService;
|
||||
}
|
||||
|
||||
@GetMapping("/grab")
|
||||
public void grab() throws IOException, ParseException {
|
||||
grantService.createFromKias();
|
||||
}
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
package ru.ulstu.odinexample.controller;
|
||||
|
||||
public class OdinExampleController {
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
package ru.ulstu.odinexample.model;
|
||||
|
||||
public class OdinExampleDto {
|
||||
}
|
||||
@ -1,103 +0,0 @@
|
||||
package ru.ulstu.odinexample.model;
|
||||
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.odin.model.annotation.OdinCaption;
|
||||
import ru.ulstu.odin.model.annotation.OdinDate;
|
||||
import ru.ulstu.odin.model.annotation.OdinNumeric;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.util.Date;
|
||||
|
||||
public class OdinExampleListDto {
|
||||
@OdinCaption("instant")
|
||||
@OdinDate(type = OdinDate.OdinDateType.DATETIME)
|
||||
private Instant instant;
|
||||
@OdinCaption("date")
|
||||
private Date date;
|
||||
@OdinCaption("localdate")
|
||||
private LocalDate localDate;
|
||||
@OdinCaption("localtime")
|
||||
@OdinDate(type = OdinDate.OdinDateType.TIME)
|
||||
private LocalTime localTime;
|
||||
@OdinCaption("localdatetime")
|
||||
@OdinDate(type = OdinDate.OdinDateType.DATETIME)
|
||||
private LocalDateTime localDateTime;
|
||||
@OdinCaption("int")
|
||||
private int intval;
|
||||
@OdinCaption("int+settings")
|
||||
@OdinNumeric(precision = 5, scale = 2)
|
||||
private int intvalset;
|
||||
@OdinCaption("float")
|
||||
private float floatval;
|
||||
@OdinCaption("double")
|
||||
private double aDouble;
|
||||
@OdinCaption("double+set")
|
||||
@OdinNumeric(precision = 5, scale = 3)
|
||||
private double aDoubles;
|
||||
@OdinCaption("int+positive")
|
||||
@OdinNumeric(positiveOnly = true, scale = 2)
|
||||
private int invalpos;
|
||||
|
||||
public OdinExampleListDto() {
|
||||
this.instant = Instant.now();
|
||||
this.date = new Date();
|
||||
this.localDate = LocalDate.now();
|
||||
this.localTime = LocalTime.now();
|
||||
this.localDateTime = LocalDateTime.now();
|
||||
intval = -134;
|
||||
intvalset = 1343423232;
|
||||
floatval = 2323.44F;
|
||||
aDouble = -232323.43434;
|
||||
aDoubles = 0.456456456;
|
||||
invalpos = -23232323;
|
||||
}
|
||||
|
||||
|
||||
public Date getInstant() {
|
||||
return DateUtils.instantToDate(instant);
|
||||
}
|
||||
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public Date getLocalDate() {
|
||||
return DateUtils.localDateToDate(localDate);
|
||||
}
|
||||
|
||||
public Date getLocalTime() {
|
||||
return DateUtils.localTimeToDate(localTime);
|
||||
}
|
||||
|
||||
public Date getLocalDateTime() {
|
||||
return DateUtils.localDateTimeToDate(localDateTime);
|
||||
}
|
||||
|
||||
public int getIntval() {
|
||||
return intval;
|
||||
}
|
||||
|
||||
public int getIntvalset() {
|
||||
return intvalset;
|
||||
}
|
||||
|
||||
public float getFloatval() {
|
||||
return floatval;
|
||||
}
|
||||
|
||||
public double getaDouble() {
|
||||
return aDouble;
|
||||
}
|
||||
|
||||
public double getaDoubles() {
|
||||
return aDoubles;
|
||||
}
|
||||
|
||||
public int getInvalpos() {
|
||||
return invalpos;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
package ru.ulstu.odinexample.service;
|
||||
|
||||
public class OdinExampleService {
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package ru.ulstu.paper.error;
|
||||
|
||||
public class PaperConferenceRelationExistException extends RuntimeException {
|
||||
public PaperConferenceRelationExistException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package ru.ulstu.ping.model;
|
||||
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PingInfo {
|
||||
private User user;
|
||||
private List<Ping> pings = new ArrayList<>();
|
||||
|
||||
public PingInfo(User user) {
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
public User getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
public void setUser(User user) {
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
public List<Ping> getPings() {
|
||||
return pings;
|
||||
}
|
||||
|
||||
public void setPings(List<Ping> pings) {
|
||||
this.pings = pings;
|
||||
}
|
||||
|
||||
public void addPing(Ping ping) {
|
||||
this.pings.add(ping);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package ru.ulstu.ping.service;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.core.model.UserActivity;
|
||||
import ru.ulstu.ping.model.Ping;
|
||||
import ru.ulstu.ping.model.PingInfo;
|
||||
import ru.ulstu.ping.repository.PingRepository;
|
||||
import ru.ulstu.user.model.User;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@Service
|
||||
public class PingScheduler {
|
||||
private final Logger log = LoggerFactory.getLogger(PingScheduler.class);
|
||||
private final PingRepository pingRepository;
|
||||
private final MailService mailService;
|
||||
private final static String PING_MAIL_SUBJECT = "Ping статистика";
|
||||
|
||||
public PingScheduler(PingRepository pingRepository, MailService mailService) {
|
||||
this.pingRepository = pingRepository;
|
||||
this.mailService = mailService;
|
||||
}
|
||||
|
||||
|
||||
@Scheduled(cron = "0 0 * * 1 ?")
|
||||
public void sendPingsInfo() {
|
||||
log.debug("Scheduler.sendPingsInfo started");
|
||||
|
||||
List<PingInfo> pingInfos = new ArrayList<>();
|
||||
|
||||
for (Ping ping : pingRepository.findByDate(java.sql.Date.valueOf(LocalDate.now().minusWeeks(1)))) {
|
||||
UserActivity pingActivity = ping.getActivity();
|
||||
Set<User> users = pingActivity.getActivityUsers();
|
||||
|
||||
for (User user : users) {
|
||||
PingInfo userPing = pingInfos.stream().filter(u -> u.getUser() == user).findFirst().orElse(null);
|
||||
if (userPing == null) {
|
||||
userPing = new PingInfo(user);
|
||||
pingInfos.add(userPing);
|
||||
}
|
||||
userPing.addPing(ping);
|
||||
}
|
||||
}
|
||||
|
||||
for (PingInfo pingInfo : pingInfos) {
|
||||
mailService.sendEmailFromTemplate(ImmutableMap.of("pings", pingInfo.getPings()),
|
||||
pingInfo.getUser(), "pingsInfoWeekEmail", PING_MAIL_SUBJECT);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package ru.ulstu.timeline.model;
|
||||
|
||||
public class EventStatusDto {
|
||||
private final String id;
|
||||
private final String name;
|
||||
|
||||
public EventStatusDto(Event.EventStatus status) {
|
||||
this.id = status.name();
|
||||
this.name = status.getName();
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package ru.ulstu.user.error;
|
||||
|
||||
import org.springframework.security.core.AuthenticationException;
|
||||
|
||||
public class UserBlockedException extends AuthenticationException {
|
||||
public UserBlockedException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package ru.ulstu.user.model;
|
||||
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.utils.timetable.model.Lesson;
|
||||
|
||||
public class UserInfoNow {
|
||||
private Lesson lesson;
|
||||
private Conference conference;
|
||||
private User user;
|
||||
private boolean isOnline;
|
||||
|
||||
public UserInfoNow(Lesson lesson, Conference conference, User user, boolean isOnline) {
|
||||
this.lesson = lesson;
|
||||
this.conference = conference;
|
||||
this.user = user;
|
||||
this.isOnline = isOnline;
|
||||
}
|
||||
|
||||
public Lesson getLesson() {
|
||||
return lesson;
|
||||
}
|
||||
|
||||
public void setLesson(Lesson lesson) {
|
||||
this.lesson = lesson;
|
||||
}
|
||||
|
||||
public Conference getConference() {
|
||||
return conference;
|
||||
}
|
||||
|
||||
public void setConference(Conference conference) {
|
||||
this.conference = conference;
|
||||
}
|
||||
|
||||
public User getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
public void setUser(User user) {
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
public boolean isOnline() {
|
||||
return isOnline;
|
||||
}
|
||||
|
||||
public void setOnline(boolean online) {
|
||||
isOnline = online;
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue