Subversion Repositories SmartDukaan

Rev

Rev 24026 | Rev 31238 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 24026 Rev 30426
Line 41... Line 41...
41 
	@RequestMapping(value = "/sendMessagingPanel", method = RequestMethod.GET)
 41 
	@RequestMapping(value = "/sendMessagingPanel", method = RequestMethod.GET)
42 
	public String sendMessagingPanel(HttpServletRequest request, Model model) {
 42 
	public String sendMessagingPanel(HttpServletRequest request, Model model) {
43 
 
 43 
 
44 
		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
 44 
		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
45 
				.collect(Collectors.toList());
 45 
				.collect(Collectors.toList());
- 
 
 46 
 
46 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 47 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 48 
 
- 
 
 49 
		Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 50 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 51 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
47 
		model.addAttribute("customRetailersMap", customRetailersMap);
 52 
		model.addAttribute("customRetailersMap", customRetailersMap);
48 
		return "send-message";
 53 
		return "send-message";
49 
	}
 54 
	}
50 
 
 55 
 
51 
	@RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
 56 
	@RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
52 
	public String sendMessage(HttpServletRequest request, @RequestBody SendMessageModel sendMessageModel, Model model)
 57 
	public String sendMessage(HttpServletRequest request, @RequestBody SendMessageModel sendMessageModel, Model model)
53 
			throws Exception {
 58 
			throws Exception {
54 
 
 59 
 
55 
		List<Integer> retailerIds = sendMessageModel.getUserIds();
 60 
		List<Integer> retailerIds = sendMessageModel.getUserIds();
56 
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(retailerIds);
 61 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 62 
 
- 
 
 63 
		Map<Integer, CustomRetailer> customRetailersMap = retailerIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 64 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 65 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
57 
 
 66 
 
58 
		for (Integer retailerId : retailerIds) {
 67 
		for (Integer retailerId : retailerIds) {
59 
 
 68 
 
60 
			CustomRetailer customRetailer = customRetailersMap.get(retailerId);
 69 
			CustomRetailer customRetailer = customRetailersMap.get(retailerId);
61 
			String phone = customRetailer.getMobileNumber();
 70 
			String phone = customRetailer.getMobileNumber();