|
|
@ -4,6 +4,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
|
import ru.ulstu.conference.model.Conference;
|
|
|
|
import ru.ulstu.conference.model.Conference;
|
|
|
|
import ru.ulstu.conference.model.ConferenceDto;
|
|
|
|
import ru.ulstu.conference.model.ConferenceDto;
|
|
|
|
import ru.ulstu.conference.model.ConferenceFilterDto;
|
|
|
|
import ru.ulstu.conference.model.ConferenceFilterDto;
|
|
|
@ -12,6 +13,7 @@ import ru.ulstu.conference.repository.ConferenceRepository;
|
|
|
|
import ru.ulstu.deadline.service.DeadlineService;
|
|
|
|
import ru.ulstu.deadline.service.DeadlineService;
|
|
|
|
import ru.ulstu.paper.model.Paper;
|
|
|
|
import ru.ulstu.paper.model.Paper;
|
|
|
|
import ru.ulstu.paper.service.PaperService;
|
|
|
|
import ru.ulstu.paper.service.PaperService;
|
|
|
|
|
|
|
|
import ru.ulstu.ping.service.PingService;
|
|
|
|
import ru.ulstu.user.model.User;
|
|
|
|
import ru.ulstu.user.model.User;
|
|
|
|
import ru.ulstu.user.service.UserService;
|
|
|
|
import ru.ulstu.user.service.UserService;
|
|
|
|
|
|
|
|
|
|
|
@ -33,17 +35,20 @@ public class ConferenceService {
|
|
|
|
private final DeadlineService deadlineService;
|
|
|
|
private final DeadlineService deadlineService;
|
|
|
|
private final PaperService paperService;
|
|
|
|
private final PaperService paperService;
|
|
|
|
private final UserService userService;
|
|
|
|
private final UserService userService;
|
|
|
|
|
|
|
|
private final PingService pingService;
|
|
|
|
|
|
|
|
|
|
|
|
public ConferenceService(ConferenceRepository conferenceRepository,
|
|
|
|
public ConferenceService(ConferenceRepository conferenceRepository,
|
|
|
|
ConferenceUserService conferenceUserService,
|
|
|
|
ConferenceUserService conferenceUserService,
|
|
|
|
DeadlineService deadlineService,
|
|
|
|
DeadlineService deadlineService,
|
|
|
|
PaperService paperService,
|
|
|
|
PaperService paperService,
|
|
|
|
UserService userService) {
|
|
|
|
UserService userService,
|
|
|
|
|
|
|
|
PingService pingService) {
|
|
|
|
this.conferenceRepository = conferenceRepository;
|
|
|
|
this.conferenceRepository = conferenceRepository;
|
|
|
|
this.conferenceUserService = conferenceUserService;
|
|
|
|
this.conferenceUserService = conferenceUserService;
|
|
|
|
this.deadlineService = deadlineService;
|
|
|
|
this.deadlineService = deadlineService;
|
|
|
|
this.paperService = paperService;
|
|
|
|
this.paperService = paperService;
|
|
|
|
this.userService = userService;
|
|
|
|
this.userService = userService;
|
|
|
|
|
|
|
|
this.pingService = pingService;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public ConferenceDto getExistConferenceById(Integer id) {
|
|
|
|
public ConferenceDto getExistConferenceById(Integer id) {
|
|
|
@ -141,7 +146,8 @@ public class ConferenceService {
|
|
|
|
conference.setTitle(conferenceDto.getTitle());
|
|
|
|
conference.setTitle(conferenceDto.getTitle());
|
|
|
|
conference.setDescription(conferenceDto.getDescription());
|
|
|
|
conference.setDescription(conferenceDto.getDescription());
|
|
|
|
conference.setUrl(conferenceDto.getUrl());
|
|
|
|
conference.setUrl(conferenceDto.getUrl());
|
|
|
|
conference.setPing(0);
|
|
|
|
Integer pingCount = conferenceDto.getPing() - conference.getPing(); // for notification
|
|
|
|
|
|
|
|
conference.setPing(conference.getPing());
|
|
|
|
conference.setBeginDate(conferenceDto.getBeginDate());
|
|
|
|
conference.setBeginDate(conferenceDto.getBeginDate());
|
|
|
|
conference.setEndDate(conferenceDto.getEndDate());
|
|
|
|
conference.setEndDate(conferenceDto.getEndDate());
|
|
|
|
conference.setPapers(conferenceDto.getPapers());
|
|
|
|
conference.setPapers(conferenceDto.getPapers());
|
|
|
@ -173,4 +179,35 @@ public class ConferenceService {
|
|
|
|
public List<Conference> findAllActive() {
|
|
|
|
public List<Conference> findAllActive() {
|
|
|
|
return conferenceRepository.findAllActive(new Date());
|
|
|
|
return conferenceRepository.findAllActive(new Date());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void ping(ConferenceDto conferenceDto) throws IOException {
|
|
|
|
|
|
|
|
pingService.addPing(findOne(conferenceDto.getId()));
|
|
|
|
|
|
|
|
// conferenceDto.setPing(conferenceDto.getPing() + 1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Conference findOne(Integer conferenceId) {
|
|
|
|
|
|
|
|
return conferenceRepository.findOne(conferenceId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setChartData(ModelMap modelMap) {
|
|
|
|
|
|
|
|
//first, add the regional sales
|
|
|
|
|
|
|
|
Integer northeastSales = 17089;
|
|
|
|
|
|
|
|
Integer westSales = 10603;
|
|
|
|
|
|
|
|
Integer midwestSales = 5223;
|
|
|
|
|
|
|
|
Integer southSales = 10111;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
modelMap.addAttribute("northeastSales", northeastSales);
|
|
|
|
|
|
|
|
modelMap.addAttribute("southSales", southSales);
|
|
|
|
|
|
|
|
modelMap.addAttribute("midwestSales", midwestSales);
|
|
|
|
|
|
|
|
modelMap.addAttribute("westSales", westSales);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//now add sales by lure type
|
|
|
|
|
|
|
|
List<Integer> inshoreSales = Arrays.asList(4074, 3455, 4112);
|
|
|
|
|
|
|
|
List<Integer> nearshoreSales = Arrays.asList(3222, 3011, 3788);
|
|
|
|
|
|
|
|
List<Integer> offshoreSales = Arrays.asList(7811, 7098, 6455);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
modelMap.addAttribute("inshoreSales", inshoreSales);
|
|
|
|
|
|
|
|
modelMap.addAttribute("nearshoreSales", nearshoreSales);
|
|
|
|
|
|
|
|
modelMap.addAttribute("offshoreSales", offshoreSales);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|