diff --git a/pom.xml b/pom.xml index f1bab86..64f73e9 100644 --- a/pom.xml +++ b/pom.xml @@ -158,15 +158,22 @@ - - ojdbc - ojdbc - 14 - system - ${basedir}/src/main/webapp/WEB-INF/lib/ojdbc-14.jar - + + + + + + + + + + org.postgresql + postgresql + 42.3.3 + + javax.servlet diff --git a/src/main/java/kcg/faics/sec/LoginSuccessHandler.java b/src/main/java/kcg/faics/sec/LoginSuccessHandler.java index 11e7b5f..86d098c 100644 --- a/src/main/java/kcg/faics/sec/LoginSuccessHandler.java +++ b/src/main/java/kcg/faics/sec/LoginSuccessHandler.java @@ -99,8 +99,8 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler { String head = null; String section = null; if (rptApprove != null) { - head = (String) rptApprove.get("HEAD"); - section = (String) rptApprove.get("SECTION"); + head = (String) rptApprove.get("head"); + section = (String) rptApprove.get("section"); } /* 계장? */ user.setAuthHead(head != null && head.equals(userId) ? 1 : 0); @@ -113,10 +113,10 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler { int authCode = 0; if (rptAu != null) { - if (rptAu.get("CODE") == null) { + if (rptAu.get("code") == null) { authCode = 32; } else { - authCode = Integer.parseInt(rptAu.get("CODE").toString()); + authCode = Integer.parseInt(rptAu.get("code").toString()); } } user.setAuthCode(authCode); @@ -170,8 +170,8 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler { /* 관리자? */ int roleLev = user.getRolelevel(); user.setAuthAdmin((roleLev <= propertiesService.getInt("adminLevel")) ? 1 : 0); - user.setIsAdmin((roleLev <= propertiesService.getInt("adminLevel")) ? true : false); - user.setIsSysAdmin((roleLev <= propertiesService.getInt("sysAdminLevel")) || propertiesService.getString("sysAdminId").equals(userId) ? true : false); + user.setIsAdmin(roleLev <= propertiesService.getInt("adminLevel")); + user.setIsSysAdmin((roleLev <= propertiesService.getInt("sysAdminLevel")) || propertiesService.getString("sysAdminId").equals(userId)); /* 로그인 실패횟수 초기화 */ MemberVO memberVO = new MemberVO(); diff --git a/src/main/java/kcg/faics/sec/service/impl/SecurityMapper.java b/src/main/java/kcg/faics/sec/service/impl/SecurityMapper.java index 246549b..35b4e8a 100644 --- a/src/main/java/kcg/faics/sec/service/impl/SecurityMapper.java +++ b/src/main/java/kcg/faics/sec/service/impl/SecurityMapper.java @@ -11,6 +11,7 @@ import kcg.faics.member.vo.MemberVO; import kcg.faics.sec.LoginUserVO; import kcg.faics.sec.role.SecurityRolesVO; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.SecurityConfig; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @@ -33,7 +34,6 @@ import egovframework.rte.psl.dataaccess.EgovAbstractMapper; @Repository("securityMapper") public class SecurityMapper extends EgovAbstractMapper { - /** * 외사경찰 사용자 정보를 가져온다. * @@ -85,16 +85,17 @@ public class SecurityMapper extends EgovAbstractMapper { public String getHierarchyRoles() { List> resultList = selectList("Security.getHierarchyRoles"); Iterator> itr = resultList.iterator(); - StringBuffer concatedRoles = new StringBuffer(); - Map tempMap; - while (itr.hasNext()) { - tempMap = itr.next(); - concatedRoles.append(tempMap.get("CHILD")); - concatedRoles.append(" > "); - concatedRoles.append(tempMap.get("PARENT")); - concatedRoles.append("\n"); - } - return concatedRoles.toString(); + + StringBuilder concatedRoles = new StringBuilder(); + Map tempMap; + while (itr.hasNext()) { + tempMap = itr.next(); + concatedRoles.append(tempMap.get("child")); + concatedRoles.append(" > "); + concatedRoles.append(tempMap.get("parent")); + concatedRoles.append("\n"); + } + return concatedRoles.toString(); } /** @@ -140,8 +141,9 @@ public class SecurityMapper extends EgovAbstractMapper { * SecuredObjectDAO, SecuredObjectServiceImpl을 참조해서 변경한다. * */ boolean isResourcesUrl = true; - String resourceType = "URL"; - + + String resourceType ="url"; + LinkedHashMap> resourcesMap = new LinkedHashMap>(); Iterator> itr = list.iterator(); Map tempMap; @@ -175,7 +177,7 @@ public class SecurityMapper extends EgovAbstractMapper { } } - configList.add(new SecurityConfig((String) tempMap.get("AUTHORITY"))); + configList.add(new SecurityConfig((String) tempMap.get("authority"))); resourcesMap.put(presentResource, configList); @@ -196,7 +198,7 @@ public class SecurityMapper extends EgovAbstractMapper { /** * 차단 정보를 업데이트한다. * - * @param loginUserVO 로그인 사용자 객체 + * @param memberVO 로그인 사용자 객체 * @return 성공 - 1, 실패 - 0 */ public int updateChkInfo(MemberVO memberVO) { diff --git a/src/main/resources/property/globals.properties b/src/main/resources/property/globals.properties index 3869f08..2b5f9e8 100644 --- a/src/main/resources/property/globals.properties +++ b/src/main/resources/property/globals.properties @@ -22,12 +22,15 @@ #TEST DB Server -Global.datasource.driverClassName=oracle.jdbc.driver.OracleDriver -Global.datasource.url=jdbc:oracle:thin:@106.247.244.146:51521:faics -Global.datasource.username=new_faics -Global.datasource.password=tkdlqjdhltk12#$ - +#Global.datasource.driverClassName=oracle.jdbc.driver.OracleDriver +#Global.datasource.url=jdbc:oracle:thin:@106.247.244.146:51521:faics +#Global.datasource.username=new_faics +#Global.datasource.password=tkdlqjdhltk12#$ +Global.datasource.driverClassName=org.postgresql.Driver +Global.datasource.url=jdbc:postgresql://192.168.0.157:5432/faics +Global.datasource.username=dbnt0031 +Global.datasource.password=dbnt0928! #File path diff --git a/src/main/resources/sqlmapper/mappers/arrest/arrest.xml b/src/main/resources/sqlmapper/mappers/arrest/arrest.xml index 42bc550..11478d7 100644 --- a/src/main/resources/sqlmapper/mappers/arrest/arrest.xml +++ b/src/main/resources/sqlmapper/mappers/arrest/arrest.xml @@ -1529,18 +1529,18 @@ #{violateType}, #{violateDetail}, #{invasionType}, - NVL(#{specBatlYn}, 'N'), - NVL(#{nllYn}, 'N'), + COALESCE(#{specBatlYn}, 'N'), + COALESCE(#{nllYn}, 'N'), #{woDetentionType}, TO_DATE(#{fieldArrestDate}, 'YYYY-MM-DD hh24:mi'), TO_DATE(#{fieldReleaseDate}, 'YYYY-MM-DD hh24:mi'), - NVL(#{leadDistance}, 0), - NVL(#{leadHour}, 0), - NVL(#{leadMinute}, 0), - NVL(#{captainCount}, 0), - NVL(#{mateCount}, 0), - NVL(#{engineerCount}, 0), - NVL(#{crewCount}, 0), + COALESCE(#{leadDistance}, 0), + COALESCE(#{leadHour}, 0), + COALESCE(#{leadMinute}, 0), + COALESCE(#{captainCount}, 0), + COALESCE(#{mateCount}, 0), + COALESCE(#{engineerCount}, 0), + COALESCE(#{crewCount}, 0), #{shipProcType}, #{commissionCost}, #{gearCast}, @@ -1573,7 +1573,7 @@ TO_DATE(#{marginPaymentDate}, 'YYYY-MM-DD hh24:mi'), #{status}, #{delYn}, - SYSDATE, + NOW(), #{regUser}, #{regAgency} @@ -1666,8 +1666,8 @@ VLTN_TYPE=#{violateType}, VLTN_DTL=#{violateDetail}, IVSN_TYPE=#{invasionType}, - SPEC_BATL_YN=NVL(#{specBatlYn}, 'N'), - NLL_YN=NVL(#{nllYn}, 'N'), + SPEC_BATL_YN=COALESCE(#{specBatlYn}, 'N'), + NLL_YN=COALESCE(#{nllYn}, 'N'), AGENCY_TYPE=#{agencyType}, AGENCY_GUARD=#{agencyGuard}, AGENCY_VESSEL=#{agencyVessel}, diff --git a/src/main/resources/sqlmapper/mappers/board/board.xml b/src/main/resources/sqlmapper/mappers/board/board.xml index 71dc49e..669eb84 100644 --- a/src/main/resources/sqlmapper/mappers/board/board.xml +++ b/src/main/resources/sqlmapper/mappers/board/board.xml @@ -124,7 +124,7 @@ ) VALUES ( #{userId}, #{category}, #{userName}, #{groupSeq}, #{content}, #{subject}, #{parentSeq}, #{prevSeq}, #{nextSeq}, #{step}, - #{depth}, SYSDATE, ${hit}, 0, #{ip,jdbcType=VARCHAR}, #{notice}, + #{depth}, NOW(), ${hit}, 0, #{ip,jdbcType=VARCHAR}, #{notice}, 1, 0, 0, #{data1,jdbcType=VARCHAR}, #{data2,jdbcType=VARCHAR}, #{place1,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR} ) diff --git a/src/main/resources/sqlmapper/mappers/board/boardComment.xml b/src/main/resources/sqlmapper/mappers/board/boardComment.xml index a8286b3..432b83e 100644 --- a/src/main/resources/sqlmapper/mappers/board/boardComment.xml +++ b/src/main/resources/sqlmapper/mappers/board/boardComment.xml @@ -48,7 +48,7 @@ H3_BD_${id}_COMT ( BC_SEQ, BC_NAME, BC_CONTENT, BC_REGDATE, BC_BD_SEQ, BC_IP, BC_MB_ID ) VALUES ( - H3_BD_${id}_COMT_SEQ.NEXTVAL, #{userName}, #{content}, SYSDATE, #{parentSeq}, '10.123.141.123', #{userId} + H3_BD_${id}_COMT_SEQ.NEXTVAL, #{userName}, #{content}, NOW(), #{parentSeq}, '10.123.141.123', #{userId} ) SELECT H3_BD_${id}_COMT_SEQ.CURRVAL FROM DUAL diff --git a/src/main/resources/sqlmapper/mappers/cmmn/log.xml b/src/main/resources/sqlmapper/mappers/cmmn/log.xml index 5c88a5d..fd57e29 100644 --- a/src/main/resources/sqlmapper/mappers/cmmn/log.xml +++ b/src/main/resources/sqlmapper/mappers/cmmn/log.xml @@ -8,7 +8,7 @@ UL_USERID, UL_NAME, UL_LOCATION1, UL_LOCATION2, UL_LOCATION3, UL_REGDATE, UL_USER_IP, UL_PLACE1, UL_POSITION ) VALUES ( - #{userid}, #{name}, #{location1}, #{location2}, #{location3}, SYSDATE, #{userip, jdbcType=VARCHAR}, #{place1}, #{position} + #{userid}, #{name}, #{location1}, #{location2}, #{location3}, NOW(), #{userip, jdbcType=VARCHAR}, #{place1}, #{position} ) ]]> @@ -19,7 +19,7 @@ IO_USERID, IO_TYPE, IO_REGDATE, IO_PLACE1, IO_POSITION, IO_NAME ) VALUES ( - #{user.userid}, #{type}, SYSDATE, #{user.place1}, #{user.position}, #{user.name} + #{user.userid}, #{type}, NOW(), #{user.place1}, #{user.position}, #{user.name} ) ]]> diff --git a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml index 21bfd8a..4b0f6a2 100644 --- a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml +++ b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml @@ -38,16 +38,16 @@ LEVEL, M.ID, M.NAME, M.ENG_NAME, M.PARENT, M.DEPTH, M.MENU_POSITION, M.VISIBLE, M.SUB_VISIBLE, M.ROLE_LEVEL, - NVL(M.URL_GROUP, (SELECT URL_GROUP FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_GROUP, - NVL(M.URL, (SELECT URL FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL, - NVL(M.URL_QUERY, (SELECT URL_QUERY FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_QUERY, - NVL(M.BOARD_ID, (SELECT BOARD_ID FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS BOARD_ID, - NVL(M.WINDOW_TARGET, (SELECT WINDOW_TARGET FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS WINDOW_TARGET + COALESCE(M.URL_GROUP, (SELECT URL_GROUP FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_GROUP, + COALESCE(M.URL, (SELECT URL FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL, + COALESCE(M.URL_QUERY, (SELECT URL_QUERY FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_QUERY, + COALESCE(M.BOARD_ID, (SELECT BOARD_ID FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS BOARD_ID, + COALESCE(M.WINDOW_TARGET, (SELECT WINDOW_TARGET FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS WINDOW_TARGET FROM T_MENU M WHERE M.VISIBLE = 'Y' - AND M.ROLE_LEVEL >= NVL((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17) + AND M.ROLE_LEVEL >= COALESCE((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17) ]]> = NVL((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17) + AND A.ROLE_LEVEL >= COALESCE((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17) ORDER BY A.ID ]]> diff --git a/src/main/resources/sqlmapper/mappers/fa/edu.xml b/src/main/resources/sqlmapper/mappers/fa/edu.xml index 27a17d9..488c60f 100644 --- a/src/main/resources/sqlmapper/mappers/fa/edu.xml +++ b/src/main/resources/sqlmapper/mappers/fa/edu.xml @@ -39,10 +39,10 @@ ) VALUES ( - (SELECT NVL(MAX(ES_IDX), 0) + 1 FROM H3_EDU_STAT), #{name}, #{stdate}, #{eddate}, #{eduCourse}, + (SELECT COALESCE(MAX(ES_IDX), 0) + 1 FROM H3_EDU_STAT), #{name}, #{stdate}, #{eddate}, #{eduCourse}, #{eduPlace}, #{userId}, #{place1}, #{place2}, #{scholarship}, #{position}, #{jobtype}, #{sdate}, #{pdate}, #{adate}, - #{comment}, SYSDATE, SYSDATE, #{writer}, #{birth} + #{comment}, NOW(), NOW(), #{writer}, #{birth} ) ]]> @@ -104,7 +104,7 @@ ES_PDATE = #{pdate}, ES_ADATE = #{adate}, ES_COMMENT = #{comment}, - ES_LOGDATE = SYSDATE, + ES_LOGDATE = NOW(), ES_WRITER = #{writer}, ES_BIRTH = #{birth} WHERE ES_IDX = #{idx} diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index b236b5b..f3e9983 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -115,10 +115,10 @@ - NVL(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2} + COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2} - NVL(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2} + COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2} @@ -263,7 +263,7 @@ @@ -862,7 +862,7 @@ SELECT * FROM ( SELECT - ROWNUM AS RNUM, T.* + (ROW_NUMBER() OVER()) AS RNUM, T.* FROM (SELECT (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo, @@ -919,7 +919,7 @@ diff --git a/src/main/resources/sqlmapper/mappers/sec/security.xml b/src/main/resources/sqlmapper/mappers/sec/security.xml index a40d9fb..a04d578 100644 --- a/src/main/resources/sqlmapper/mappers/sec/security.xml +++ b/src/main/resources/sqlmapper/mappers/sec/security.xml @@ -72,22 +72,14 @@ diff --git a/src/main/resources/sqlmapper/mappers/susa/susa.xml b/src/main/resources/sqlmapper/mappers/susa/susa.xml index cfb1840..d00d2b4 100644 --- a/src/main/resources/sqlmapper/mappers/susa/susa.xml +++ b/src/main/resources/sqlmapper/mappers/susa/susa.xml @@ -136,7 +136,7 @@ ) VALUES ( - #{type}, #{agency}, #{chargeNm}, #{sdate}, SYSDATE, + #{type}, #{agency}, #{chargeNm}, #{sdate}, NOW(), #{contents}, #{place1}, #{edate}, #{title}, #{result}, #{writer} )