# WARNING: head commit changed in the meantime

Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

src/main/java/kcc/xxx/web/XxxController.java

@@ -58,6 +58,8 @@ public class XxxController {
 		JSONObject json1 = new JSONObject();
 		json1.put("col1", "test1");
 		json1.put("col2", "test2");
+		json1.put("col3", "test3");
+		json1.put("col4", "test4");
 		
 		JSONArray jsonArray = new JSONArray();
 		for(int i = 0 ; i < 100 ; i++) {

src/main/java/seed/com/gtm/dao/StatsMngDao.java

@@ -0,0 +1,15 @@
+package seed.com.gtm.dao;
+
+import java.util.List;
+import java.util.Map;
+
+public interface StatsMngDao {
+	public void boardInsert(Map<String,Object> paramMap);
+	public List<Map<String,Object>> boardList(Map<String,Object> paramMap);
+	public int boardListCnt(Map<String, Object> paramMap);
+	public Map<String,Object> boardView(Map<String, Object> paramMap);
+	public void boardDel(Map<String, Object> paramMap);
+	public void boardUpdate(Map<String, Object> paramMap);
+	public int boardNo(Map<String, Object> paramMap);
+	public void cntUpdate(Map<String, Object> paramMap);
+}

src/main/java/seed/com/gtm/dao/StatsMngDaoImpl.java

@@ -0,0 +1,58 @@
+package seed.com.gtm.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.session.SqlSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class StatsMngDaoImpl implements StatsMngDao {
+
+	@Autowired
+	private SqlSession sqlSession;
+
+	@Override
+	public void boardInsert(Map<String, Object> paramMap) {
+		sqlSession.insert("statsmng.insert", paramMap);
+	}
+
+	@Override
+	public List<Map<String, Object>> boardList(Map<String, Object> paramMap) {
+		return sqlSession.selectList("statsmng.select", paramMap);
+	}
+
+	@Override
+	public int boardListCnt(Map<String, Object> paramMap) {
+		return sqlSession.selectOne("statsmng.selectCnt", paramMap);
+	}
+
+	@Override
+	public Map<String, Object> boardView(Map<String, Object> paramMap) {
+		return sqlSession.selectOne("statsmng.selectOne", paramMap);
+	}
+
+	@Override
+	public void boardDel(Map<String, Object> paramMap) {
+		sqlSession.update("statsmng.delete", paramMap);
+	}
+
+	@Override
+	public void boardUpdate(Map<String, Object> paramMap) {
+		sqlSession.update("statsmng.update", paramMap);
+	}
+
+	@Override
+	public int boardNo(Map<String, Object> paramMap) {
+		return sqlSession.selectOne("statsmng.selectNo", paramMap);
+	}
+
+	@Override
+	public void cntUpdate(Map<String, Object> paramMap) {
+		sqlSession.update("statsmng.cntUpdate", paramMap);
+	}
+	
+	
+	
+}

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -26,7 +26,8 @@ Globals.Password= FAIRNETUR!@#$
 
 # oracle
 Globals.DriverClassName=oracle.jdbc.OracleDriver
-Globals.Url=jdbc:oracle:thin:@192.168.0.30:1523:XE
+#Globals.Url=jdbc:oracle:thin:@192.168.0.30:1523:XE
+Globals.Url=jdbc:oracle:thin:@192.168.0.87:1523:XE
 
 # MainPage Setting(admin)
 Globals.MainPage = /cmm/main/mainPage.do

src/main/webapp/META-INF/context.xml

@@ -9,7 +9,7 @@
 		username="FAIRNETUR"
 		password="FAIRNETUR!@#$"
 		type="javax.sql.DataSource"
-		url="jdbc:oracle:thin:@192.168.0.30:1523/XE"
+		url="jdbc:oracle:thin:@192.168.0.87:1523/XE"
 		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
 	/>
 	<Resource
@@ -19,7 +19,7 @@
 		username="FAIRNETUR"
 		password="FAIRNETUR!@#$"
 		type="javax.sql.DataSource"
-		url="jdbc:oracle:thin:@192.168.0.30:1523/XE"
+		url="jdbc:oracle:thin:@192.168.0.87:1523/XE"
 		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
 	/>
 	<Resource
@@ -29,7 +29,7 @@
 		username="FAIRNETUR"
 		password="FAIRNETUR!@#$"
 		type="javax.sql.DataSource"
-		url="jdbc:oracle:thin:@192.168.0.30:1523/XE"
+		url="jdbc:oracle:thin:@192.168.0.87:1523/XE"
 		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
 	/>
 </Context>

src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp

@@ -73,7 +73,7 @@
 		
 		<!-- 캘린더js -->
 		<script src="/js/moment.min.js"></script>
-<!-- 		<script src="/js/fullcalendar.min.js"></script> -->
+		<script src="/js/fullcalendar.min.js"></script>
 		<script src="/js/scheduler.min.js"></script>
 		<script src="/js/gcal.js"></script>
 		<script src="/js/jquery.qtip.js"></script>

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/statsmng/statsList.jsp

@@ -98,7 +98,8 @@ function clipCall(){
 	
 	var f = document.frm;
 	f.target = "blank";
-	f.action = "/clip/ClipReport4/ClipReportViewer/ClipReport4.do";
+	//f.action = "/clip/ClipReport4/ClipReportViewer/ClipReport4.do";
+	f.action = "/clip/ozReport/OzReport.do";
 	f.submit();
 	f.target = "_self";
 }