WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

 import com.spice.profitmandi.common.model.ItemFeatureDataModel;
 import com.spice.profitmandi.common.model.NotificationDataModel;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.util.ExcelUtils;
 import com.spice.profitmandi.common.util.Utils;
+import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.TagRanking;
 import com.spice.profitmandi.dao.entity.dtr.NotificationData;
 import com.spice.profitmandi.dao.entity.transaction.AddWalletRequest;
 import com.spice.profitmandi.dao.enumuration.transaction.AddWalletRequestStatus;
+import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagRankingRepository;
 import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
 @Controller
-@Transactional(rollbackFor=Throwable.class)
+@Transactional(rollbackFor = Throwable.class)
 public class InventoryController {
 	private static final Logger LOGGER = LogManager.getLogger(InventoryController.class);
 	@Autowired
 	private CookiesProcessor cookiesProcessor;
 	@Autowired
 	@Qualifier("fofoInventoryService")
 	private InventoryService inventoryService;
 	@Autowired
 	private TagRankingRepository tagRankingRepository;
+	@Autowired
+	private ItemRepository itemRepository;
 	@Autowired
 	private MVCResponseSender mvcResponseSender;
 	@Value("${saholic.api.host}")
 	private String host;
 	@Value("${saholic.api.port}")
 	private int port;
 	@RequestMapping(value = "/getCurrentInventorySnapshot")
 	public String getCurrentAvailability(HttpServletRequest request,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
-			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm,
+			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
-			Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		Map<String, Object> map = inventoryService.getCurrentInventorySnapshot(loginDetails.getFofoId(), offset, limit,
 				searchTerm);
 		model.addAllAttributes(map);
 	public String getBadAvailability(HttpServletRequest request,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
 			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
 			throws ProfitMandiBusinessException {
-		if(searchTerm==null) {
+		if (searchTerm == null) {
-			searchTerm="";
+			searchTerm = "";
+		}
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		Map<String, Object> map = inventoryService.getBadInventorySnapshot(loginDetails.getFofoId(), offset, limit,
 				searchTerm);
 		model.addAllAttributes(map);
 	public String getPaginatedCurrentInventorySnapshot(HttpServletRequest request,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
 			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
 			throws ProfitMandiBusinessException {
-		if(searchTerm==null) {
+		if (searchTerm == null) {
-			searchTerm="";
+			searchTerm = "";
+		}
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		Map<String, Object> map = inventoryService.getPaginatedCurrentInventorySnapshot(loginDetails.getFofoId(),
 				offset, limit, searchTerm);
 		model.addAllAttributes(map);
 	public String getCatalog(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
 			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		if(searchTerm==null) {
+		if (searchTerm == null) {
-			searchTerm="";
+			searchTerm = "";
+		}
 		Map<String, Object> map = inventoryService.getCatalog(loginDetails.getFofoId(), offset, limit, searchTerm);
 		model.addAllAttributes(map);
 		return "catalog";
+	}
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
 			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		if(searchTerm==null) {
+		if (searchTerm == null) {
-			searchTerm="";
+			searchTerm = "";
+		}
 		Map<String, Object> map = inventoryService.getPaginatedCatalog(loginDetails.getFofoId(), offset, limit,
 				searchTerm);
 		model.addAllAttributes(map);
 		return "catalog-paginated";
 		model.addAllAttributes(map);
 		return "validate-cart";
+	}
 	@RequestMapping(value = "/grnHistory")
-	public String getGrnHistory(HttpServletRequest request,
-			@RequestParam(required = false) LocalDateTime startTime,
+	public String getGrnHistory(HttpServletRequest request, @RequestParam(required = false) LocalDateTime startTime,
 			@RequestParam(required = false) LocalDateTime endTime,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
 			@RequestParam(name = ProfitMandiConstants.PURCHASE_REFERENCE, defaultValue = "") String purchaseReference,
 			@RequestParam(name = "searchType", defaultValue = "") String searchType, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		Map<String, Object> map = inventoryService.getGrnHistory(loginDetails.getFofoId(), startTime,
+		Map<String, Object> map = inventoryService.getGrnHistory(loginDetails.getFofoId(), startTime, endTime, offset,
-				endTime, offset, limit, purchaseReference, searchType);
+				limit, purchaseReference, searchType);
 		model.addAllAttributes(map);
 		return "grn-history";
+	}
 	@RequestMapping(value = "/getPaginatedGrnHistory")
 			@RequestParam(name = "limit", defaultValue = "10") int limit,
 			@RequestParam(name = ProfitMandiConstants.PURCHASE_REFERENCE, defaultValue = "") String purchaseReference,
 			@RequestParam(name = "searchType", defaultValue = "") String searchType, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		Map<String, Object> map = inventoryService.getPaginatedGrnHistory(loginDetails.getFofoId(), startTime,
+		Map<String, Object> map = inventoryService.getPaginatedGrnHistory(loginDetails.getFofoId(), startTime, endTime,
-				endTime, offset, limit);
+				offset, limit);
 		model.addAllAttributes(map);
 		return "grn-history-paginated";
+	}
 	@RequestMapping(value = "/grnHistoryDetailByPurchaseId")
 		headers.setContentLength(byteArrayOutputStream.toByteArray().length);
 		final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
 		final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
 		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+		// return
-		// return responseSender.ok(ResponseCodeHolder.getMessage("ITM_AGNG_OK_1000"));
+		// responseSender.ok(ResponseCodeHolder.getMessage("ITM_AGNG_OK_1000"));
+	}
 	@RequestMapping(value = "/featurePanel", method = RequestMethod.GET)
+	public String FeaturePanel(HttpServletRequest request,
-	public String FeaturePanel(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset,
+			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
 		List<TagRanking> tagRanking = null;
 		long size = 0;
-		tagRanking =tagRankingRepository.selectAllTagRanking(offset, limit);
+		tagRanking = tagRankingRepository.selectAllTagRanking(offset, limit);
-		size =tagRankingRepository.selectAllCount();
+		size = tagRankingRepository.selectAllCount();
 		LOGGER.info("tagRanking" + tagRanking);
 		if (!tagRanking.isEmpty()) {
-			model.addAttribute("tagRanking", tagRanking);
+            model.addAttribute("tagRanking", tagRanking);
 			model.addAttribute("start", offset + 1);
 			model.addAttribute("size", size);
 			model.addAttribute("url", "/getPaginatedfeature");
 			if (tagRanking.size() < limit) {
+		}
 		return "feature";
+	}
 	@RequestMapping(value = "/getPaginatedfeature", method = RequestMethod.GET)
 	public String getPaginatedFeaturePanel(HttpServletRequest request,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
 		List<TagRanking> tagRanking = null;
 		long size = 0;
-		tagRanking =tagRankingRepository.selectAllTagRanking(offset, limit);
+		tagRanking = tagRankingRepository.selectAllTagRanking(offset, limit);
 		if (!tagRanking.isEmpty()) {
 			model.addAttribute("tagRanking", tagRanking);
 			model.addAttribute("start", offset + 1);
 			model.addAttribute("size", size);
 			model.addAttribute("url", "/getPaginatedfeature");
 		} else {
 			model.addAttribute("tagRanking", tagRanking);
+		}
 		return "feature-paginated";
+	}
 	@RequestMapping(value = "/itemfeature", method = RequestMethod.POST)
-	public String Itemfeature(HttpServletRequest request,
+	public String Itemfeature(HttpServletRequest request, @RequestBody ItemFeatureDataModel itemFeatureDatatModel,
-			@RequestBody  ItemFeatureDataModel itemFeatureDatatModel, Model model) throws Exception {
+			Model model) throws Exception {
 		TagRanking tagRanking = new TagRanking();
 		tagRanking.setRankPoints(itemFeatureDatatModel.getRankPoints());
 		tagRanking.setCatalogItemId(itemFeatureDatatModel.getCatalogItemId());
 		tagRanking.setFeature(itemFeatureDatatModel.getFeature());
-		LOGGER.info("tagRanking"+ tagRanking);
+		LOGGER.info("tagRanking" + tagRanking);
-        tagRankingRepository.persist(tagRanking);
+		tagRankingRepository.persist(tagRanking);
 		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 		return "response";
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java – Rev 24106 → 24123