Subversion Repositories SmartDukaan

Rev

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

Rev 30337 Rev 30343
Line 63... Line 63...
63 
 
 63 
 
64 
 
 64 
 
65 
		List<ImeiActivationTimestampModel> imeisActivationList = activatedImeiRepository
 65 
		List<ImeiActivationTimestampModel> imeisActivationList = activatedImeiRepository
66 
				.selectImeiActivationByBrand("Vivo");
 66 
				.selectImeiActivationByBrand("Vivo");
67 
 
 67 
 
- 
 
 68 
		LOGGER.info("imeisActivationList = {}", imeisActivationList);
- 
 
 69 
 
68 
/*		List<ImeiActivationTimestampModel> imeisActivationList = new ArrayList<>();
 70 
/*		List<ImeiActivationTimestampModel> imeisActivationList = new ArrayList<>();
69 
		imeisActivationList.add(new ImeiActivationTimestampModel("862495052177812", null));
 71 
		imeisActivationList.add(new ImeiActivationTimestampModel("862495052177812", null));
70 
		imeisActivationList.add(new ImeiActivationTimestampModel("862495052181434", null));
 72 
		imeisActivationList.add(new ImeiActivationTimestampModel("862495052181434", null));
71 
		imeisActivationList.add(new ImeiActivationTimestampModel("860009056563950", null));*/
 73 
		imeisActivationList.add(new ImeiActivationTimestampModel("860009056563950", null));*/
72 
 
 74 
 
Line 122... Line 124...
122 
		}
 124 
		}
123 
 
 125 
 
124 
		JSONObject imeiQueryDto = data.getJSONObject("imeiQueryDto");
 126 
		JSONObject imeiQueryDto = data.getJSONObject("imeiQueryDto");
125 
		LOGGER.info("imeiQueryDto - {}", imeiQueryDto);
 127 
		LOGGER.info("imeiQueryDto - {}", imeiQueryDto);
126 
		String dueTimeString = imeiQueryDto.getString("dueTime");
 128 
		String dueTimeString = imeiQueryDto.getString("dueTime");
127 
		if (dueTimeString.equals("")) return;
 - 
 
128 
 
 129 
 
129 
		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
 - 
 
130 
		String dueTimeSplit = dueTimeString.split(" ")[0];
 - 
 
131 
		if (!StringUtils.isEmpty(dueTimeSplit)) {
 130 
		if (!StringUtils.isEmpty(dueTimeString)) {
132 
			LocalDate dateTime = LocalDate.parse(dueTimeSplit, formatter);
 - 
 
133 
			ActivatedImei activatedImei = activatedImeiRepository.selectBySerialNumber(imei);
 131 
			ActivatedImei activatedImei = activatedImeiRepository.selectBySerialNumber(imei);
- 
 
 132 
 
- 
 
 133 
			if (dueTimeString.equals("")) return;
- 
 
 134 
 
134 
			if (activatedImei == null) {
 135 
			if (activatedImei == null) {
135 
				LOGGER.info("Adding activation for - {}", imei);
 136 
				LOGGER.info("Adding activation for - {}", imei);
136 
				activatedImei = new ActivatedImei();
 137 
				activatedImei = new ActivatedImei();
137 
				activatedImei.setActivationTimestamp(dateTime.atStartOfDay().minusYears(1));
 - 
 
138 
				activatedImei.setSerialNumber(imei);
 138 
				activatedImei.setSerialNumber(imei);
139 
				activatedImei.setCreateTimestamp(LocalDateTime.now());
 - 
 
140 
				activatedImeiRepository.persist(activatedImei);
 139 
				activatedImeiRepository.persist(activatedImei);
141 
 
 140 
 
142 
			} else {
 - 
 
143 
				LOGGER.info("Updating activation for - {}", imei);
 - 
 
144 
				activatedImei.setActivationTimestamp(dateTime.atStartOfDay().minusYears(1));
 - 
 
145 
 
 - 
 
146 
			}
 141 
			}
- 
 
 142 
			activatedImei.setCreateTimestamp(LocalDateTime.now());
- 
 
 143 
			if (dueTimeString.equals("")) return;
- 
 
 144 
 
- 
 
 145 
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
- 
 
 146 
			dueTimeString = dueTimeString.split(" ")[0];
- 
 
 147 
			LocalDate dueDate = LocalDate.parse(dueTimeString, formatter);
- 
 
 148 
			activatedImei.setActivationTimestamp(dueDate.atStartOfDay().minusYears(1));
- 
 
 149 
 
147 
			LOGGER.info("activatedImei" + activatedImei);
 150 
			LOGGER.info("activatedImei" + activatedImei);
148 
			LOGGER.info("vivoImeiStatusModel" + dateTime.atStartOfDay());
 151 
			LOGGER.info("vivoImeiStatusModel" + dueDate.atStartOfDay());
149 
 
 152 
 
150 
		}
 153 
		}
151 
 
 154 
 
152 
 
 155 
 
153 
	}
 156 
	}