Merge branch 'main' of http://10.dbnt.co.kr:50501/DBNT/geoinfo_eGov_work

src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java

@@ -183,6 +183,80 @@ public class DrillingInquiryController {
         }
 
 
+        System.out.println(
+    		"\n--------------------------------------------------------------\n" +
+            request.getRequestURI() + " OUT:" +
+            "\n--------------------------------------------------------------\n" +
+            "jSONOResponse.toJSONString():[" + jSONOResponse.toJSONString() + "]\n" +
+            "\n--------------------------------------------------------------\n"
+         );
+
+
+        int contentLength = 0;
+        try {
+            contentLength = jSONOResponse.toJSONString().getBytes("UTF-8").length;
+        } catch (UnsupportedEncodingException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        }
+        response.setStatus(HttpServletResponse.SC_OK);
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Type", "application/json; charset=utf-8");
+        response.setContentLength(contentLength); // Content-Length 설정
+        try {
+            response.getWriter().print(jSONOResponse);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+    
+    /**
+     * 발주기관에 소속된 프로젝트 코드 목록을 조회한다.
+     * @param request
+     * @param params
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/drilling/inquiry/project-codes.do", method = RequestMethod.GET,  produces = { "application/json; charset=utf-8" })
+    @ResponseBody
+    public ResponseEntity<JSONObject> drillingInquiryProjectCodes (
+        HttpServletRequest request,
+        @RequestParam HashMap<String, Object> params,
+       HttpServletResponse response
+    ) {
+
+    	System.out.println(
+            "\n--------------------------------------------------------------\n" +
+            request.getRequestURI() + " IN:" +
+            "\n--------------------------------------------------------------\n" +
+            "params" + params.toString() + "\n" +
+            "\n--------------------------------------------------------------\n"
+        );
+
+        JSONObject jSONOResponse = null;
+        try {
+            jSONOResponse = drillingInquiryService.drillingInquiryProjectCodes( request, params );
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            jSONOResponse = new JSONObject();
+            String strTxt =
+                    "---------- BUG REPORTING START ----------" + "\n" +
+                    "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
+                    "params:[\n" + params.toString() + "\n]\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);
+            jSONOResponse.put("resultCode", -1);
+            jSONOResponse.put("result", "false");
+            jSONOResponse.put("message",  e.getMessage());
+        }
+
+
         System.out.println(
     		"\n--------------------------------------------------------------\n" +
             request.getRequestURI() + " OUT:" +

src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java

@@ -18,6 +18,8 @@ public interface DrillingInquiryMapper  {
 	public List<EgovMap> drillingInquiryAutocompleteList(HashMap<String, Object> params) throws SQLException;
 	public EgovMap getItemByProjectCode(HashMap<String, Object> params) throws SQLException;
 	public EgovMap getTblMasterCompanyMbrByComCode(HashMap<String, Object> params) throws SQLException;
+	public List<EgovMap> drillingInquiryProjectCodes(HashMap<String, Object> params) throws SQLException;
+	
 	
 }
 

src/main/java/geoinfo/drilling/inquiry/service/DrillingInquiryService.java

@@ -13,6 +13,7 @@ import egovframework.rte.psl.dataaccess.util.EgovMap;
 
 public interface DrillingInquiryService {
 	JSONObject drillingInquiryList(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
+	
 	JSONObject drillingInquiryOneItem(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 	
 	HashMap<String, Object> spGetProjectMbr(HttpServletRequest request, HashMap<String, Object> params, String userId) throws Exception;
@@ -20,5 +21,5 @@ public interface DrillingInquiryService {
 	EgovMap getItemByProjectCode(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 
 	EgovMap getTblMasterCompanyMbrByComCode(HttpServletRequest request, HashMap<String, Object> params, String userId) throws Exception;
-	
+	JSONObject drillingInquiryProjectCodes(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 }

src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java

@@ -48,6 +48,8 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
 	@Resource(name="loginMapper")
 	private LoginMapper loginMapper;
 
+	
+	
 
     @Override
     public JSONObject drillingInquiryList(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
@@ -461,6 +463,94 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
 	}
 
 
+	@Override
+    public JSONObject drillingInquiryProjectCodes(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
+
+        JSONObject  jsonResponse    = new JSONObject();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String userId = MyUtil.getStringFromObject( request.getSession().getAttribute("USERID") );
+        
+        if( userId == null){
+            throw new Exception( "로그인이 필요한 서비스입니다." );
+        }
+        
+        
+        HashMap<String, Object> spGetMasterCompanyDistrictParams = drillingInputService.getOrganizationUserGlGmGsGfCodes(userId);
+        
+        String masterCompanyOCode 	= MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gl") );
+        String masterCompanyTwCode 	= MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gm") );
+        String masterCompanyThCode 	= MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gs") );
+        String masterCompanyName 	= MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gf") );
+        String sortfield = "C".equals(MyUtil.getStringFromObject(params.get("constTag"))) ? "0" : "2";
+        String sorttype = "2";
+        params.put("masterCompanyOCode", masterCompanyOCode);
+        params.put("masterCompanyTwCode", masterCompanyTwCode);
+        params.put("masterCompanyThCode", masterCompanyThCode);
+        params.put("masterCompanyName", masterCompanyName);
+        params.put("sortfield", sortfield);
+        params.put("sorttype", sorttype);
+        
+        
+        try {
+
+            try {
+        		String keyName = "constName";
+            	params.put(keyName, MyUtil.removeBlank( params.get(keyName) ));
+            	
+            	keyName = "constCompanyAdmin";
+            	params.put(keyName, MyUtil.removeBlank( params.get(keyName) ));
+            	
+            	keyName = "constCompanyTel";
+            	params.put(keyName, MyUtil.removeBlank( params.get(keyName) ));            	
+
+            	keyName = "constCompanyName";
+            	params.put(keyName, MyUtil.removeBlank( params.get(keyName) ));            	
+            	
+            	keyName = "constComCodes";
+            	
+            	if( params.get("constCompanyName") != null && !MyUtil.getStringFromObject(params.get("constCompanyName")).trim().isEmpty() ) {
+            		params.put(keyName, drillingInquiryMapper.getComCodes(params));	
+            	} else {
+            		params.put(keyName, null);
+            	}
+
+                List<EgovMap> datas     	= drillingInquiryMapper.drillingInquiryProjectCodes(params); 
+                
+                
+                
+                String lpszProjectCodesWithComma = "";
+                for( EgovMap data : datas ) {
+                	
+                	String projectCode = MyUtil.getStringFromObject(data.get("projectCode"));
+                	if( projectCode != null ) {
+                		if( !lpszProjectCodesWithComma.equals("") ) {
+                			lpszProjectCodesWithComma += ", ";
+                		}
+                		lpszProjectCodesWithComma += "'" + projectCode + "'";
+                	}                	
+                }                
+                
+                jsonResponse.put("datas", lpszProjectCodesWithComma);                
+                return jsonResponse;
+            } catch (SQLException e) {
+                String strTxt =
+                        "---------- BUG REPORTING START ----------" + "\n" +
+                        "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" +
+                        "params:[\n" + params.toString() + "\n]\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);
+                throw new Exception( "오류가 발생하였습니다." + "\n" + "SQLException" );
+            }
+
+
+        } catch (org.json.simple.parser.ParseException e) {
+            // TODO Auto-generated catch block
+            throw new Exception( e.getMessage() );
+        }
+    }
 
 
 }

src/main/java/geoinfo/main/main/MainController.java

@@ -2225,7 +2225,7 @@ public class MainController
 				filePath = filePath.replaceAll("\\|1\\|", "/");
 				filePath = filePath.replaceAll("\\|2\\|", ".");
 			}
-
+			System.out.println("실제 파일 다운로드를 처리하는 최종 파일경로 ::: " + path + filePath);
 			File file = new File(path + filePath);
 			int filesize = (int) file.length();
 			if (filesize > 0)

src/main/java/geoinfo/regi/manageList/ManageListController.java

@@ -113,7 +113,11 @@ public class ManageListController {
 	@ResponseBody
 	public Map<String, Object> getManageList(HttpServletRequest request, HttpServletResponse response, @RequestParam HashMap<String, Object> params) throws Exception {
 
-		int nCls = MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
+		int nCls = -1;
+		if( request.getSession() != null && request.getSession().getAttribute("CLS") != null ) {
+			MyUtil.getIntegerFromObject(request.getSession().getAttribute("CLS"));
+			System.out.println("getManageList.do CLS:" + String.valueOf(nCls));
+		}
 		strUtil sUtil = new strUtil();
 		WebUtil wUtil = new WebUtil();
 	    // 정렬 필드/방향 처리

src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml

@@ -143,6 +143,28 @@
 		]]>
 	</select>
 	
+	<select id="drillingInquiryProjectCodes" parameterType="map" resultType="egovMap">		
+		SELECT PROJECT_CODE
+		FROM TABLE(SP_GET_TBL_CSI_BY_KEYWORD(
+			#{constTag, jdbcType=VARCHAR},
+			#{constName, jdbcType=VARCHAR},
+			#{constStartDate, jdbcType=VARCHAR},
+			#{constEndDate, jdbcType=VARCHAR},
+			#{constStateCode, jdbcType=VARCHAR},
+			#{masterCompanyOCode, jdbcType=VARCHAR},
+			#{masterCompanyTwCode, jdbcType=VARCHAR},
+			#{masterCompanyThCode, jdbcType=VARCHAR},
+			#{masterCompanyName, jdbcType=VARCHAR},
+			#{constCompanyName, jdbcType=VARCHAR},			
+			#{constComCodes, jdbcType=VARCHAR},
+			#{constCompanyAdmin, jdbcType=VARCHAR},
+			#{constCompanyTel, jdbcType=VARCHAR},
+			NULL,
+			#{sortfield},
+			#{sorttype},
+			#{nCount},
+			#{nPage}))
+	</select>
 	
 	
 	

src/main/webapp/WEB-INF/views/body/join/postcode_new.jsp

@@ -12,7 +12,6 @@
 //document.domain = "abc.go.kr";
 
 function init(){
-
 	var url = location.href;
 	var confmKey = "U01TX0FVVEgyMDE4MDYxNTExMTczMTEwNzk0NjQ=";//승인키
 	// resultType항목 추가(2016.10.06)

src/main/webapp/WEB-INF/views/home/index.jsp

@@ -497,7 +497,7 @@
 							</c:if>
 							<c:if test="${status.index eq 4}">
 								<%-- <a href="#" class="shortcuts-btn-box shortcuts-btn-04" onclick="fileDown('${file.stored_file_name}', 'home', '${status.index + 1}')"> --%>
-								<a href="#" class="shortcuts-btn-box shortcuts-btn-04" onclick="javascript:fileDownload('지반정보입력_프로그램메뉴얼.zip','지반정보입력_프로그램메뉴얼.zip');">
+								<a href="#" class="shortcuts-btn-box shortcuts-btn-04" onclick="javascript:fileDownload('시추정보_입력_가이드라인_2025.pdf','시추정보_입력_가이드라인_2025.pdf');">
 									<span class="shortcuts-btn-text">지반정보 입력<br />프로그램 메뉴얼<br />(PDF파일)</span>
 								</a>
 							</c:if>

src/main/webapp/WEB-INF/views/map/index.jsp

@@ -32,6 +32,7 @@
 	
 <input type="hidden" id="cls" name="cls" value="<c:out value="${params.cls}"/>" />
 
+<script language=JavaScript src="${pageContext.request.contextPath}/js/common/myXhr.js"></script>
 <script type="text/javascript"
 	src="${pageContext.request.contextPath}/js/map/main/main.js?v=20250617_094801"></script>
 <script type="text/javascript"
@@ -275,6 +276,10 @@ function LoadingShow() {
 									<a href="javascript:geologyWell();"
 									class="map-right-btn map-btn-icon-well">관정</a>
 								</li>
+								<li>
+									<a href="javascript:geologySteepSlope();"
+									class="map-right-btn map-btn-icon-steep-slope">급경사지</a>
+								</li>
 							</ul>
 						</div>
 						<!-- 그리기도구 끝 -->

src/main/webapp/body/join/postcode_new.jsp

@@ -12,7 +12,7 @@
 	String inputYn = request.getParameter("inputYn");
 	String roadFullAddr = request.getParameter("roadFullAddr");
 	String roadAddrPart1 = request.getParameter("roadAddrPart1");
-	String roadAddrPart2 = request.getParameter("roadAddrPart2");
+	String roadAddrPart2 = request.getParameter("roadAddrPart2");	
 	String engAddr = request.getParameter("engAddr");
 	String jibunAddr = request.getParameter("jibunAddr");
 	String zipNo = request.getParameter("zipNo");
@@ -47,8 +47,8 @@ function init(){
 	var confmKey = "U01TX0FVVEgyMDE4MDYxNTExMTczMTEwNzk0NjQ=";//승인키
 	// resultType항목 추가(2016.10.06)
 	var resultType = "4"; // 도로명주소 검색결과 화면 출력유형, 1 : 도로명, 2 : 도로명+지번, 3 : 도로명+상세건물명, 4 : 도로명+지번+상세건물명
-	<%-- var inputYn= "<%=inputYn%>"; --%>
-	var inputYn= '<c:out value='${inputYn}'/>';
+	var inputYn= "<%=inputYn%>";
+	//var inputYn= '<c:out value='${inputYn}'/>';
 	if(inputYn != "Y"){
 		document.form.confmKey.value = confmKey;
 		document.form.returnUrl.value = url;
@@ -62,10 +62,17 @@ function init(){
 			, "<%=jibunAddr%>","<%=zipNo%>", "<%=admCd%>", "<%=rnMgtSn%>", "<%=bdMgtSn%>", "<%=detBdNmList%>"
 			, "<%=bdNm%>", "<%=bdKdcd%>", "<%=siNm%>", "<%=sggNm%>", "<%=emdNm%>", "<%=liNm%>", "<%=rn%>", "<%=udrtYn%>"
 			, "<%=buldMnnm%>", "<%=buldSlno%>", "<%=mtYn%>", "<%=lnbrMnnm%>", "<%=lnbrSlno%>", "<%=emdNo%>"); --%>
-		opener.jusoCallBack("<c:out value="${roadFullAddr}"/>","<c:out value="${roadAddrPart1}"/>","<c:out value="${addrDetail}"/>", "<c:out value="${roadAddrPart2}"/>","<c:out value="${engAddr}"/>"
+			
+			opener.jusoCallBack("<%=roadFullAddr%>","<%=roadAddrPart1%>","<%=addrDetail%>", "<%=roadAddrPart2%>","<%=engAddr%>"
+					, "<%=jibunAddr%>","<%=zipNo%>", "<%=admCd%>", "<%=rnMgtSn%>", "<%=bdMgtSn%>", "<%=detBdNmList%>"
+					, "<%=bdNm%>", "<%=bdKdcd%>", "<%=siNm%>", "<%=sggNm%>", "<%=emdNm%>", "<%=liNm%>", "<%=rn%>", "<%=udrtYn%>"
+					, "<%=buldMnnm%>", "<%=buldSlno%>", "<%=mtYn%>", "<%=lnbrMnnm%>", "<%=lnbrSlno%>", "<%=emdNo%>");
+			<%--
+			opener.jusoCallBack("<c:out value="${roadFullAddr}"/>","<c:out value="${roadAddrPart1}"/>","<c:out value="${addrDetail}"/>", "<c:out value="${roadAddrPart2}"/>","<c:out value="${engAddr}"/>"
 				, "<c:out value="${jibunAddr}"/>","<c:out value="${zipNo}"/>", "<c:out value="${admCd}"/>", "<c:out value="${rnMgtSn}"/>", "<c:out value="${bdMgtSn}"/>", "<c:out value="${detBdNmList}"/>"
 				, "<c:out value="${bdNm}"/>", "<c:out value="${bdKdcd}"/>", "<c:out value="${siNm}"/>", "<c:out value="${sggNm}"/>", "<c:out value="${emdNm}"/>", "<c:out value="${liNm}"/>", "<c:out value="${rn}"/>", "<c:out value="${udrtYn}"/>"
 				, "<c:out value="${buldMnnm}"/>", "<c:out value="${buldSlno}"/>", "<c:out value="${mtYn}"/>", "<c:out value="${lnbrMnnm}"/>", "<c:out value="${lnbrSlno}"/>", "<c:out value="${emdNo}"/>");
+			 --%>
 
 		window.close();
 	}

src/main/webapp/com/css/map-service.css

@@ -872,7 +872,9 @@ header .global-link-wrapper {
 .map-right-btn-group > li .map-right-btn.map-btn-icon-well::before {
     background: url(../img/map-service/icon/ico_map_right_control_well.png) no-repeat 50% 50%;
 }
-
+.map-right-btn-group > li .map-right-btn.map-btn-icon-steep-slope::before {
+    background: url(../img/map-service/icon/ico_map_right_control_steep_slope.png) no-repeat 50% 50%;
+}
 
 
 /* 지도구분 탭 시작 */

src/main/webapp/js/join/join.js

@@ -1,7 +1,3 @@
-/*******************************************************************************
- * ????? ?? ????????o??
- ******************************************************************************/
-
 function zipsearch() {
 	//window.open("postcode.do", "Addr_Search","toolbar=no,menubar=no,scrollbars=yes,resizable=no,width=460,height=500");
 	//var pop = window.open("postcode.do","_blank","width=570,height=420, scrollbars=yes, resizable=yes");