diff --git a/pom.xml b/pom.xml index 64f73e9..6d279e6 100644 --- a/pom.xml +++ b/pom.xml @@ -130,11 +130,16 @@ 1.0.0.GA - - net.sf - log4jdbc3 - 1.1 - + + + + + + + org.bgee.log4jdbc-log4j2 + log4jdbc-log4j2-jdbc4.1 + 1.16 + diff --git a/src/main/java/kcg/faics/cmmn/web/CommonController.java b/src/main/java/kcg/faics/cmmn/web/CommonController.java index 7bd45b2..44399ea 100644 --- a/src/main/java/kcg/faics/cmmn/web/CommonController.java +++ b/src/main/java/kcg/faics/cmmn/web/CommonController.java @@ -96,7 +96,7 @@ public class CommonController { LoginUserVO loginUserVO = UserUtil.getMemberInfo(); ReportSearchVO reportSearchVO = new ReportSearchVO(); reportSearchVO.setRecordCountPerPage(5); - reportSearchVO.setType(loginUserVO.getType()); + reportSearchVO.setType(Integer.toString(loginUserVO.getType())); reportSearchVO.setUserid(loginUserVO.getUserid()); //최근 1달치 Calendar mon = Calendar.getInstance(); @@ -117,18 +117,18 @@ public class CommonController { /* 공지사항 리스트 */ searchVO.setId("notice"); - List noticeList = boardService.selectList(searchVO); - model.addAttribute("noticeList", noticeList); + List noticeList = boardService.selectList(searchVO); + model.addAttribute("noticeList", noticeList); - /* 게시판 리스트 */ - searchVO.setId("bbs"); - List bbsList = boardService.selectList(searchVO); - model.addAttribute("bbsList", bbsList); - - /* 자료실 리스트 */ - searchVO.setId("data"); - List dataList = boardService.selectList(searchVO); - model.addAttribute("dataList", dataList); + /* 게시판 리스트 */ + searchVO.setId("bbs"); + List bbsList = boardService.selectList(searchVO); + model.addAttribute("bbsList", bbsList); + + /* 자료실 리스트 */ + searchVO.setId("data"); + List dataList = boardService.selectList(searchVO); + model.addAttribute("dataList", dataList); return "main.tiles"; } else { diff --git a/src/main/java/kcg/faics/report/vo/ReportSearchVO.java b/src/main/java/kcg/faics/report/vo/ReportSearchVO.java index 2829eef..7e63c48 100644 --- a/src/main/java/kcg/faics/report/vo/ReportSearchVO.java +++ b/src/main/java/kcg/faics/report/vo/ReportSearchVO.java @@ -21,7 +21,7 @@ public class ReportSearchVO extends BaseSearchVO implements Cloneable { /** * 접속한 사용자 타입 */ - private int type; + private String type; /** * 접속한 사용자 그룹 */ @@ -162,10 +162,10 @@ public class ReportSearchVO extends BaseSearchVO implements Cloneable { public void setUsegrade(final int usegrade) { this.usegrade = usegrade; } - public int getType() { + public String getType() { return type; } - public void setType(final int type) { + public void setType(final String type) { this.type = type; } public int getMyGroupCode() { diff --git a/src/main/java/kcg/faics/report/web/ReportCommon.java b/src/main/java/kcg/faics/report/web/ReportCommon.java index 361df0a..2bef1bf 100644 --- a/src/main/java/kcg/faics/report/web/ReportCommon.java +++ b/src/main/java/kcg/faics/report/web/ReportCommon.java @@ -213,7 +213,7 @@ public class ReportCommon { result.setUserid(loginUserVO.getUserid()); result.setUsegrade(loginUserVO.getUsegrade()); - result.setType(loginUserVO.getType()); + result.setType(Integer.toString(loginUserVO.getType())); result.setMyGroupCode(ReportCommon.getMyGroupCode()); result.setDuties(loginUserVO.getDutiesStr()); result.setUserPlace(loginUserVO.getPlace1()); diff --git a/src/main/java/kcg/faics/report/web/ReportController.java b/src/main/java/kcg/faics/report/web/ReportController.java index 68bce08..a884f69 100644 --- a/src/main/java/kcg/faics/report/web/ReportController.java +++ b/src/main/java/kcg/faics/report/web/ReportController.java @@ -131,7 +131,7 @@ public class ReportController { try { rptSearchVO.setUserid(loginUserVO.getUserid()); rptSearchVO.setUsegrade(loginUserVO.getUsegrade()); - rptSearchVO.setType(loginUserVO.getType()); + rptSearchVO.setType(Integer.toString(loginUserVO.getType())); /* 페이징 처리 정보 */ rptSearchVO.setPageUnit(propertiesService.getInt("pageUnit")); diff --git a/src/main/resources/property/globals.properties b/src/main/resources/property/globals.properties index 2b5f9e8..c0832f8 100644 --- a/src/main/resources/property/globals.properties +++ b/src/main/resources/property/globals.properties @@ -27,8 +27,8 @@ #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.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy +Global.datasource.url=jdbc:log4jdbc:postgresql://192.168.0.157:5432/faics Global.datasource.username=dbnt0031 Global.datasource.password=dbnt0928! diff --git a/src/main/resources/property/log4jdbc.log4j2.properties b/src/main/resources/property/log4jdbc.log4j2.properties new file mode 100644 index 0000000..a48b3e9 --- /dev/null +++ b/src/main/resources/property/log4jdbc.log4j2.properties @@ -0,0 +1,2 @@ +log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator +log4jdbc.dump.sql.maxlinelength=0 \ No newline at end of file diff --git a/src/main/resources/sqlmapper/mappers/board/board.xml b/src/main/resources/sqlmapper/mappers/board/board.xml index 669eb84..689f4dc 100644 --- a/src/main/resources/sqlmapper/mappers/board/board.xml +++ b/src/main/resources/sqlmapper/mappers/board/board.xml @@ -3,9 +3,8 @@ - - - - - - - = #{dateStart} - ]]> - - - - - #{firstIndex} AND - RNUM <= #{firstIndex} + #{recordCountPerPage} - ]]> - + select (ROW_NUMBER() OVER()) AS RNUM, a.* + from ( + select + (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo, + cat1.name AS inCategory1Str, + cat2.name AS inCategory2Str, + cat3.name AS inCategory3Str, + cat4.name AS inCategory4Str, + RPT.* + FROM + RPT_INFO RPT + inner join Rpt_Category CAT1 on CAT1.type = 1 and cat1.code = rpt.IN_CATEGORY1 + inner join Rpt_Category CAT2 on CAT2.type = 2 and cat2.code = rpt.IN_CATEGORY2 + inner join Rpt_Category CAT3 on CAT3.type = 3 and cat3.code = rpt.IN_CATEGORY3 + inner join Rpt_Category CAT4 on CAT4.type = 4 and cat4.code = rpt.IN_CATEGORY4 + WHERE + IN_STATE_CODE != '99' + AND IN_TYPE = #{type} + + + AND IN_USERID = #{userid} + + + AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''') + + + + + AND IN_INFODATE >= #{dateStart}::date + + + AND IN_INFODATE <= #{dateEnd}::date + + + AND IN_SUBJECT LIKE '%'||#{subject}||'%' + + + + ORDER BY ${orderCol} ${orderAsc} + + limit #{recordCountPerPage} offset #{firstIndex} + ) a +