Subversion Repositories SmartDukaan

Rev

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

Rev 25640 Rev 25650
Line 17... Line 17...
17 
import org.springframework.transaction.annotation.Transactional;
 17 
import org.springframework.transaction.annotation.Transactional;
18 
import org.springframework.ui.Model;
 18 
import org.springframework.ui.Model;
19 
import org.springframework.web.bind.annotation.RequestBody;
 19 
import org.springframework.web.bind.annotation.RequestBody;
20 
import org.springframework.web.bind.annotation.RequestMapping;
 20 
import org.springframework.web.bind.annotation.RequestMapping;
21 
import org.springframework.web.bind.annotation.RequestMethod;
 21 
import org.springframework.web.bind.annotation.RequestMethod;
- 
 
 22 
import org.springframework.web.bind.annotation.RequestParam;
22 
 
 23 
 
23 
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 24 
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
24 
import com.spice.profitmandi.common.model.CustomRetailer;
 25 
import com.spice.profitmandi.common.model.CustomRetailer;
- 
 
 26 
import com.spice.profitmandi.common.model.ProfitMandiConstants;
- 
 
 27 
import com.spice.profitmandi.dao.entity.catalog.Item;
25 
import com.spice.profitmandi.dao.entity.fofo.CustomerAddress;
 28 
import com.spice.profitmandi.dao.entity.fofo.CustomerAddress;
26 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
 29 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
27 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
 30 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
28 
import com.spice.profitmandi.dao.entity.fofo.HygieneData;
 31 
import com.spice.profitmandi.dao.entity.fofo.HygieneData;
29 
import com.spice.profitmandi.dao.repository.catalog.HygieneDataModel;
 32 
import com.spice.profitmandi.dao.repository.catalog.HygieneDataModel;
- 
 
 33 
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
30 
import com.spice.profitmandi.dao.repository.fofo.CustomerAddressRepository;
 34 
import com.spice.profitmandi.dao.repository.fofo.CustomerAddressRepository;
31 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
 35 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
32 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
 36 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
33 
import com.spice.profitmandi.dao.repository.fofo.HygieneDataRepository;
 37 
import com.spice.profitmandi.dao.repository.fofo.HygieneDataRepository;
34 
import com.spice.profitmandi.dao.repository.user.AddressRepository;
 38 
import com.spice.profitmandi.dao.repository.user.AddressRepository;
Line 54... Line 58...
54 
 
 58 
 
55 
	@Autowired
 59 
	@Autowired
56 
	private HygieneDataRepository hygieneDataRepository;
 60 
	private HygieneDataRepository hygieneDataRepository;
57 
 
 61 
 
58 
	@Autowired
 62 
	@Autowired
- 
 
 63 
	private ItemRepository itemRepository;
- 
 
 64 
	@Autowired
59 
	private MVCResponseSender mvcResponseSender;
 65 
	private MVCResponseSender mvcResponseSender;
60 
	private static final Logger LOGGER = LogManager.getLogger(HygieneController.class);
 66 
	private static final Logger LOGGER = LogManager.getLogger(HygieneController.class);
61 
 
 67 
 
62 
	@RequestMapping(value = "/getHygieneData", method = RequestMethod.GET)
 68 
	@RequestMapping(value = "/getHygieneData", method = RequestMethod.GET)
63 
	public String getHygieneData(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 69 
	public String getHygieneData(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
64 
		List<Integer> OrderIds = hygieneDataRepository.selectByDisposedTimestamp().stream().map(x -> x.getOrderId())
 70 
		List<Integer> OrderIds = hygieneDataRepository.selectByDisposedTimestamp().stream().map(x -> x.getOrderId())
65 
				.collect(Collectors.toList());
 71 
				.collect(Collectors.toList());
66 
		List<HygieneData> hygieneData = hygieneDataRepository.selectByDisposedTimestamp();
 72 
		List<HygieneData> hygieneData = hygieneDataRepository.selectByDisposedTimestamp();
67 
		List<FofoOrder> fofoOrders = this.getfofoOrderByOrderId(hygieneData);
 73 
		Map<Integer, FofoOrder> fofoOrder = this.getfofoOrderByOrderId(hygieneData);
68 
 
 74 
 
69 
		Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrders);
 75 
		Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(hygieneData);
70 
 
 76 
 
71 
		Map<Integer, CustomRetailer> partnerAddress = this.getAddressByFofoOrder(fofoOrders);
 77 
		Map<Integer, CustomRetailer> partnerAddress = this.getPartnerAddressByFofoOrder(hygieneData);
72 
		model.addAttribute("hygieneData", hygieneData);
 78 
		model.addAttribute("hygieneData", hygieneData);
73 
		model.addAttribute("fofoOrders", fofoOrders);
 79 
		model.addAttribute("fofoOrder", fofoOrder);
74 
		model.addAttribute("partnerAddress", partnerAddress);
 80 
		model.addAttribute("partnerAddress", partnerAddress);
75 
		model.addAttribute("customerAddress", customerAddress);
 81 
		model.addAttribute("customerAddress", customerAddress);
76 
 
 82 
 
77 
		LOGGER.info("hygieneData" + OrderIds);
 83 
		LOGGER.info("hygieneData" + OrderIds);
78 
		LOGGER.info("fofoOrder" + fofoOrders);
 84 
		LOGGER.info("fofoOrder" + fofoOrder);
79 
		LOGGER.info("customRetailer" + partnerAddress);
 85 
		LOGGER.info("customRetailer" + partnerAddress);
80 
		LOGGER.info("customerAddress" + customerAddress);
 86 
		LOGGER.info("customerAddress" + customerAddress);
81 
 
 87 
 
82 
		return "hygiene";
 88 
		return "hygiene";
83 
	}
 89 
	}
84 
 
 90 
 
85 
	private List<FofoOrder> getfofoOrderByOrderId(List<HygieneData> hygienesData) throws ProfitMandiBusinessException {
 91 
	private Map<Integer, FofoOrder> getfofoOrderByOrderId(List<HygieneData> hygienesData)
- 
 
 92 
			throws ProfitMandiBusinessException {
86 
		List<FofoOrder> fofoOrders = new ArrayList<>();
 93 
		Map<Integer, FofoOrder> fofoOrders = new HashMap<>();
87 
		for (HygieneData hygieneData : hygienesData) {
 94 
		for (HygieneData hygieneData : hygienesData) {
88 
			FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(hygieneData.getOrderId());
 95 
			FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(hygieneData.getOrderId());
- 
 
 96 
 
89 
			fofoOrders.add(fofoOrder);
 97 
			fofoOrders.put(hygieneData.getOrderId(), fofoOrder);
90 
 
 98 
 
91 
		}
 99 
		}
92 
		return fofoOrders;
 100 
		return fofoOrders;
93 
	}
 101 
	}
94 
 
 102 
 
95 
	private Map<Integer, CustomRetailer> getAddressByFofoOrder(List<FofoOrder> fofoOrders)
 103 
	private Map<Integer, CustomRetailer> getPartnerAddressByFofoOrder(List<HygieneData> hygieneData)
96 
			throws ProfitMandiBusinessException {
 104 
			throws ProfitMandiBusinessException {
97 
		Map<Integer, CustomRetailer> addressMap = new HashMap<>();
 105 
		Map<Integer, CustomRetailer> addressMap = new HashMap<>();
98 
		for (FofoOrder fofoOrder : fofoOrders) {
 106 
		for (HygieneData hd : hygieneData) {
- 
 
 107 
 
- 
 
 108 
			FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(hd.getOrderId());
99 
			CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoOrder.getFofoId());
 109 
			CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoOrder.getFofoId());
100 
			addressMap.put(fofoOrder.getFofoId(), customRetailer);
 110 
			addressMap.put(hd.getFofoId(), customRetailer);
101 
 
 111 
 
102 
		}
 112 
		}
103 
		return addressMap;
 113 
		return addressMap;
104 
	}
 114 
	}
105 
 
 115 
 
106 
	private Map<Integer, CustomerAddress> getCustomerAddressByFofoOrder(List<FofoOrder> fofoOrders)
 116 
	private Map<Integer, CustomerAddress> getCustomerAddressByFofoOrder(List<HygieneData> hygieneData)
107 
			throws ProfitMandiBusinessException {
 117 
			throws ProfitMandiBusinessException {
108 
		Map<Integer, CustomerAddress> customerAddressMap = new HashMap<>();
 118 
		Map<Integer, CustomerAddress> customerAddressMap = new HashMap<>();
109 
		for (FofoOrder fofoOrder : fofoOrders) {
 119 
		for (HygieneData hd : hygieneData) {
- 
 
 120 
			FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(hd.getOrderId());
110 
			CustomerAddress ca = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
 121 
			CustomerAddress ca = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
111 
 
 122 
 
112 
			customerAddressMap.put(fofoOrder.getCustomerAddressId(), ca);
 123 
			customerAddressMap.put(hd.getFofoId(), ca);
113 
		}
 124 
		}
114 
		return customerAddressMap;
 125 
		return customerAddressMap;
115 
	}
 126 
	}
116 
 
 127 
 
117 
	@RequestMapping(value = "/getFetchHygieneData", method = RequestMethod.GET)
 128 
	@RequestMapping(value = "/getFetchHygieneData", method = RequestMethod.GET)
Line 155... Line 166...
155 
 
 166 
 
156 
		model.addAttribute("fofoOrder", fofoOrder);
 167 
		model.addAttribute("fofoOrder", fofoOrder);
157 
		model.addAttribute("customRetailer", customRetailer);
 168 
		model.addAttribute("customRetailer", customRetailer);
158 
		model.addAttribute("customerAddress", customerAddress);
 169 
		model.addAttribute("customerAddress", customerAddress);
159 
		model.addAttribute("fofoOrderItems", fofoOrderItems);
 170 
		model.addAttribute("fofoOrderItems", fofoOrderItems);
- 
 
 171 
 
- 
 
 172 
		return "hygiene-modal";
- 
 
 173 
	}
- 
 
 174 
 
- 
 
 175 
	@RequestMapping(value = "/getFetchHygieneDataByOrderId", method = RequestMethod.GET)
- 
 
 176 
	public String getFetchHygieneDataByOrderId(HttpServletRequest request, @RequestParam int orderId, Model model)
- 
 
 177 
			throws Exception {
- 
 
 178 
 
- 
 
 179 
		FofoOrder fofoOrder = null;
- 
 
 180 
		CustomRetailer customRetailer = null;
- 
 
 181 
		CustomerAddress customerAddress = null;
- 
 
 182 
		List<FofoOrderItem> fofoOrderItems = null;
- 
 
 183 
 
- 
 
 184 
		HygieneData hygiene = hygieneDataRepository.selectById(orderId);
- 
 
 185 
 
- 
 
 186 
		fofoOrder = fofoOrderRepository.selectByOrderId(hygiene.getOrderId());
- 
 
 187 
		customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
- 
 
 188 
 
- 
 
 189 
		customRetailer = retailerService.getFofoRetailer(fofoOrder.getFofoId());
- 
 
 190 
 
- 
 
 191 
		fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
- 
 
 192 
 
- 
 
 193 
		LOGGER.info("hygieneData" + hygiene);
- 
 
 194 
		LOGGER.info("fofoOrder" + fofoOrder);
- 
 
 195 
		LOGGER.info("customRetailer" + customRetailer);
- 
 
 196 
		LOGGER.info("customerAddress" + customerAddress);
- 
 
 197 
 
- 
 
 198 
		model.addAttribute("fofoOrder", fofoOrder);
- 
 
 199 
		model.addAttribute("customRetailer", customRetailer);
- 
 
 200 
		model.addAttribute("customerAddress", customerAddress);
- 
 
 201 
		model.addAttribute("fofoOrderItems", fofoOrderItems);
160 
 
 202 
 
161 
		return "hygiene-modal";
 203 
		return "hygiene-modal";
162 
	}
 204 
	}
163 
 
 205 
 
164 
	@RequestMapping(value = "/hygieneData", method = RequestMethod.POST)
 206 
	@RequestMapping(value = "/hygieneData", method = RequestMethod.POST)