Commit 1e0209e3 by WeiCong

优化异常日志记录

parent 9795a4c5
...@@ -14,6 +14,7 @@ import org.sss.presentation.noui.api.request.NoUiRequest; ...@@ -14,6 +14,7 @@ import org.sss.presentation.noui.api.request.NoUiRequest;
import org.sss.presentation.noui.api.response.ErrorCodes; import org.sss.presentation.noui.api.response.ErrorCodes;
import org.sss.presentation.noui.common.Constants; import org.sss.presentation.noui.common.Constants;
import org.sss.presentation.noui.util.NoUiUtils; import org.sss.presentation.noui.util.NoUiUtils;
import org.sss.presentation.noui.util.StringUtil;
import org.sss.util.ContainerUtils; import org.sss.util.ContainerUtils;
import java.io.File; import java.io.File;
...@@ -210,7 +211,7 @@ public class NoUiPresentation extends AbstractNullPresentation { ...@@ -210,7 +211,7 @@ public class NoUiPresentation extends AbstractNullPresentation {
} }
public boolean message(MessageType paramMessageType, String paramString, Object paramObject) { public boolean message(MessageType paramMessageType, String paramString, Object paramObject) {
if(paramObject instanceof ExitTransactionException){ if (paramObject instanceof ExitTransactionException) {
throw ExitTransactionException.class.cast(paramObject); throw ExitTransactionException.class.cast(paramObject);
} }
...@@ -245,7 +246,7 @@ public class NoUiPresentation extends AbstractNullPresentation { ...@@ -245,7 +246,7 @@ public class NoUiPresentation extends AbstractNullPresentation {
this.message_code = paramString; this.message_code = paramString;
} }
/* /*
* if (MessageType.ERROR.equals(paramMessageType)) { * if (MessageType.ERROR.equals(paramMessageType)) {
* log.error(StringUtils.isEmpty(paramString) ? str1 : str1 + ":" + * log.error(StringUtils.isEmpty(paramString) ? str1 : str1 + ":" +
* paramString); } * paramString); }
*/ */
...@@ -362,7 +363,7 @@ public class NoUiPresentation extends AbstractNullPresentation { ...@@ -362,7 +363,7 @@ public class NoUiPresentation extends AbstractNullPresentation {
codetable.put(((IBaseObject) paramIAttributeValue).getUrl(), paramList); codetable.put(((IBaseObject) paramIAttributeValue).getUrl(), paramList);
paramIAttributeValue.setAttribute("CODEVALUES", paramList); paramIAttributeValue.setAttribute("CODEVALUES", paramList);
/* /*
* if (((paramIAttributeValue instanceof IBaseObject)) && * if (((paramIAttributeValue instanceof IBaseObject)) &&
* (!this.codeValuesList.contains(paramIAttributeValue))) { IBaseObject * (!this.codeValuesList.contains(paramIAttributeValue))) { IBaseObject
* baseObject = (IBaseObject) paramIAttributeValue; * baseObject = (IBaseObject) paramIAttributeValue;
...@@ -476,8 +477,16 @@ public class NoUiPresentation extends AbstractNullPresentation { ...@@ -476,8 +477,16 @@ public class NoUiPresentation extends AbstractNullPresentation {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private final void setModified(IAttribute paramIAttribute, boolean paramBoolean) { private final void setModified(IAttribute paramIAttribute, boolean paramBoolean) {
paramIAttribute = handleProxyField(paramIAttribute); paramIAttribute = handleProxyField(paramIAttribute);
modifyMap.put(((IBaseObject) paramIAttribute).getUrl(), paramIAttribute); try {
IBaseObject object = (IBaseObject) paramIAttribute;
if (StringUtil.isEmpty(object.getUrl())) {
log.warn("The url property of the " + object + " is empty");
} else {
modifyMap.put(object.getUrl(), paramIAttribute);
}
} catch (Exception e) {
log.error("setModified save occure exception", e);
}
} }
@Override @Override
......
...@@ -224,17 +224,17 @@ public abstract class AbstractCommonController { ...@@ -224,17 +224,17 @@ public abstract class AbstractCommonController {
String aliasActionUrl = alias.getAliasActionUrl(); String aliasActionUrl = alias.getAliasActionUrl();
String actionUrl = alias.getRel().get(aliasActionUrl); String actionUrl = alias.getRel().get(aliasActionUrl);
IBaseObject baseObject = context.getSession().getBaseObject(context.getRoot(), actionUrl); IBaseObject baseObject = context.getSession().getBaseObject(context.getRoot(), actionUrl);
if (null == baseObject){ if (null == baseObject) {
throw new NoUiException("onClickUrl :" + actionUrl + " is not exsit"); throw new NoUiException("onClickUrl :" + actionUrl + " is not exsit");
} }
return baseObject; return baseObject;
} }
private void doHandleReturnDataForModuleList(Alias alias, String aliasKey, Map<String, Object> dataMap, IModuleList moduleList, List<Map> lst, NoUiRequest noUiRequest) { private void doHandleReturnDataForModuleList(Alias alias, String aliasKey, Map<String, Object> dataMap, IModuleList moduleList, List<Map> lst, NoUiRequest noUiRequest) {
if(aliasKey.endsWith("__data")){ if (aliasKey.endsWith("__data")) {
//直接返回结果集 //直接返回结果集
dataMap.put(aliasKey, lst); dataMap.put(aliasKey, lst);
}else{ } else {
//对该list封装一层,data属性表示实际结果集;pagination属性(分页请求下才有)表示分页信息 //对该list封装一层,data属性表示实际结果集;pagination属性(分页请求下才有)表示分页信息
Map<String, Object> item = new HashMap<>(); Map<String, Object> item = new HashMap<>();
//查询数据 //查询数据
...@@ -247,8 +247,8 @@ public abstract class AbstractCommonController { ...@@ -247,8 +247,8 @@ public abstract class AbstractCommonController {
pagination.put(Constants.PAGINATION_TOTAL, total); pagination.put(Constants.PAGINATION_TOTAL, total);
pagination.put(Constants.PAGINATION_INDEX, index); pagination.put(Constants.PAGINATION_INDEX, index);
item.put(Constants.PAGINATION, pagination);*/ item.put(Constants.PAGINATION, pagination);*/
Map<String, Object> paginationInfo =AbstractCache.getPageInfo(moduleList); Map<String, Object> paginationInfo = AbstractCache.getPageInfo(moduleList);
if(paginationInfo!=null){ if (paginationInfo != null) {
item.put(Constants.PAGINATION, paginationInfo); item.put(Constants.PAGINATION, paginationInfo);
} }
} }
...@@ -280,6 +280,10 @@ public abstract class AbstractCommonController { ...@@ -280,6 +280,10 @@ public abstract class AbstractCommonController {
Map<String, Object> modifyMap = gui.getModifyMap(); Map<String, Object> modifyMap = gui.getModifyMap();
List<String> containsKeys = new ArrayList<String>(); List<String> containsKeys = new ArrayList<String>();
for (Map.Entry<String, Object> modifyEntry : modifyMap.entrySet()) { for (Map.Entry<String, Object> modifyEntry : modifyMap.entrySet()) {
if (modifyEntry.getKey() == null) {
log.error("modifymap中存在键为空的元素:" + modifyEntry + ",请求路径是:" + noUiRequest.getMappingUrl());
continue;
}
for (Map.Entry<String, String> aliasEntry : alias.getRel().entrySet()) { for (Map.Entry<String, String> aliasEntry : alias.getRel().entrySet()) {
String aliasKey = aliasEntry.getKey(); String aliasKey = aliasEntry.getKey();
String aliasPath = aliasEntry.getValue(); String aliasPath = aliasEntry.getValue();
...@@ -287,10 +291,7 @@ public abstract class AbstractCommonController { ...@@ -287,10 +291,7 @@ public abstract class AbstractCommonController {
log.error("错误的mapping:" + noUiRequest.getMappingUrl() + "--" + aliasKey + "--" + aliasPath); log.error("错误的mapping:" + noUiRequest.getMappingUrl() + "--" + aliasKey + "--" + aliasPath);
continue; continue;
} }
if (modifyEntry.getKey() == null) {
log.error("modifymap中存在键为空的元素:" + noUiRequest.getMappingUrl());
continue;
}
if (aliasPath.startsWith(modifyEntry.getKey())) { if (aliasPath.startsWith(modifyEntry.getKey())) {
int modifyKeyLen = modifyEntry.getKey().length(); int modifyKeyLen = modifyEntry.getKey().length();
if (!(aliasPath.length() == modifyKeyLen || aliasPath.charAt(modifyKeyLen) == '\\')) { if (!(aliasPath.length() == modifyKeyLen || aliasPath.charAt(modifyKeyLen) == '\\')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment