Index: core-module/pom.xml =================================================================== diff -u -r9d942b86edfaaef6b0f7852aa3e965c11da6835e -r921fce205bff055ec5a1d5522e17cc66c7aeadef --- core-module/pom.xml (.../pom.xml) (revision 9d942b86edfaaef6b0f7852aa3e965c11da6835e) +++ core-module/pom.xml (.../pom.xml) (revision 921fce205bff055ec5a1d5522e17cc66c7aeadef) @@ -7,7 +7,7 @@ 313devgrp java-service-tree-framework-core-library - 23.01.17 + 23.01.18 ../pom.xml @@ -31,7 +31,7 @@ 313devgrp lib-module - 23.01.17 + 23.01.18 pom Index: core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/interceptor/RouteTableInterceptor.java =================================================================== diff -u -r9d942b86edfaaef6b0f7852aa3e965c11da6835e -r921fce205bff055ec5a1d5522e17cc66c7aeadef --- core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/interceptor/RouteTableInterceptor.java (.../RouteTableInterceptor.java) (revision 9d942b86edfaaef6b0f7852aa3e965c11da6835e) +++ core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/interceptor/RouteTableInterceptor.java (.../RouteTableInterceptor.java) (revision 921fce205bff055ec5a1d5522e17cc66c7aeadef) @@ -25,71 +25,71 @@ if(StringUtils.contains(servletPath,"T_ARMS_REQADD_")){ if(StringUtils.contains(servletPath,"getMonitor.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getMonitor"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getChildNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getChildNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getChildNodeWithParent.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getChildNodeWithParent"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"addNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("addNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"updateNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("updateNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"moveNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("moveNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getHistory.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getHistory"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } }else if(StringUtils.contains(servletPath,"T_ARMS_REQSTATUS_")){ if(StringUtils.contains(servletPath,"getStatusMonitor.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getStatusMonitor"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getStatusNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getStatusNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getStatusChildNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getStatusChildNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getStatusChildNodeWithParent.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getStatusChildNodeWithParent"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"addStatusNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("addStatusNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"updateStatusNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("updateStatusNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"moveStatusNode.do")){ String replaceTableName = (String) SessionUtil.getAttribute("moveStatusNode"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } if(StringUtils.contains(servletPath,"getStatusHistory.do")){ String replaceTableName = (String) SessionUtil.getAttribute("getStatusHistory"); - return replaceStatement(prepedStatement, replaceTableName); + prepedStatement = replaceStatement(prepedStatement, replaceTableName); } } - logger.info("RouteTableInterceptor :: servletPath -> " + servletPath); + logger.info("RouteTableInterceptor :: onPrepareStatement servletPath -> " + servletPath); } catch (Exception e) { e.printStackTrace(); } @@ -117,8 +117,10 @@ } public static String setArmsReplaceTableName(HttpServletRequest request, String tableName) throws Exception { + + String servletPath = request.getServletPath(); + if(StringUtils.equals(tableName, "T_ARMS_REQADD")){ - String servletPath = request.getServletPath(); if(StringUtils.contains(servletPath,"T_ARMS_REQADD_")){ if(StringUtils.contains(servletPath,"getMonitor.do")){ tableName = (String) SessionUtil.getAttribute("getMonitor"); @@ -146,7 +148,7 @@ } } }else if(StringUtils.equals(tableName, "T_ARMS_REQSTATUS")){ - String servletPath = request.getServletPath(); + if(StringUtils.contains(servletPath,"T_ARMS_REQSTATUS_")){ if(StringUtils.contains(servletPath,"getStatusMonitor.do")){ tableName = (String) SessionUtil.getAttribute("getStatusMonitor"); @@ -174,6 +176,8 @@ } } } + logger.info("RouteTableInterceptor :: setArmsReplaceTableName -> " + servletPath); + logger.info("RouteTableInterceptor :: setArmsReplaceTableName -> " + tableName); return tableName; } } \ No newline at end of file Index: lib-module/pom.xml =================================================================== diff -u -r9d942b86edfaaef6b0f7852aa3e965c11da6835e -r921fce205bff055ec5a1d5522e17cc66c7aeadef --- lib-module/pom.xml (.../pom.xml) (revision 9d942b86edfaaef6b0f7852aa3e965c11da6835e) +++ lib-module/pom.xml (.../pom.xml) (revision 921fce205bff055ec5a1d5522e17cc66c7aeadef) @@ -5,7 +5,7 @@ 313devgrp java-service-tree-framework-core-library - 23.01.17 + 23.01.18 ../pom.xml Index: pom.xml =================================================================== diff -u -r9d942b86edfaaef6b0f7852aa3e965c11da6835e -r921fce205bff055ec5a1d5522e17cc66c7aeadef --- pom.xml (.../pom.xml) (revision 9d942b86edfaaef6b0f7852aa3e965c11da6835e) +++ pom.xml (.../pom.xml) (revision 921fce205bff055ec5a1d5522e17cc66c7aeadef) @@ -10,7 +10,7 @@ 4.0.0 313devgrp java-service-tree-framework-core-library - 23.01.17 + 23.01.18 pom java-service-tree-framework-core-library