更新mapping配置文件映射关系

src/main/java/org/sss/presentation/noui/api/model/Alias.java

@@ -23,23 +23,41 @@ public class Alias {
 	private Map<String, String> rel;
 	private Map<String, String> revertRel = new HashMap<>();
 
+	private Map<String, String> lstRel;
+	private Map<String, String> revertLstRel = new HashMap<>();
+
 	@SuppressWarnings("unchecked")
-	public Alias(String mappingUrl) {
+	public Alias(String mappingUrl,String flag) {
 		String[] mappingArgs = mappingUrl.split("/");
 		this.trnName = mappingArgs[mappingArgs.length - 2];
 		this.aliasActionUrl = mappingArgs[mappingArgs.length - 1];
 		try {
-			this.rel = new HashMap<String, String>((Map) PropertyUtil.load(PRE + trnName + ".properties"));
+			this.rel = new HashMap<String, String>((Map) PropertyUtil.load(PRE+flag+"_" + trnName + ".properties"));
 
 			for (String key : this.rel.keySet()) {
 				this.revertRel.put(this.rel.get(key), key);
 			}
+
+			//添加lst字段映射
+			this.lstRel = new HashMap<String, String>((Map) PropertyUtil.load(PRE + trnName + "_lst.properties"));
+			for (String key : this.lstRel.keySet()) {
+				this.revertLstRel.put(this.lstRel.get(key), key);
+			}
+
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 
 	}
 
+	public String getLstRelPath(String alias){
+		return this.lstRel.get(alias);
+	}
+
+	public String getRevertLstRelPath(String alias){
+		return this.revertLstRel.get(alias);
+	}
+
 	public String getRelPath(String alias) {
 		return this.rel.get(alias);
 	}

src/main/java/org/sss/presentation/noui/common/Constants.java

@@ -21,4 +21,7 @@ public class Constants {
 	public final static String RESULT = "result";
 	public final static String FILE_IN = "fileIn";
 	public final static String FILE_OUT = "fileOut";
+
+	public final static String REQ = "req";
+	public final static String RESP = "resp";
 }

src/main/java/org/sss/presentation/noui/util/NoUiPresentationUtil.java

@@ -60,8 +60,13 @@ public class NoUiPresentationUtil {
 							List<Map<String, Object>> valueList = (List<Map<String, Object>>) value;
 							for (Map<String, Object> m : valueList) {
 								IModule module = moduleList.add();
-								for (Map.Entry<String, Object> entry : m.entrySet())
-									handleDatafield(context, (IDatafield<Object>) module.get(entry.getKey()), entry.getValue());
+								for (Map.Entry<String, Object> entry : m.entrySet()){
+									if(alias.getLstRelPath(entry.getKey())==null){
+										handleDatafield(context, (IDatafield<Object>) module.get(entry.getKey()), entry.getValue());
+									}else{
+										handleDatafield(context, (IDatafield<Object>) module.get(alias.getLstRelPath(entry.getKey())), entry.getValue());
+									}
+								}
 							}
 						}
 					}
@@ -175,7 +180,7 @@ public class NoUiPresentationUtil {
 				}
 				String realPath = alias.getRelPath(aliasKey);
 				IBaseObject baseObject = context.getSession().getBaseObject(context.getRoot(), realPath);
-				data.put(aliasKey, handIBaseObject(context, baseObject, realPath));
+				data.put(aliasKey, handIBaseObject(context, baseObject, realPath,alias));
 			}
 			return data;
 		}
@@ -188,7 +193,7 @@ public class NoUiPresentationUtil {
 				String aliasPath = aliasEntry.getValue();
 				if (aliasPath.startsWith(modifyEntry.getKey())) {
 					Object val = modifyEntry.getValue();
-					data.put(aliasKey, handIBaseObject(context, val, aliasEntry.getValue()));
+					data.put(aliasKey, handIBaseObject(context, val, aliasEntry.getValue(),alias));
 				}
 
 			}
@@ -234,7 +239,7 @@ public class NoUiPresentationUtil {
 		return null;
 	}
 
-	public static Object handIBaseObject(IContext context, Object val, String path) {
+	public static Object handIBaseObject(IContext context, Object val, String path,Alias alias) {
 		if (val == null)
 			return null;
 		if (val instanceof IModuleList<?>) {
@@ -245,14 +250,18 @@ public class NoUiPresentationUtil {
 				IModule module = moduleList.get(index);
 				Collection<IDatafield> datafields = module.getDatafields();
 				for (IDatafield<Object> datafield : datafields) {
-					map.put(datafield.getName(), handle(datafield.getValue(), datafield));
+					if(alias.getRevertLstRelPath(datafield.getName())==null){
+						map.put(datafield.getName(), handle(datafield.getValue(), datafield));
+					}else{
+						map.put(alias.getRevertLstRelPath(datafield.getName()), handle(datafield.getValue(), datafield));
+					}
 				}
 				list.add(map);
 			}
 			return list;
 		} else if (val instanceof IModule) {
 			val = context.getSession().getBaseObject(context.getRoot(), path);
-			return handIBaseObject(context, val, path);
+			return handIBaseObject(context, val, path,alias);
 		} else if (val instanceof IDatafield) {
 			IDatafield datafield = (IDatafield) val;
 			return handle(datafield.getValue(), datafield);
@@ -263,14 +272,14 @@ public class NoUiPresentationUtil {
 	public static Map<String, Object> getWholeAliasData(IContext context, String mappingUrl)
 	{
 		Map<String, Object> data = new HashMap<String, Object>();
-		Alias alias = new Alias(mappingUrl);
+		Alias alias = new Alias(mappingUrl,Constants.RESP);
 		for (String aliasKey : alias.getRel().keySet()) {
 			if (aliasKey.startsWith(Constants.MAPPING_PRE)) {
 				continue;
 			}
 			String realPath = alias.getRelPath(aliasKey);
 			IBaseObject baseObject = context.getSession().getBaseObject(context.getRoot(), realPath);
-			data.put(aliasKey, NoUiPresentationUtil.handIBaseObject(context, baseObject, realPath));
+			data.put(aliasKey, NoUiPresentationUtil.handIBaseObject(context, baseObject, realPath,alias));
 		}
 		return data;
 	}

src/main/resources/noUiMapping_dbcact_lst.properties

+opnb_chnam=opnbchnam
\ No newline at end of file

src/main/resources/noUiMapping_dbcact.properties → src/main/resources/noUiMapping_req_dbcact.properties

 _select=actp\\select
-cur=actp\\cur
-actlst=\\actp\\actlst
+cur=actp\\cur
\ No newline at end of file
\ No newline at end of file

src/main/resources/noUiMapping_resp_dbcact.properties

+actlst=\\actp\\actlst
+midratmmmmmmmmmmm=\\actgrp\\currat\\midrat
+cur=\\actgrp\\currat\\cur
\ No newline at end of file