Commit f0fc337801f65d3e5a8707a326de7d6854018df2

Authored by Carlos Alberto
1 parent 7b523894
Exists in master

Novos métodos UtilDate

cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
... ... @@ -1355,6 +1355,13 @@ public class UtilDate {
1355 1355 return dateFormat.format(date.getTime());
1356 1356 }
1357 1357  
  1358 + public static String calendarToJson(final Calendar date) {
  1359 + SimpleDateFormat dateFormat = new SimpleDateFormat(
  1360 + "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
  1361 +
  1362 + return dateFormat.format(date.getTime());
  1363 + }
  1364 +
1358 1365 public static Date jsonToDate(final String value) {
1359 1366 Date dataReturn = null;
1360 1367 try {
... ... @@ -1383,18 +1390,18 @@ public class UtilDate {
1383 1390  
1384 1391 public static Calendar stringJsonToCalendar(String dataStr) {
1385 1392 // 2015-01-01T02:00:00.000Z
1386   - dataStr = (String) dataStr.subSequence(0, 10);
1387   - dataStr = dataStr.replace('-', '/');
1388   - Calendar calendar = Calendar.getInstance();
1389   - try {
1390   - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
1391   - calendar.setTime(sdf.parse(dataStr));
1392   - } catch (ParseException e) {
1393   - e.printStackTrace();
1394   - }
1395   -
1396   - return calendar;
  1393 + String date = dataStr.substring(0, 10);
  1394 + String hour = (String) dataStr.substring(11, 19);
  1395 + Timestamp ts = Timestamp.valueOf(date+" "+hour);
  1396 + return timestampToCalendar(ts);
  1397 + }
1397 1398  
  1399 + public static Timestamp stringJsonToTimestamp(String dataStr) {
  1400 + // 2015-01-01T02:00:00.000Z
  1401 + String date = dataStr.substring(0, 10);
  1402 + String hour = (String) dataStr.substring(11, 19);
  1403 + Timestamp ts = Timestamp.valueOf(date+" "+hour);
  1404 + return ts;
1398 1405 }
1399 1406  
1400 1407 public static Calendar primeiraDataAnoVigente(Calendar dataVigente) {
... ...