Subversion Repositories SmartDukaan

Rev

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

Rev 29440 Rev 29598
Line 179... Line 179...
179 
		String fileNames = file.getOriginalFilename();
 179 
		String fileNames = file.getOriginalFilename();
180 
 
 180 
 
181 
		LOGGER.info("fileName" + fileName);
 181 
		LOGGER.info("fileName" + fileName);
182 
		LOGGER.info("fileNames" + fileNames);
 182 
		LOGGER.info("fileNames" + fileNames);
183 
 
 183 
 
184 
		List<CSVRecord> records = this.readFile(file);
 184 
		List<CSVRecord> records = FileUtil.readFile(file);
185 
 
 185 
 
186 
		List<BilledOrderListModel> billedOrderList = new ArrayList<BilledOrderListModel>();
 186 
		List<BilledOrderListModel> billedOrderList = new ArrayList<BilledOrderListModel>();
187 
		for (CSVRecord record : records) {
 187 
		for (CSVRecord record : records) {
188 
			BilledOrderListModel blm = createBilleOrder(record);
 188 
			BilledOrderListModel blm = createBilleOrder(record);
189 
			billedOrderList.add(blm);
 189 
			billedOrderList.add(blm);
Line 407... Line 407...
407 
 
 407 
 
408 
		String fileNames = file.getOriginalFilename();
 408 
		String fileNames = file.getOriginalFilename();
409 
 
 409 
 
410 
		LOGGER.info("fileName" + fileName);
 410 
		LOGGER.info("fileName" + fileName);
411 
		LOGGER.info("fileNames" + fileNames);
 411 
		LOGGER.info("fileNames" + fileNames);
412 
		List<CSVRecord> records = this.readFile(file);
 412 
		List<CSVRecord> records = FileUtil.readFile(file);
413 
 
 413 
 
414 
		List<ProviderTatModel> providerTatList = new ArrayList<ProviderTatModel>();
 414 
		List<ProviderTatModel> providerTatList = new ArrayList<ProviderTatModel>();
415 
		for (CSVRecord record : records) {
 415 
		for (CSVRecord record : records) {
416 
			ProviderTatModel sgr = createProviderTat(record);
 416 
			ProviderTatModel sgr = createProviderTat(record);
417 
			providerTatList.add(sgr);
 417 
			providerTatList.add(sgr);
Line 576... Line 576...
576 
 
 576 
 
577 
	@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)
 577 
	@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)
578 
	public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,
 578 
	public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,
579 
			@RequestPart MultipartFile file) throws Throwable {
 579 
			@RequestPart MultipartFile file) throws Throwable {
580 
 
 580 
 
581 
		List<CSVRecord> records = this.readFile(file);
 581 
		List<CSVRecord> records = FileUtil.readFile(file);
582 
 
 582 
 
583 
		List<DelayDayModel> delayDayList = new ArrayList<>();
 583 
		List<DelayDayModel> delayDayList = new ArrayList<>();
584 
		for (CSVRecord record : records) {
 584 
		for (CSVRecord record : records) {
585 
			DelayDayModel ddm = createDelayDay(record);
 585 
			DelayDayModel ddm = createDelayDay(record);
586 
			delayDayList.add(ddm);
 586 
			delayDayList.add(ddm);
Line 681... Line 681...
681 
 
 681 
 
682 
	@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)
 682 
	@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)
683 
	public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,
 683 
	public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,
684 
			@RequestPart MultipartFile file) throws Throwable {
 684 
			@RequestPart MultipartFile file) throws Throwable {
685 
 
 685 
 
686 
		List<CSVRecord> records = this.readFile(file);
 686 
		List<CSVRecord> records = FileUtil.readFile(file);
687 
 
 687 
 
688 
		List<MarkDeliveredModel> deliveredList = new ArrayList<>();
 688 
		List<MarkDeliveredModel> deliveredList = new ArrayList<>();
689 
		for (CSVRecord record : records) {
 689 
		for (CSVRecord record : records) {
690 
			MarkDeliveredModel ddm = createMarkDeliveredModel(record);
 690 
			MarkDeliveredModel ddm = createMarkDeliveredModel(record);
691 
			deliveredList.add(ddm);
 691 
			deliveredList.add(ddm);
Line 757... Line 757...
757 
		mdm.setDeliveredOn(dateTime.atStartOfDay());
 757 
		mdm.setDeliveredOn(dateTime.atStartOfDay());
758 
		mdm.setDeliveredBy(record.get(2));
 758 
		mdm.setDeliveredBy(record.get(2));
759 
		return mdm;
 759 
		return mdm;
760 
	}
 760 
	}
761 
 
 761 
 
762 
	private List<CSVRecord> readFile(MultipartFile file) throws IOException, ProfitMandiBusinessException {
 - 
 
763 
 
 - 
 
764 
		CSVParser parser = new CSVParser(new InputStreamReader(file.getInputStream()), CSVFormat.DEFAULT);
 - 
 
765 
		List<CSVRecord> records = parser.getRecords();
 - 
 
766 
		LOGGER.info("records" + records);
 - 
 
767 
		LOGGER.info("parser" + parser);
 - 
 
768 
		if (records.size() < 2) {
 - 
 
769 
			parser.close();
 - 
 
770 
			throw new ProfitMandiBusinessException("Uploaded File", "", "No records Found");
 - 
 
771 
		}
 - 
 
772 
		// Remove header
 - 
 
773 
		records.remove(0);
 - 
 
774 
		parser.close();
 - 
 
775 
		return records;
 - 
 
776 
 
 - 
 
777 
	}
 - 
 
778 
 
 - 
 
779 
	@RequestMapping(value = "/delayBillingTemplate", method = RequestMethod.GET)
 762 
	@RequestMapping(value = "/delayBillingTemplate", method = RequestMethod.GET)
780 
	public ResponseEntity<?> delayBillingTemplate(HttpServletRequest request) throws Exception {
 763 
	public ResponseEntity<?> delayBillingTemplate(HttpServletRequest request) throws Exception {
781 
		List<List<?>> rows = new ArrayList<>();
 764 
		List<List<?>> rows = new ArrayList<>();
782 
 
 765 
 
783 
		rows.add(Arrays.asList("-",
 766 
		rows.add(Arrays.asList("-",
Line 809... Line 792...
809 
		String fileNames = file.getOriginalFilename();
 792 
		String fileNames = file.getOriginalFilename();
810 
 
 793 
 
811 
		LOGGER.info("fileName" + fileName);
 794 
		LOGGER.info("fileName" + fileName);
812 
		LOGGER.info("fileNames" + fileNames);
 795 
		LOGGER.info("fileNames" + fileNames);
813 
 
 796 
 
814 
		List<CSVRecord> records = this.readFile(file);
 797 
		List<CSVRecord> records = FileUtil.readFile(file);
815 
 
 798 
 
816 
		List<DelayBillingModel> delayBillingModel = new ArrayList<DelayBillingModel>();
 799 
		List<DelayBillingModel> delayBillingModel = new ArrayList<DelayBillingModel>();
817 
		for (CSVRecord record : records) {
 800 
		for (CSVRecord record : records) {
818 
			DelayBillingModel dbm = new DelayBillingModel();
 801 
			DelayBillingModel dbm = new DelayBillingModel();
819 
			dbm.setInvoiceNumber(record.get(0));
 802 
			dbm.setInvoiceNumber(record.get(0));