fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #10258 - Auditoria alterações 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78931 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2018-02-09 19:36:14 +00:00
parent e4e6e831aa
commit d6405f79f2
2 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java
View File

@ -44,50 +44,52 @@ public class AuditControl {
List<Object> lsClazz = new ArrayList<Object>(); List<Object> lsClazz = new ArrayList<Object>();
List<String> lsFieldName = new ArrayList<String>(); List<String> lsFieldName = new ArrayList<String>();
for (Field field : object.getClass().getDeclaredFields()) { if (object != null){
if ((!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) && for (Field field : object.getClass().getDeclaredFields()) {
!field.isAnnotationPresent(ManyToOne.class)) || field.getType().getSimpleName().equalsIgnoreCase("byte[]")) { if ((!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) &&
continue; !field.isAnnotationPresent(ManyToOne.class)) || field.getType().getSimpleName().equalsIgnoreCase("byte[]")) {
} continue;
if (!field.isAnnotationPresent(ManyToOne.class)) {
if (json.length() > 1) {
json.append(",");
} }
json.append("\"".concat(field.getName().concat("\":"))); if (!field.isAnnotationPresent(ManyToOne.class)) {
} else { if (json.length() > 1) {
lsFieldName.add("\"".concat(field.getName().concat("\":"))); json.append(",");
} }
field.setAccessible(true); json.append("\"".concat(field.getName().concat("\":")));
} else {
if (field.getType().getName().contains("String") || field.getType().getName().contains("Date")) { lsFieldName.add("\"".concat(field.getName().concat("\":")));
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("\""); field.setAccessible(true);
continue; 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++) { for (int i = 0; i < lsClazz.size(); i++) {
@ -134,50 +136,51 @@ public class AuditControl {
List<Object> lsClazz = new ArrayList<Object>(); List<Object> lsClazz = new ArrayList<Object>();
List<String> lsNameFd = new ArrayList<String>(); List<String> lsNameFd = new ArrayList<String>();
for (Field field : clazz.getClass().getDeclaredFields()) { if (clazz != null){
if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) && for (Field field : clazz.getClass().getDeclaredFields()) {
!field.isAnnotationPresent(ManyToOne.class)) { if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) &&
continue; !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); for (int i = 0; i < lsClazz.size(); i++) {
ret += lsNameFd.get(i).concat(tab.concat(":").concat(tab));
if (field.isAnnotationPresent(ManyToOne.class) && field.get(clazz) != null) { ret += formatJson(lsClazz.get(i), false);
lsNameFd.add(field.getName());
lsClazz.add(field.get(clazz));
continue;
} }
if (mainClass) {
if (!mainClass) { ret += ql.concat(fim);
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 { } 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; return ret;
} }

2
src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java
View File

@ -74,7 +74,7 @@ public class AuditLogHibernateDAO extends GenericHibernateDAO<AuditLog, Long>
} }
if (log.getDataInicio() != null && log.getDataFim() != null) { 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(); return c.list();