diff --git a/list.txt b/list.txt index 943d4e70..459dff2e 100644 --- a/list.txt +++ b/list.txt @@ -1,28 +1 @@ -src\main\webapp\WEB-INF\views\home\include\top.jsp -src\main\java\geoinfo\main\main\MainController.java -src\main\java\geoinfo\main\login\LoginController.java -src\main\java\geoinfo\training\home\HomeTrainingController.java -src\main\java\geoinfo\training\home\service\HomeTrainingService.java -src\main\java\geoinfo\training\home\service\impl\HomeTrainingServiceImpl.java -src\main\java\geoinfo\training\home\service\HomeTrainingMapper.java -src\main\resources\egovframework\sqlmap\mapper\training\home\HomeTrainingMapper.xml -src\main\webapp\WEB-INF\views\visitEducationApplication\inquiry\visitEducationApplicationInquiry.jsp -src\main\webapp\WEB-INF\views\visitEducationApplication\input\visitEducationApplicationInput.jsp -src\main\webapp\com\img\visitEducationApplication\visitEducationApplicationSample.svg -src\main\webapp\WEB-INF\views\homeEducationApplication\inquiry\homeEducationApplicationInquiry.jsp -src\main\webapp\WEB-INF\views\homeEducationApplication\input\homeEducationApplicationInput.jsp -src\main\webapp\WEB-INF\views\home\main.jsp -src\main\webapp\WEB-INF\views\home\include\left_menu.jsp -src\main\webapp\com\css\common.v2.0.css -src\main\webapp\WEB-INF\views\home\index.jsp -src\main\webapp\com\img\common\bg\main_info_visual_20240905.png -src\main\webapp\com\img\common\bg\main_info_visual_20240906.png -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff2 -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.otf -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff2 -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf -src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml -src\main\resources\egovframework\spring\context-mybatis.xml -src\main\webapp\WEB-INF\views\home\main.jsp +src\main\resources\egovframework\egovProps\globals.properties \ No newline at end of file diff --git a/src/main/java/geoinfo/regi/complete/CompleteController.java b/src/main/java/geoinfo/regi/complete/CompleteController.java index ef102489..fff7b7d6 100644 --- a/src/main/java/geoinfo/regi/complete/CompleteController.java +++ b/src/main/java/geoinfo/regi/complete/CompleteController.java @@ -1,13 +1,16 @@ package geoinfo.regi.complete; import geoinfo.com.GeoinfoCommon; +import geoinfo.com.PaginationInfo; import geoinfo.regi.complete.service.CompleteService; +import geoinfo.util.MyUtil; import ictway.comm.util.strUtil; import ictway.comm.web.WebUtil; import ictway.session.UserInfoYu; import java.sql.SQLException; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import javax.annotation.Resource; @@ -15,12 +18,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jfree.util.Log; +import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.util.UrlPathHelper; @Controller @@ -72,66 +78,18 @@ public class CompleteController { // 지반정보 입력시스템 - 검수등록완료 목록 @RequestMapping(value = "/manage/complete") public String complete(@RequestParam HashMap params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { + // 관리자 아닐 경우 back(); if (!request.getSession().getAttribute("CLS").equals("9")) { return ""; } - - strUtil sUtil = new strUtil(); - WebUtil wUtil = new WebUtil(); - wUtil.topTabId = "manageComplete"; // 검수일때 tab 활성화 시켜주기 위해 - String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID")); - - // request - //240108 임효주 프로젝트 목록에 검색조건 추가 - String srchStartDate = sUtil.checkNull((String)params.get("startDate")); - String srchEndDate = sUtil.checkNull((String)params.get("endDate")); - String srchReportType = sUtil.checkNull((String)params.get("searchReportType")); - String searchProjectName = sUtil.checkNull((String)params.get("searchProjectName")); - String searchProjectCode = sUtil.checkNull((String)params.get("searchProjectCode")); - String searchHistSeq = sUtil.checkNull((String)params.get("searchHistSeq")); - String searchUserName = sUtil.checkNull((String)params.get("searchUserName")); - String searchCreateName = sUtil.checkNull((String)params.get("searchCreateName")); - - ArrayList arrayData = new ArrayList(); - ArrayList arrayColumn = new ArrayList(); - ArrayList arrayCommon = new ArrayList(); - HashMap mapCommon = new HashMap(); - - int count = 0; - // data조회 + try { - // **************************************공통코드**************************************// - String commCode = "CM016"; - String commCode02 = "'CM016'"; - params.put("commCode", commCode); - - // common Array 로 받기 - arrayCommon = completeService.selectWebCommCode(params); - - // SelectBox형태로 map으로 받기 - mapCommon = wUtil.getCommCodeSel(commCode, arrayCommon, ""); - - params.put("srchReportType", srchReportType); - params.put("searchProjectName", searchProjectName); - params.put("searchProjectCode", searchProjectCode); - params.put("searchHistSeq", searchHistSeq); - params.put("searchUserName", searchUserName); - params.put("searchCreateName", searchCreateName); - /*params.put("LoginUserId", LoginUserId);*/ - - // data정보 - arrayData = completeService.selectCompleteItems(params); + String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID")); params.put("LoginUserId", LoginUserId); - // column정보 - // arrayColumn = wUtil.getColArrayList(rsmd, count); - - model.put("arrayCommon", arrayCommon); - model.put("result", arrayData); model.put("params", params); - - } catch (SQLException e) { - Log.debug("error", e); + model.put("result", new ArrayList()); + //completeService.getCompleteList(request, response, null, params, model); } catch (NumberFormatException e) { Log.debug("error", e); } catch (Exception e) { @@ -140,4 +98,56 @@ public class CompleteController { return "web/manage/complete"; } + + + @RequestMapping(value = "/manage/complete/list.do", method = RequestMethod.GET) + @ResponseBody + public JSONObject getCompleteList( + HttpServletRequest request, + @RequestParam HashMap params, + HttpServletResponse response) { + + + JSONObject jsonResponse = new JSONObject(); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "params.toString()" + params.toString() + "\n" + + "\n--------------------------------------------------------------\n" + ); + + + try { + completeService.getCompleteList(request, response, jsonResponse, params, null); + jsonResponse.put("resultCode", 100); + jsonResponse.put("result", "true"); + jsonResponse.put("message", "조회가 완료되었습니다."); + + } catch (Exception e) { + // TODO Auto-generated catch block + String strTxt = + "---------- BUG REPORTING START ----------" + "\n" + + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + + "---------- BUG REPORTING END ----------" + "\n" + + ""; + System.out.println(strTxt); + jsonResponse.put("resultCode", -1); + jsonResponse.put("result", "false"); + jsonResponse.put("message", e.getMessage()); + } + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " OUT:" + + "\n--------------------------------------------------------------\n" + + "jsonResponse.toJSONString():[" + jsonResponse.toJSONString() + "]\n" + + "\n--------------------------------------------------------------\n" + ); + + return jsonResponse; + } } diff --git a/src/main/java/geoinfo/regi/complete/service/CompleteMapper.java b/src/main/java/geoinfo/regi/complete/service/CompleteMapper.java index ab232d36..3402b3fa 100644 --- a/src/main/java/geoinfo/regi/complete/service/CompleteMapper.java +++ b/src/main/java/geoinfo/regi/complete/service/CompleteMapper.java @@ -14,4 +14,6 @@ public interface CompleteMapper { public ArrayList selectWebCommCode(HashMap params) throws Exception; public ArrayList selectCompleteItems(HashMap params) throws Exception; + + public long selectCompleteItemsCnt(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/complete/service/CompleteService.java b/src/main/java/geoinfo/regi/complete/service/CompleteService.java index 88b4f379..e13111da 100644 --- a/src/main/java/geoinfo/regi/complete/service/CompleteService.java +++ b/src/main/java/geoinfo/regi/complete/service/CompleteService.java @@ -3,6 +3,12 @@ package geoinfo.regi.complete.service; import java.util.ArrayList; import java.util.HashMap; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.json.simple.JSONObject; +import org.springframework.ui.ModelMap; + public interface CompleteService { @@ -10,5 +16,7 @@ public interface CompleteService { ArrayList selectCompleteItems(HashMap params) throws Exception; + long selectCompleteItemsCnt(HashMap params) throws Exception; + public void getCompleteList(HttpServletRequest request, HttpServletResponse response, JSONObject jsonResponse, HashMap params, ModelMap model) throws Exception; } diff --git a/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java b/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java index 87dd9be8..3ab7eb04 100644 --- a/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java +++ b/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java @@ -1,17 +1,30 @@ package geoinfo.regi.complete.service.impl; +import java.sql.SQLException; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Enumeration; import java.util.HashMap; import egovframework.rte.psl.dataaccess.util.EgovMap; +import geoinfo.com.PaginationInfo; import geoinfo.regi.complete.service.CompleteMapper; import geoinfo.regi.complete.service.CompleteService; import geoinfo.regi.status.service.RegiPageMapper; import geoinfo.regi.status.service.RegiPageService; +import geoinfo.util.MyUtil; +import ictway.comm.util.strUtil; +import ictway.comm.web.WebUtil; +import oracle.sql.TIMESTAMP; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jfree.util.Log; +import org.json.simple.JSONObject; import org.springframework.stereotype.Service; +import org.springframework.ui.ModelMap; import java.util.HashMap; import java.util.List; @@ -36,4 +49,114 @@ public class CompleteServiceImpl implements CompleteService { return completeMapper.selectCompleteItems(params); } + @Override + public long selectCompleteItemsCnt(HashMap params) throws Exception { + return completeMapper.selectCompleteItemsCnt(params); + } + + @Override + public void getCompleteList(HttpServletRequest request, HttpServletResponse response, JSONObject jsonResponse, HashMap params, ModelMap model) throws Exception { + + // 관리자 아닐 경우 back(); + if (!request.getSession().getAttribute("CLS").equals("9")) { + throw new Exception( "로그인이 필요한 서비스 입니다." ); + } + + strUtil sUtil = new strUtil(); + WebUtil wUtil = new WebUtil(); + wUtil.topTabId = "manageComplete"; // 검수일때 tab 활성화 시켜주기 위해 + String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID")); + + // request + //240108 임효주 프로젝트 목록에 검색조건 추가 + String srchStartDate = sUtil.checkNull((String)params.get("startDate")); + String srchEndDate = sUtil.checkNull((String)params.get("endDate")); + String srchReportType = sUtil.checkNull((String)params.get("searchReportType")); + String searchProjectName = sUtil.checkNull((String)params.get("searchProjectName")); + String searchProjectCode = sUtil.checkNull((String)params.get("searchProjectCode")); + String searchHistSeq = sUtil.checkNull((String)params.get("searchHistSeq")); + String searchUserName = sUtil.checkNull((String)params.get("searchUserName")); + String searchCreateName = sUtil.checkNull((String)params.get("searchCreateName")); + + ArrayList arrayData = new ArrayList(); + ArrayList arrayColumn = new ArrayList(); + ArrayList arrayCommon = new ArrayList(); + HashMap mapCommon = new HashMap(); + + int count = 0; + + // **************************************공통코드**************************************// + String commCode = "CM016"; + String commCode02 = "'CM016'"; + params.put("commCode", commCode); + + // common Array 로 받기 + arrayCommon = selectWebCommCode(params); + + // SelectBox형태로 map으로 받기 + mapCommon = wUtil.getCommCodeSel(commCode, arrayCommon, ""); + + params.put("srchReportType", srchReportType); + params.put("searchProjectName", searchProjectName); + params.put("searchProjectCode", searchProjectCode); + params.put("searchHistSeq", searchHistSeq); + params.put("searchUserName", searchUserName); + params.put("searchCreateName", searchCreateName); + /*params.put("LoginUserId", LoginUserId);*/ + + Long pageSize = MyUtil.getLongFromObject( params.get("pageSize") ); + if( pageSize == null ) { + pageSize = 10l; + } + + PaginationInfo paginationInfo = new PaginationInfo(); + + paginationInfo.setRecordCountPerPage(10); + paginationInfo.setPageSize(pageSize.intValue()); + paginationInfo.setTotalRecordCount( MyUtil.getIntegerFromObject(selectCompleteItemsCnt(params)).intValue() ); + + if (params.get("pageIndex") == null || params.get("pageIndex").equals("") || Integer.parseInt((String) params.get("pageIndex"))<=0 ) { + paginationInfo.setCurrentPageNo(1); + params.put("pageIndex", 1); + }else if(Integer.parseInt((String)params.get("pageIndex")) > paginationInfo.getLastPageNo()){ + paginationInfo.setCurrentPageNo(paginationInfo.getLastPageNo()); + params.put("pageIndex", paginationInfo.getLastPageNo()); + }else { + paginationInfo.setCurrentPageNo((Integer) Integer.valueOf((String) params.get("pageIndex"))); + } + + params.put("firstIndex", paginationInfo.getFirstRecordIndex()); + params.put("recordCountPerPage", paginationInfo.getRecordCountPerPage()); + + + // data정보 + arrayData = selectCompleteItems(params); + params.put("LoginUserId", LoginUserId); + // column정보 + // arrayColumn = wUtil.getColArrayList(rsmd, count); + + if( model != null ) { + model.put("paginationInfo", paginationInfo); + model.put("arrayCommon", arrayCommon); + //model.put("result", arrayData); + model.put("params", params); + } + + if( jsonResponse != null ) { + jsonResponse.put("paginationInfo", paginationInfo); + jsonResponse.put("arrayCommon", arrayCommon); + jsonResponse.put("data", arrayData); + jsonResponse.put("params", params); +/* + jsonResponse.put("take", 1); + jsonResponse.put("skip", 2); + jsonResponse.put("page", 3); + jsonResponse.put("pageSize", 4); + */ + jsonResponse.put("filter", null); + jsonResponse.put("total", paginationInfo.getTotalRecordCount()); + + } + + } } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml index f7eedd01..b05faea9 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml @@ -15,25 +15,99 @@ + +
diff --git a/src/main/webapp/web/preview/HOLE.reb b/src/main/webapp/web/preview/HOLE.reb index d558ee20..06c20fb1 100644 Binary files a/src/main/webapp/web/preview/HOLE.reb and b/src/main/webapp/web/preview/HOLE.reb differ diff --git a/src/main/webapp/web/preview/HOLE_origin.reb b/src/main/webapp/web/preview/HOLE_origin.reb new file mode 100644 index 00000000..67d9cb09 Binary files /dev/null and b/src/main/webapp/web/preview/HOLE_origin.reb differ diff --git a/src/main/webapp/web/preview/HOLE_thkim_20241105.reb b/src/main/webapp/web/preview/HOLE_thkim_20241105.reb new file mode 100644 index 00000000..d558ee20 Binary files /dev/null and b/src/main/webapp/web/preview/HOLE_thkim_20241105.reb differ