From d0785059ea6637dcea85df11bd205850d6566bc8 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 17 Oct 2025 16:31:26 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20admin=5Fuser=20=EB=A5=BC=20cls=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EA=B5=AC=EB=B6=84=ED=95=98=EB=8A=94=201?= =?UTF-8?q?=EC=B0=A8=20=EC=9E=91=EC=97=85.=20=EC=95=84=EC=A7=81=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=EB=90=9C=20=EA=B2=83=EC=9D=80=20=EC=95=84?= =?UTF-8?q?=EB=8B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/geoinfo/com/WebConfirm.java | 15 ----- .../geoinfo/main/main/MainController.java | 19 ++++-- .../coordSearch/MapCoordSearchController.java | 9 ++- .../information/MapInformationController.java | 31 ++++++--- .../geoinfo/map/left/MapLeftController.java | 26 +++++--- .../MapProjectSearchController.java | 8 ++- .../service/impl/CompleteServiceImpl.java | 4 ++ .../HoleCoordinateController.java | 5 ++ .../geoinfo/regi/status/RegiController.java | 5 +- .../service/impl/RegiPageServiceImpl.java | 3 +- src/main/java/geoinfo/util/JwtUtil.java | 57 ++++++++++++++++ .../sqlmap/mapper/regi/complete.xml | 4 +- .../sqlmap/mapper/regi/complete_SQL.xml | 4 +- .../sqlmap/mapper/regi/holeCoord.xml | 65 ++++++++++--------- .../egovframework/sqlmap/mapper/regi/regi.xml | 2 +- .../views/body/download/downloadPurpose.jsp | 2 +- .../WEB-INF/views/home/include/left_menu.jsp | 2 +- .../webapp/WEB-INF/views/home/include/top.jsp | 4 +- src/main/webapp/WEB-INF/views/home/index.jsp | 2 +- src/main/webapp/WEB-INF/views/home/main.jsp | 6 +- .../WEB-INF/views/layouts/home/main.jsp | 8 +-- .../web/include/includeTopInput_2021_back.jsp | 2 +- .../WEB-INF/views/web/manage/complete.jsp | 8 +-- .../views/web/manage/complete_2021_back.jsp | 6 +- .../WEB-INF/views/web/manage/complete_old.jsp | 4 +- .../WEB-INF/views/web/manage/hole_coord.jsp | 4 +- .../views/web/manage/hole_coord_2021_back.jsp | 4 +- .../views/web/manage/hole_coord_old.jsp | 2 +- .../webapp/WEB-INF/views/web/manage/list.jsp | 8 +-- .../views/web/manage/list_2021_back.jsp | 8 +-- .../WEB-INF/views/web/manage/list_old.jsp | 8 +-- .../WEB-INF/views/web/manage/re_name.jsp | 2 +- .../WEB-INF/views/web/project/checklist.jsp | 2 +- 33 files changed, 216 insertions(+), 123 deletions(-) create mode 100644 src/main/java/geoinfo/util/JwtUtil.java diff --git a/src/main/java/geoinfo/com/WebConfirm.java b/src/main/java/geoinfo/com/WebConfirm.java index 4ad77d4f..b09ed5e3 100644 --- a/src/main/java/geoinfo/com/WebConfirm.java +++ b/src/main/java/geoinfo/com/WebConfirm.java @@ -8,7 +8,6 @@ import java.util.*; import javax.servlet.http.HttpServletRequest; -import org.jfree.util.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,14 +26,6 @@ public class WebConfirm WebUtil wUtil = new WebUtil(); - //String user = "geoinfo"; - //String pw = "geoinfo"; - //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl"; - /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/ - //String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버 - //String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 - //String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버 - String url = EgovProperties.getProperty("Oracle.Url").trim(); String user = EgovProperties.getProperty("Oracle.ID").trim(); String pw = EgovProperties.getProperty("Oracle.Password").trim(); @@ -1757,9 +1748,6 @@ public class WebConfirm if (s == null) { s = ""; } - else { - s = s; - } return s; } @@ -1767,9 +1755,6 @@ public class WebConfirm if (s == null) { s = re; } - else { - s = s; - } return s; } } diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index 1b190b71..c9147ab9 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -54,6 +54,7 @@ import geoinfo.com.file.service.FileService; import geoinfo.main.login.LoginController; import geoinfo.main.main.service.MainService; import geoinfo.regi.status.service.RegiPageService; +import geoinfo.util.JwtUtil; import geoinfo.util.MobileCertificationUtil; import geoinfo.util.MyUtil; import geoinfo.util.RequestWrapper; @@ -178,9 +179,10 @@ public class MainController { ModelAndView mv = new ModelAndView(); - String src = request.getParameter("src"); - int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + mv.addObject("cls", nCls); + + String src = request.getParameter("src"); if( src != null && src.toLowerCase().equals("drilling") ) { mv.addObject("isFromDrillingSystem", true); @@ -683,8 +685,13 @@ public class MainController @RequestMapping(value = "/situTable.do") public ModelAndView situTable(@RequestParam Map params, HttpServletRequest request, HttpServletResponse response) throws Exception { + + ModelAndView mv = new ModelAndView("body/jiban_info/situTable"); + int nCls = JwtUtil.getCls(request); + mv.addObject("cls", nCls); + List year = mainService.selectYearStart(); mv.addObject("year", year); @@ -752,7 +759,7 @@ public class MainController List> result = mainService.selectSituTable(map); Iterator> iter = result.iterator(); - if (!userid.equals(particularId1) && !userid.equals("admin_user")) { + if (!userid.equals(particularId1) && !userid.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("pcode").equals(particularProjectCode1)) { iter.remove(); @@ -761,7 +768,7 @@ public class MainController } iter = result.iterator(); - if (!userid.equals(particularId2) && !userid.equals("admin_user")) { + if (!userid.equals(particularId2) && !userid.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("pcode").equals(particularProjectCode2)) { iter.remove(); @@ -1039,6 +1046,8 @@ public class MainController { ModelAndView mv = new ModelAndView("home/index"); + int nCls = JwtUtil.getCls(request); + // 다운로드 파일 목록 map.put("target", "home"); try { @@ -1114,7 +1123,7 @@ public class MainController mod_cnt = ""; // 수정요청 - if ("admin_user".equals(userid) == true) { + if ("admin_user".equals(userid) == true || nCls == 65535) { EgovMap regiCount = commonService.getRegiCountAdmin(); mv.addObject("WAIT_CNT", regiCount.get("waitCnt")); mv.addObject("CONFIRM_CNT", regiCount.get("confirmCnt")); diff --git a/src/main/java/geoinfo/map/coordSearch/MapCoordSearchController.java b/src/main/java/geoinfo/map/coordSearch/MapCoordSearchController.java index b717e8d8..e2bb7579 100644 --- a/src/main/java/geoinfo/map/coordSearch/MapCoordSearchController.java +++ b/src/main/java/geoinfo/map/coordSearch/MapCoordSearchController.java @@ -29,6 +29,7 @@ import egovframework.com.cmm.service.EgovProperties; import egovframework.rte.psl.dataaccess.util.EgovMap; import geoinfo.com.GeoinfoCommon; import geoinfo.map.coordSearch.service.MapCoordSearchService; +import geoinfo.util.MyUtil; @Controller public class MapCoordSearchController { @@ -183,6 +184,8 @@ public class MapCoordSearchController { @RequestMapping(value = "/map/coordSearch.do") public String coordSearch(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + String tmx = GeoinfoCommon.parseData(String.valueOf(params.get("tmx"))); String tmy = GeoinfoCommon.parseData(String.valueOf(params.get("tmy"))); String tawon = GeoinfoCommon.parseData(String.valueOf(params.get("tawon")));// 1.bessel @@ -483,8 +486,8 @@ public class MapCoordSearchController { Iterator iter = items.iterator(); String userId = (String)request.getSession().getAttribute("USERID"); - - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { String code = (String)iter.next().get("holeCode"); code = code.substring(0, 5); @@ -496,7 +499,7 @@ public class MapCoordSearchController { } iter = items.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { String code = (String)iter.next().get("holeCode"); code = code.substring(0, 5); diff --git a/src/main/java/geoinfo/map/information/MapInformationController.java b/src/main/java/geoinfo/map/information/MapInformationController.java index 6c8435fc..965a86c9 100644 --- a/src/main/java/geoinfo/map/information/MapInformationController.java +++ b/src/main/java/geoinfo/map/information/MapInformationController.java @@ -44,6 +44,7 @@ import geoinfo.com.GeoinfoCommon; import geoinfo.map.information.service.MapInformationService; import geoinfo.map.mapControl.service.MapControlService; import geoinfo.regi.util.exportGeotechnicalPointShp2; +import geoinfo.util.MyUtil; import geoinfo.util.RequestWrapper; import net.sf.json.JSONArray; import net.sf.json.JSONException; @@ -69,7 +70,9 @@ public class MapInformationController { @RequestMapping(value = "/map/detailSichuDownCh.do") public String detailSichuDownCh(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { - + + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + String userId = (String)request.getSession().getAttribute("USERID"); params.put("userId", userId); @@ -150,7 +153,7 @@ public class MapInformationController { List items = mapControlService.selectDetailItems(params); Iterator itr = items.iterator(); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -162,7 +165,7 @@ public class MapInformationController { } itr = items.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -207,6 +210,8 @@ public class MapInformationController { public String detailSichuS(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { int holeCount = 0; + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + String minx = GeoinfoCommon.parseData(String.valueOf(params.get("minx"))); String maxx = GeoinfoCommon.parseData(String.valueOf(params.get("maxx"))); String miny = GeoinfoCommon.parseData(String.valueOf(params.get("miny"))); @@ -298,7 +303,7 @@ public class MapInformationController { holeList = mapInformationService.selectHoleList(params); itr = holeList.iterator(); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -310,7 +315,7 @@ public class MapInformationController { } itr = holeList.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -361,7 +366,7 @@ public class MapInformationController { items = mapInformationService.selectInfoItems(params); itr = items.iterator(); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -373,7 +378,7 @@ public class MapInformationController { } itr = items.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -402,6 +407,8 @@ public class MapInformationController { String temp = GeoinfoCommon.parseData(String.valueOf(params.get("sichuValue"))); int holeCount = Integer.parseInt(temp); int totalCnt = 0; + + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); model.put("userId", request.getSession().getAttribute("USERID")); @@ -431,7 +438,7 @@ public class MapInformationController { List holeList = mapInformationService.selectHoleList(params); Iterator itr = holeList.iterator(); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -443,7 +450,7 @@ public class MapInformationController { } itr = holeList.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (itr.hasNext()) { String code = (String)itr.next().get("holeCode"); code = code.substring(0, 5); @@ -505,6 +512,9 @@ public class MapInformationController { if(request.getSession().getAttribute("USERID") == null) { return "redirect:/index.do"; } + + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + String fName = ""; String folder = ""; String mId = ""; @@ -585,7 +595,8 @@ public class MapInformationController { model.put("project", projectList); model.put("params", params); - + model.put("cls", nCls); + //return "map/popup/downloadPurpose"; return "map/popup/downloadPurposeSichuNew"; } diff --git a/src/main/java/geoinfo/map/left/MapLeftController.java b/src/main/java/geoinfo/map/left/MapLeftController.java index 452d80ff..fc4c6ddc 100644 --- a/src/main/java/geoinfo/map/left/MapLeftController.java +++ b/src/main/java/geoinfo/map/left/MapLeftController.java @@ -56,6 +56,8 @@ import geoinfo.map.left.service.MapLeftService; import geoinfo.map.mapControl.service.MapControlService; import geoinfo.regi.header.service.HeaderService; import geoinfo.regi.util.exportShp; +import geoinfo.util.JwtUtil; +import geoinfo.util.MyUtil; import geoinfo.util.RequestWrapper; @@ -314,6 +316,8 @@ public class MapLeftController { @RequestMapping(value = "/map/mapSearchAllArea.do") public String mapSearchAllArea(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + String sido = GeoinfoCommon.parseData(params.get("sido").toString()); String gugun = GeoinfoCommon.parseData(params.get("gugun").toString()); String dong = GeoinfoCommon.parseData(params.get("dong").toString()); @@ -535,7 +539,7 @@ public class MapLeftController { String userId = (String)request.getSession().getAttribute("USERID"); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("projectCode").equals(particularProjectCode1)) { iter.remove(); @@ -544,7 +548,7 @@ public class MapLeftController { } iter = result.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("projectCode").equals(particularProjectCode2)) { iter.remove(); @@ -566,6 +570,8 @@ public class MapLeftController { @RequestMapping(value = "/map/mapSearchPolygonCheck.do") public String mapSearchPolygonCheck(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { + int nCls = JwtUtil.getCls(request); + String holeCode = ""; String polygonType = (String)(params.get("polygonType")); String minX = GeoinfoCommon.parseData(String.valueOf(params.get("minX"))); @@ -629,7 +635,7 @@ public class MapLeftController { String userId = (String)request.getSession().getAttribute("USERID"); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { String code = (String)iter.next().get("code"); code = code.substring(0, 5); @@ -641,7 +647,7 @@ public class MapLeftController { } iter = searchHoleCode.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { String code = (String)iter.next().get("code"); code = code.substring(0, 5); @@ -739,6 +745,8 @@ public class MapLeftController { @RequestMapping(value = "/map/mapSearchSqurePolygonCheck.do") public String mapSearchSqurePolygonCheck(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { + int nCls = JwtUtil.getCls(request); + String holeCode = ""; String polygonType = "squre"; EgovMap searchPassCount = mapControlService.searchPassCountHoleCode(params); @@ -757,7 +765,7 @@ public class MapLeftController { String userId = (String)request.getSession().getAttribute("USERID"); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { String code = (String)iter.next().get("code"); code = code.substring(0, 5); @@ -769,7 +777,7 @@ public class MapLeftController { } iter = data.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { String code = (String)iter.next().get("code"); code = code.substring(0, 5); @@ -808,6 +816,8 @@ public class MapLeftController { @RequestMapping(value = "/map/mapSearchArea.do") public String mapSearchArea(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { + int nCls = JwtUtil.getCls(request); + String sido = GeoinfoCommon.parseData(params.get("sido").toString()); String gugun = GeoinfoCommon.parseData(params.get("gugun").toString()); String dong = GeoinfoCommon.parseData(params.get("dong").toString()); @@ -896,7 +906,7 @@ public class MapLeftController { List result = mapLeftService.getAreaSearchList(params); Iterator iter = result.iterator(); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("projectCode").equals(particularProjectCode1)) { iter.remove(); @@ -905,7 +915,7 @@ public class MapLeftController { } iter = result.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("projectCode").equals(particularProjectCode2)) { iter.remove(); diff --git a/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java b/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java index cd24b7f5..4e8b6fac 100644 --- a/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java +++ b/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java @@ -4,6 +4,7 @@ import egovframework.com.cmm.service.EgovProperties; import egovframework.rte.psl.dataaccess.util.EgovMap; import geoinfo.com.GeoinfoCommon; import geoinfo.map.projectSearch.service.MapProjectSearchService; +import geoinfo.util.MyUtil; import java.net.URLDecoder; import java.util.ArrayList; @@ -34,6 +35,9 @@ public class MapProjectSearchController { @RequestMapping(value = "/map/projectSearch.do") public String projectSearch(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map params) throws Exception { + + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + String test1 = GeoinfoCommon.parseData(String.valueOf(params.get("test1"))); String tcr = GeoinfoCommon.parseData(String.valueOf(params.get("tcr"))); String dsf = GeoinfoCommon.parseData(String.valueOf(params.get("dsf")));// @@ -283,7 +287,7 @@ public class MapProjectSearchController { } Iterator iter = items.iterator(); - if (!userId.equals(particularId1) && !userId.equals("admin_user")) { + if (!userId.equals(particularId1) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("projectCode").equals(particularProjectCode1)) { iter.remove(); @@ -292,7 +296,7 @@ public class MapProjectSearchController { } iter = items.iterator(); - if (!userId.equals(particularId2) && !userId.equals("admin_user")) { + if (!userId.equals(particularId2) && !userId.equals("admin_user") && nCls != 65535) { while (iter.hasNext()) { if (iter.next().get("projectCode").equals(particularProjectCode2)) { iter.remove(); 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 3ab7eb04..3fb37183 100644 --- a/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java +++ b/src/main/java/geoinfo/regi/complete/service/impl/CompleteServiceImpl.java @@ -57,6 +57,8 @@ public class CompleteServiceImpl implements CompleteService { @Override public void getCompleteList(HttpServletRequest request, HttpServletResponse response, JSONObject jsonResponse, HashMap params, ModelMap model) throws Exception { + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + // 관리자 아닐 경우 back(); if (!request.getSession().getAttribute("CLS").equals("9")) { throw new Exception( "로그인이 필요한 서비스 입니다." ); @@ -103,6 +105,7 @@ public class CompleteServiceImpl implements CompleteService { params.put("searchUserName", searchUserName); params.put("searchCreateName", searchCreateName); /*params.put("LoginUserId", LoginUserId);*/ + params.put("cls", nCls); Long pageSize = MyUtil.getLongFromObject( params.get("pageSize") ); if( pageSize == null ) { @@ -129,6 +132,7 @@ public class CompleteServiceImpl implements CompleteService { params.put("recordCountPerPage", paginationInfo.getRecordCountPerPage()); + params.put("cls", nCls); // data정보 arrayData = selectCompleteItems(params); params.put("LoginUserId", LoginUserId); diff --git a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java index 88832341..50ec0a24 100644 --- a/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java +++ b/src/main/java/geoinfo/regi/holeCoordinate/HoleCoordinateController.java @@ -20,6 +20,7 @@ import egovframework.com.json.JSONObject; import geoinfo.regi.holeCoordinate.service.HoleCoordinateService; import geoinfo.regi.manageList.service.ManageListService; import geoinfo.regi.status.service.RegiPageService; +import geoinfo.util.MyUtil; import ictway.comm.util.parseData; import ictway.comm.web.WebUtil; @@ -38,6 +39,9 @@ public class HoleCoordinateController { // 지반정보등록 (관리자) - 좌표수정목록 @RequestMapping(value = "/holeCoord.do") public String holeCoord(@RequestParam HashMap params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { + + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + strUtil sUtil = new strUtil(); WebUtil wUtil = new WebUtil(); wUtil.topTabId = "manageCoordinate"; // 검수일때 tab 활성화 시켜주기 위해 @@ -50,6 +54,7 @@ public class HoleCoordinateController { String searchUserName = sUtil.checkNull(parseData.parseData((String)params.get("searchUserName"))); String searchCreateName = sUtil.checkNull(parseData.parseData((String)params.get("searchCreateName"))); params.put("loginUserId", loginUserId); + params.put("cls", nCls); int count = 0; diff --git a/src/main/java/geoinfo/regi/status/RegiController.java b/src/main/java/geoinfo/regi/status/RegiController.java index 275befe3..84b573e3 100644 --- a/src/main/java/geoinfo/regi/status/RegiController.java +++ b/src/main/java/geoinfo/regi/status/RegiController.java @@ -66,6 +66,9 @@ public class RegiController { // 지반정보 입력시스템 - 프로젝트 현황 @RequestMapping(value = "/webManage.do") public String manageRegi(ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { + + int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + WebUtil wUtil = new WebUtil(); wUtil.topTabId = "manageIndex"; // 검수일때 tab 활성화 시켜주기 위해 String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID")); @@ -74,7 +77,7 @@ public class RegiController { int ING_CNT = 0; int CONFIRM_CNT = 0; - if ("admin_user".equals(LoginUserId) == false) { + if ("admin_user".equals(LoginUserId) == false && nCls != 65535) { EgovMap regiCount = masterService.getRegiCountAdmin(); model.addAttribute("WAIT_CNT", regiCount.get("WAIT_CNT")); diff --git a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java index 717c893f..a41d59f1 100644 --- a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java +++ b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java @@ -159,7 +159,8 @@ public class RegiPageServiceImpl implements RegiPageService { return regiPageMapper.selectWebCommCode(params); } - @Override + // thkim 20251017 기준 selectCompleteItems를 호출하는 곳이 없음 + @Override public ArrayList selectCompleteItems(HashMap params) throws Exception { return regiPageMapper.selectCompleteItems(params); } diff --git a/src/main/java/geoinfo/util/JwtUtil.java b/src/main/java/geoinfo/util/JwtUtil.java new file mode 100644 index 00000000..c19e2825 --- /dev/null +++ b/src/main/java/geoinfo/util/JwtUtil.java @@ -0,0 +1,57 @@ +package geoinfo.util; + +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.net.URLDecoder; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.*; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.httpclient.NameValuePair; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; +import org.json.simple.parser.ParseException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +/** + * JWT 용 util class + * @author thkim + * + */ +public final class JwtUtil { + + private static final Logger logger = LoggerFactory.getLogger(JwtUtil.class); + + public static final String VERSION = "20251017_1430"; + + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss"); + + // 주석 다는 기준: https://www.oracle.com/technetwork/java/javase/tech/index-137868.html + + /* + * 로그인 된 사용자의 cls값을 구한다. + */ + public static int getCls(HttpServletRequest request) { + if( request.getSession() != null ) { + return -1; + } + + if( request.getSession().getAttribute("CLS") == null ) { + return -1; + } + + return MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS")); + } + + +} diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml index 7ab02cd2..23e2340b 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml @@ -3,7 +3,7 @@ - + 'N' AND STATE = '6' - AND REPORT_TYPE = 'CH' - ) T - WHERE 1=1 ]]> - - - - - - - - - - - - - - + FROM ( + SELECT + CLASS_CODE, PROJECT_CODE, REPORT_TYPE, FUNC_COMM_NAME('CM016',REPORT_TYPE ) REPORT_TYPE_NAME + , PROJECT_NAME, USERID, (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = INFO.USERID) AS USER_NAME + , STATE, FUNC_COMM_NAME('CM001',STATE ) STATE_NAME, (SELECT (SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = M.USERID) + FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE ) AS CREATE_NAME + , (SELECT M.USERID FROM TEMP_MANAGE_STATE M WHERE M.PROJECT_CODE = INFO.PROJECT_CODE) AS CREATE_USERID + , TO_CHAR(DATETIME,'YYYY-MM-DD HH24:MI:SS') AS DATETIME + , DECODE(REPORT_TYPE,'CH','map','') AS MAP + , DECODE(STATE,'6','insert') AS INS + , PROJECT_MASTER_COMPANY_O_CODE + FROM TEMP_PROJECT_INFO INFO + WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6' + AND REPORT_TYPE = 'CH' + ) T + WHERE 1=1 ]]> + + + + + + + + + + + + + + +