From d6405f79f2ccfd36a6f5f79a8a19923d8859d1eb Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 9 Feb 2018 19:36:14 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=20#10258=20-=20Auditoria=20altera?= =?UTF-8?q?=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78931 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/auditoria/AuditControl.java | 165 +++++++++--------- .../dao/hibernate/AuditLogHibernateDAO.java | 2 +- 2 files changed, 85 insertions(+), 82 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java b/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java index c02003df3..964269d5e 100644 --- a/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java +++ b/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java @@ -44,52 +44,54 @@ public class AuditControl { List lsClazz = new ArrayList(); List lsFieldName = new ArrayList(); - for (Field field : object.getClass().getDeclaredFields()) { - if ((!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) && - !field.isAnnotationPresent(ManyToOne.class)) || field.getType().getSimpleName().equalsIgnoreCase("byte[]")) { - continue; - } - - if (!field.isAnnotationPresent(ManyToOne.class)) { - if (json.length() > 1) { - json.append(","); + if (object != null){ + for (Field field : object.getClass().getDeclaredFields()) { + if ((!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) && + !field.isAnnotationPresent(ManyToOne.class)) || field.getType().getSimpleName().equalsIgnoreCase("byte[]")) { + continue; } - - json.append("\"".concat(field.getName().concat("\":"))); - } else { - lsFieldName.add("\"".concat(field.getName().concat("\":"))); - } - - field.setAccessible(true); - - if (field.getType().getName().contains("String") || field.getType().getName().contains("Date")) { - json.append("\""); - - Date date = null; - - if (field.getType().getName().equals("java.util.Date")) { - date = (java.util.Date) field.get(object); - json.append(date == null ? "null" : sdf.format(date)); - } else if (field.getType().getName().equals("java.sql.Date")) { - date = (Date) field.get(object); - json.append(date == null ? "null" : sdf.format(date)); - } else if (field.getType().getName().contains("String")) { - json.append((String) field.get(object)); + + if (!field.isAnnotationPresent(ManyToOne.class)) { + if (json.length() > 1) { + json.append(","); + } + + json.append("\"".concat(field.getName().concat("\":"))); + } else { + lsFieldName.add("\"".concat(field.getName().concat("\":"))); } - - json.append("\""); - - continue; + + field.setAccessible(true); + + if (field.getType().getName().contains("String") || field.getType().getName().contains("Date")) { + json.append("\""); + + Date date = null; + + if (field.getType().getName().equals("java.util.Date")) { + date = (java.util.Date) field.get(object); + json.append(date == null ? "null" : sdf.format(date)); + } else if (field.getType().getName().equals("java.sql.Date")) { + date = (Date) field.get(object); + json.append(date == null ? "null" : sdf.format(date)); + } else if (field.getType().getName().contains("String")) { + json.append((String) field.get(object)); + } + + json.append("\""); + + continue; + } + + if (field.isAnnotationPresent(ManyToOne.class)) { + lsClazz.add(field.get(object)); + continue; + } + + json.append(field.get(object) == null ? "null" : field.get(object).toString()); } - - if (field.isAnnotationPresent(ManyToOne.class)) { - lsClazz.add(field.get(object)); - continue; - } - - json.append(field.get(object) == null ? "null" : field.get(object).toString()); } - + for (int i = 0; i < lsClazz.size(); i++) { json.append(","); @@ -134,50 +136,51 @@ public class AuditControl { List lsClazz = new ArrayList(); List lsNameFd = new ArrayList(); - for (Field field : clazz.getClass().getDeclaredFields()) { - if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) && - !field.isAnnotationPresent(ManyToOne.class)) { - continue; + if (clazz != null){ + for (Field field : clazz.getClass().getDeclaredFields()) { + if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) && + !field.isAnnotationPresent(ManyToOne.class)) { + continue; + } + + field.setAccessible(true); + + if (field.isAnnotationPresent(ManyToOne.class) && field.get(clazz) != null) { + lsNameFd.add(field.getName()); + lsClazz.add(field.get(clazz)); + continue; + } + + + if (!mainClass) { + ret += tab; + } + + ret += field.getName().concat(":"); + + String fieldValue = null; + + if (field.getType().getSimpleName().equalsIgnoreCase("date") && field.get(clazz) != null) { + fieldValue = AuditControl.convertDateObjectToString(field.get(clazz)); + } else { + fieldValue = (field.get(clazz) == null ? "null" : field.get(clazz)).toString(); + } + + ret += fieldValue; + ret += ql.concat(tab); } - - field.setAccessible(true); - - if (field.isAnnotationPresent(ManyToOne.class) && field.get(clazz) != null) { - lsNameFd.add(field.getName()); - lsClazz.add(field.get(clazz)); - continue; + + for (int i = 0; i < lsClazz.size(); i++) { + ret += lsNameFd.get(i).concat(tab.concat(":").concat(tab)); + ret += formatJson(lsClazz.get(i), false); } - - - if (!mainClass) { - ret += tab; - } - - ret += field.getName().concat(":"); - - String fieldValue = null; - - if (field.getType().getSimpleName().equalsIgnoreCase("date") && field.get(clazz) != null) { - fieldValue = AuditControl.convertDateObjectToString(field.get(clazz)); + + if (mainClass) { + ret += ql.concat(fim); } else { - fieldValue = (field.get(clazz) == null ? "null" : field.get(clazz)).toString(); + ret += ql.concat(tab.concat(fim).concat(",").concat(ql).concat(tab)); } - - ret += fieldValue; - ret += ql.concat(tab); } - - for (int i = 0; i < lsClazz.size(); i++) { - ret += lsNameFd.get(i).concat(tab.concat(":").concat(tab)); - ret += formatJson(lsClazz.get(i), false); - } - - if (mainClass) { - ret += ql.concat(fim); - } else { - ret += ql.concat(tab.concat(fim).concat(",").concat(ql).concat(tab)); - } - return ret; } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java index 26db63f9a..d36e470eb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java @@ -74,7 +74,7 @@ public class AuditLogHibernateDAO extends GenericHibernateDAO } if (log.getDataInicio() != null && log.getDataFim() != null) { - c.add(Restrictions.between("createDate", log.getDataInicio(), log.getDataFim())); + c.add(Restrictions.between("createdDate", log.getDataInicio(), log.getDataFim())); } return c.list();