diff --git a/pom.xml b/pom.xml index 2e86795..f9f5280 100644 --- a/pom.xml +++ b/pom.xml @@ -536,8 +536,22 @@ org.eclipse.emf.ecore 2.9.1-v20130827-0309 + + + commons-collections + commons-collections + 3.2.2 + + + + egovframework.rte + egovframework-rte-psl-dataaccess + 2.7.0 + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/egovframework.rte.psl.dataaccess-2.7.0.jar + org.opengis diff --git a/src/main/java/com/geotwo/webserver/core/service/AbstractService.java b/src/main/java/com/geotwo/webserver/core/service/AbstractService.java deleted file mode 100644 index 20a4a03..0000000 --- a/src/main/java/com/geotwo/webserver/core/service/AbstractService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.geotwo.webserver.core.service; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public abstract class AbstractService extends HttpServlet { - private static final long serialVersionUID = 2014061020172321L; - - public abstract Object parseQuery(HttpServletRequest paramHttpServletRequest) throws Exception; - - public abstract String doProcess(String paramString); - - public void service(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException { - super.service(arg0, arg1); - } - - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doGet(req, resp); - } - - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doPost(req, resp); - } -} diff --git a/src/main/java/com/geotwo/webserver/core/service/Service.java b/src/main/java/com/geotwo/webserver/core/service/Service.java deleted file mode 100644 index b16762d..0000000 --- a/src/main/java/com/geotwo/webserver/core/service/Service.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.geotwo.webserver.core.service; - -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.ServerInfo; -import com.geotwo.webserver.core.init.ServerConfiguration; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.plugin.ows.util.PluginUtil; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.text.DecimalFormat; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -public class Service extends AbstractService { - private static final long serialVersionUID = 2014061008205121L; - - private static final int SLEEP_TIME = 1000; - - private static final int MAX_SLEEP_TIME = 20000; - - public String parseQuery(HttpServletRequest req) throws Exception { - return null; - } - - public String doProcess(String str) { - return null; - } - - public void service(ServletRequest req, ServletResponse resp) throws ServletException, IOException { - req.setCharacterEncoding("UTF-8"); - String rootPath = ((HttpServletRequest)req).getContextPath(); - String serviceName = ((HttpServletRequest)req).getRequestURI().replace(rootPath, ""); - while (serviceName.endsWith("/")) - serviceName = serviceName.substring(0, serviceName.length() - 1); - long reqId = System.currentTimeMillis(); - if (((HttpServletRequest)req).getMethod().equalsIgnoreCase("GET")) { - LogMngr.getInstance().reqInfo("[REQUEST]", - "[" + reqId + "] GET, From " + PluginUtil.getClientIP((HttpServletRequest)req) + - " To " + ((serviceName.length() == 0) ? "/" : serviceName) + " , Request : " + ((HttpServletRequest)req).getQueryString()); - } else { - LogMngr.getInstance().reqInfo("[REQUEST]", - "[" + reqId + "] POST, From " + PluginUtil.getClientIP((HttpServletRequest)req) + - " To " + ((serviceName.length() == 0) ? "/" : serviceName) + " , Request : " + ((HttpServletRequest)req).getQueryString()); - } - if (serviceName.length() == 0) { - RequestDispatcher dispatcher = req.getRequestDispatcher("index.html"); - dispatcher.forward(req, resp); - return; - } - if (isFileService(serviceName)) { - File file = new File(getServletContext().getRealPath(serviceName)); - writeFileResponse(resp, file); - return; - } - HttpServlet service = ServiceMngr.getService(serviceName); - if (service != null) { - if (service instanceof ServerInfoService) { - service.service(req, resp); - } else if (ServerInfo.getInstance().isStarted()) { - if (ServerInfo.getInstance().isReStarting()) { - long sleepTile = System.currentTimeMillis(); - while (true) { - if (System.currentTimeMillis() - sleepTile > 20000L) { - writeFailResponse(resp, "O2Map Web is busy to restart. Waiting time for request has been exceeded. [20/sec]"); - break; - } - if (!ServerInfo.getInstance().isReStarting()) { - service.service(req, resp); - break; - } - try { - Thread.sleep(1000L); - } catch (InterruptedException interruptedException) {} - } - } else { - service.service(req, resp); - } - } else { - writeFailResponse(resp, "O2Map Web is not ready. Please check up server configurations and restart server."); - } - } else { - writeFailResponse(resp, "Service [" + serviceName + "] is unregistered Service on O2Map Web."); - } - LogMngr.getInstance().reqInfo("[RESPONSE]", - "[" + reqId + "] is Finish." + - - "Time : " + (new DecimalFormat(".##")).format((System.currentTimeMillis() - reqId) / 1000.0D) + "/sec"); - } - - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doGet(req, resp); - } - - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doPost(req, resp); - } - - private boolean isFileService(String uri) { - try { - File file = new File(getServletContext().getRealPath(uri)); - if (file.exists()) - return true; - } catch (Exception exception) {} - return false; - } - - private void writeFileResponse(ServletResponse resp, File file) { - try { - int length = 0; - ServletOutputStream outStream = resp.getOutputStream(); - String mimetype = getServletContext().getMimeType(file.getAbsolutePath()); - if (mimetype == null) - mimetype = "application/octet-stream"; - resp.setContentType(mimetype); - resp.setContentLength((int)file.length()); - byte[] byteBuffer = new byte[1024]; - FileInputStream in = new FileInputStream(file); - while (in != null && (length = in.read(byteBuffer)) != -1) - outStream.write(byteBuffer, 0, length); - in.close(); - outStream.close(); - } catch (FileNotFoundException e) { - LogMngr.getInstance().logError("[SERVICE]", "Request file not found. :: " + e.getMessage()); - } catch (IOException e) { - LogMngr.getInstance().logError("[SERVICE]", "Can't make response output stream. :: " + e.getMessage()); - } - } - - private void writeFailResponse(ServletResponse resp, String msg) { - try { - LogMngr.getInstance().logError("[SERVICE]", msg); - Document doc = getFailDocument(msg); - Transformer xformer = TransformerFactory.newInstance().newTransformer(); - if (ServerContext.getDocIndent().intValue() > 0) { - xformer.setOutputProperty("indent", "yes"); - xformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", ServerContext.getDocIndent().toString()); - } - resp.setContentType("text/xml; charset=UTF-8"); - xformer.transform(new DOMSource(doc), new StreamResult((OutputStream)resp.getOutputStream())); - } catch (Exception e) { - LogMngr.getInstance().logError("[SERVICE]", "Do not create XML : " + Service.class + " / " + e.getMessage()); - } - } - - private static Document getFailDocument(String msg) throws ParserConfigurationException { - DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); - Document doc = docBuilder.newDocument(); - Element rootElement = doc.createElement("SERVER"); - doc.appendChild(rootElement); - Element result = doc.createElement("RESULT"); - result.appendChild(doc.createTextNode("Fail")); - rootElement.appendChild(result); - Element errorMessage = doc.createElement("INFO"); - errorMessage.appendChild(doc.createTextNode(msg)); - rootElement.appendChild(errorMessage); - return doc; - } - - public void destroy() { - super.destroy(); - ServerConfiguration.getInstance().stopServer(); - } -} diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/service/WMSService.java b/src/main/java/com/geotwo/webserver/plugin/ows/service/WMSService.java deleted file mode 100644 index bcea922..0000000 --- a/src/main/java/com/geotwo/webserver/plugin/ows/service/WMSService.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.geotwo.webserver.plugin.ows.service; - -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.service.AbstractService; -import com.geotwo.webserver.plugin.ows.exception.OWSServiceException; -import com.geotwo.webserver.plugin.ows.service.parser.WMSParser; -import com.geotwo.webserver.plugin.ows.util.XMLUtil; -import com.geotwo.webserver.plugin.ows.wms.request.Request; -import com.geotwo.webserver.plugin.ows.wms.wms130.WMSGetCapabilities; -import com.geotwo.webserver.plugin.ows.wms.wms130.WMSGetFeatureInfo; -import com.geotwo.webserver.plugin.ows.wms.wms130.WMSGetLegendGraphic; -import com.geotwo.webserver.plugin.ows.wms.wms130.WMSGetMap; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetCapabilitiesRequest; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetFeatureInfoRequest; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetLegendGraphicRequest; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetMapRequest; -import java.io.IOException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.w3c.dom.Document; - -public class WMSService extends AbstractService { - private static final long serialVersionUID = 2014061021213030L; - - public Request parseQuery(HttpServletRequest req) throws OWSServiceException, Exception { - Request requestObj = (new WMSParser(req)).parseQuery(); - return requestObj; - } - - public String doProcess(String str) { - return null; - } - - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - doPost(req, resp); - } - - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Request requestObj = null; - Document doc = null; - try { - requestObj = parseQuery(req); - } catch (OWSServiceException e) { - doc = e.getDocument(); - LogMngr.getInstance().logDebug("[SERVICE]", "WMS Request Prasing Exception : " + e.getMessage()); - } catch (Exception e) { - OWSServiceException ose = new OWSServiceException("[" + e.getClass().toString() + "] " + e.getMessage()); - doc = ose.getDocument(); - LogMngr.getInstance().logError("[SERVICE]", "WMS Request Prasing Exception : [" + e.getClass().toString() + "] " + e.getMessage()); - } - boolean isXMLWriteHere = true; - if (requestObj != null) { - if (requestObj.getVersion().equals("1.3.0")) { - if (requestObj instanceof GetCapabilitiesRequest) { - WMSGetCapabilities wmsGetCapabilities = new WMSGetCapabilities((GetCapabilitiesRequest)requestObj); - doc = wmsGetCapabilities.getCapabilities(); - } else if (requestObj instanceof GetMapRequest) { - WMSGetMap wmsGetMap = new WMSGetMap((GetMapRequest)requestObj); - doc = wmsGetMap.getMap(resp); - isXMLWriteHere = false; - } else if (requestObj instanceof GetFeatureInfoRequest) { - WMSGetFeatureInfo wmsGet = new WMSGetFeatureInfo((GetFeatureInfoRequest)requestObj); - doc = wmsGet.getFeatureInfo(resp); - isXMLWriteHere = false; - } else if (requestObj instanceof GetLegendGraphicRequest) { - WMSGetLegendGraphic wmsGetLegendGraphic = new WMSGetLegendGraphic((GetLegendGraphicRequest)requestObj); - doc = wmsGetLegendGraphic.getLegendGraphic(resp); - isXMLWriteHere = false; - } - } else { - LogMngr.getInstance().logDebug("[SERVICE]", "ver." + requestObj.getVersion() + " is not supported"); - } - } else { - LogMngr.getInstance().logDebug("[SERVICE]", "requestObj is not generated."); - } - if (doc != null) - try { - XMLUtil.writeToResponse(resp, doc); - } catch (Exception e) { - LogMngr.getInstance().logError("[SERVICE]", "Write XML Exception : " + e.getMessage()); - doc = null; - } - if (doc == null && isXMLWriteHere) { - resp.setContentType("text/xml; charset=UTF-8"); - RequestDispatcher dispatcher = req.getRequestDispatcher("/OWSServiceError.xml"); - dispatcher.forward((ServletRequest)req, (ServletResponse)resp); - } - } -} diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetMap.java b/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetMap.java deleted file mode 100644 index 632cf50..0000000 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetMap.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130; - -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.RenderMngr; -import com.geotwo.webserver.core.render.io.O2PngWriter; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.plugin.ows.exception.OWSServiceException; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetMapRequest; -import java.awt.image.BufferedImage; -import java.io.OutputStream; -import javax.imageio.ImageIO; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import org.w3c.dom.Document; - -public class WMSGetMap { - GetMapRequest requestObj = null; - - public WMSGetMap(GetMapRequest requestObj) { - this.requestObj = requestObj; - } - - public Document getMap(HttpServletResponse resp) { - AVList params = new AVList(); - params.setValue("request.wms.layers", this.requestObj.getLayers()); - params.setValue("request.wms.bbox", this.requestObj.getBbox()); - params.setValue("request.wms.width", Integer.valueOf(this.requestObj.getWidth())); - params.setValue("request.wms.height", Integer.valueOf(this.requestObj.getHeight())); - params.setValue("request.wms.format", this.requestObj.getFormat()); - params.setValue("request.wms.transparent", Boolean.valueOf(this.requestObj.isTransparent())); - params.setValue("request.wms.bgcolor", this.requestObj.getBgcolor()); - params.setValue("request.wms.styles", this.requestObj.getStyles()); - params.setValue("request.wms.filter", this.requestObj.getFilter()); - if (this.requestObj.getSld() != null) - params.setValue("request.wms.sld", this.requestObj.getSld()); - BufferedImage image = null; - Document doc = null; - try { - image = RenderMngr.productMap(params); - } catch (Exception e) { - OWSServiceException ose = new OWSServiceException("WMS GetMap Exception : Image process fails : " + e.getMessage()); - doc = ose.getDocument(); - LogMngr.getInstance().logError("[SERVICE]", "WMS GetMap Exception : Image process fails : " + e.getMessage()); - } - if (image != null) - try { - writeImage(image, resp); - } catch (Exception e) { - OWSServiceException ose = new OWSServiceException("WMS GetMap Exception : Write IMAGE fails : " + e.getMessage()); - doc = ose.getDocument(); - LogMngr.getInstance().logError("[SERVICE]", "WMS GetMap Exception : Write IMAGE fails : " + e.getMessage()); - } - return doc; - } - - private void writeImage(BufferedImage image, HttpServletResponse resp) throws Exception { - ServletOutputStream servletOutputStream = null; - OutputStream out = null; - try { - String format = this.requestObj.getFormat(); - String[] formatElement = format.split("/"); - resp.setContentType(format); - servletOutputStream = resp.getOutputStream(); - if (format.toUpperCase().contains("PNG")) { - O2PngWriter.writePNG(image, (OutputStream)servletOutputStream); - } else { - ImageIO.write(image, formatElement[1], (OutputStream)servletOutputStream); - } - } catch (Exception e) { - throw e; - } finally { - if (servletOutputStream != null) { - servletOutputStream.flush(); - servletOutputStream.close(); - } - } - } -} diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetCapabilitiesRequest.java b/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetCapabilitiesRequest.java deleted file mode 100644 index fb04c0c..0000000 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetCapabilitiesRequest.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130.request; - -import com.geotwo.webserver.plugin.ows.wms.request.Request; - -public class GetCapabilitiesRequest extends Request {} diff --git a/src/main/java/com/MyStartServer.java b/src/main/java/kr/or/geoinfo/MyStartServer.java similarity index 66% rename from src/main/java/com/MyStartServer.java rename to src/main/java/kr/or/geoinfo/MyStartServer.java index 127292c..9ba9300 100644 --- a/src/main/java/com/MyStartServer.java +++ b/src/main/java/kr/or/geoinfo/MyStartServer.java @@ -1,12 +1,12 @@ -package com; +package kr.or.geoinfo; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; -import com.geotwo.webserver.core.ServerInfo; -import com.geotwo.webserver.core.init.ServerConfiguration; -import com.geotwo.webserver.core.service.ServiceMngr; +import kr.or.geoinfo.webserver.core.ServerInfo; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.service.ServiceMngr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,17 +25,11 @@ public class MyStartServer implements ApplicationListener */ @Override public void onApplicationEvent(ContextRefreshedEvent event) { - // 부모 컨텍스트에도 이벤트가 발생할 수 있으므로, 최상위(루트) 컨텍스트에서만 실행되도록 확인합니다. - // 이는 중복 실행을 방지합니다. if (event.getApplicationContext().getParent() == null) { LOGGER.info("**************************************"); - LOGGER.info("* *"); - LOGGER.info("* WMS 서버 시작 *"); - LOGGER.info("* *"); + LOGGER.info("**************WMS 서버 시작 *************"); LOGGER.info("**************************************"); - // 여기에 서버 시작 시 실행하고 싶은 다른 로직을 추가할 수 있습니다. - // 예: 초기 데이터 로드, 스케줄러 시작 등 if (ServerConfiguration.getInstance().startServer()) ServerInfo.getInstance().setStarted(true); diff --git a/src/main/java/kr/or/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java b/src/main/java/kr/or/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java new file mode 100644 index 0000000..fae56b0 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/drilling/inquiry/service/DrillingInquiryMapper.java @@ -0,0 +1,21 @@ +package kr.or.geoinfo.drilling.inquiry.service; + +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; + +import egovframework.rte.psl.dataaccess.mapper.Mapper; +import egovframework.rte.psl.dataaccess.util.EgovMap; + +@Mapper("drillingInquiryMapper") +public interface DrillingInquiryMapper { + public String getComCodes(HashMap params) throws SQLException; + public List drillingInquiryProjectCodes(HashMap params) throws SQLException; + + public List getComNameByComCode(HashMap params) throws SQLException; + public void spGetMasterCompanyDistrict(HashMap spGetMasterCompanyDistrictParams) throws SQLException; + +} + + + diff --git a/src/main/java/kr/or/geoinfo/drilling/inquiry/service/DrillingInquiryService.java b/src/main/java/kr/or/geoinfo/drilling/inquiry/service/DrillingInquiryService.java new file mode 100644 index 0000000..56dbc85 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/drilling/inquiry/service/DrillingInquiryService.java @@ -0,0 +1,16 @@ +package kr.or.geoinfo.drilling.inquiry.service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.json.simple.JSONObject; + +import egovframework.rte.psl.dataaccess.util.EgovMap; + + +public interface DrillingInquiryService { + JSONObject drillingInquiryProjectCodes(HttpServletRequest request, HashMap params) throws Exception; +} diff --git a/src/main/java/kr/or/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/kr/or/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java new file mode 100644 index 0000000..f6b57e0 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java @@ -0,0 +1,149 @@ +package kr.or.geoinfo.drilling.inquiry.service.impl; + +import java.sql.SQLException; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import oracle.sql.TIMESTAMP; + +import org.json.simple.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import egovframework.rte.psl.dataaccess.util.EgovMap; +import kr.or.geoinfo.drilling.inquiry.service.DrillingInquiryMapper; +import kr.or.geoinfo.drilling.inquiry.service.DrillingInquiryService; +import kr.or.geoinfo.utils.MyUtil; + +@Service("drillingInquiryService") +public class DrillingInquiryServiceImpl implements DrillingInquiryService { + + + @Resource(name="drillingInquiryMapper") + private DrillingInquiryMapper drillingInquiryMapper; + + + + + + /** + * 발주기관 사용자의 Gl Gm Gs Gf Codes 구한다 + */ + private HashMap getOrganizationUserGlGmGsGfCodesByProjectMasterCompanyCode(String projectMasterCompanyCode) throws Exception { + + HashMap params = new HashMap(); + + params.put("comCode", projectMasterCompanyCode); + + List datas = drillingInquiryMapper.getComNameByComCode(params); + + + if( datas.size() < 1 ) { + throw new Exception( "발주기관의 gl gm gs gf codes를 구할 수 없습니다." ); + } + + + EgovMap data = datas.get(0); + + String projectMasterCompanyName = MyUtil.getStringFromObject(data.get("comName")); + HashMap spGetMasterCompanyDistrictParams = new HashMap(); + + spGetMasterCompanyDistrictParams.put("projectMasterCompanyName", projectMasterCompanyName); + + + drillingInquiryMapper.spGetMasterCompanyDistrict(spGetMasterCompanyDistrictParams); + + return spGetMasterCompanyDistrictParams; + + } + + + + @Override + public JSONObject drillingInquiryProjectCodes(HttpServletRequest request, HashMap params) throws Exception { + + JSONObject jsonResponse = new JSONObject(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String projectMasterCompanyCode = request.getParameter("projectMasterCompanyCode"); + + if( projectMasterCompanyCode == null){ + throw new Exception( "projectMasterCompanyCode 값이 존재하지 않습니다." ); + } + + + + HashMap spGetMasterCompanyDistrictParams = getOrganizationUserGlGmGsGfCodesByProjectMasterCompanyCode(projectMasterCompanyCode); + + 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 = "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 dataList = drillingInquiryMapper.drillingInquiryProjectCodes(params); + + + + String lpszProjectCodesWithComma = ""; + for( EgovMap data : dataList ) { + + String projectCode = MyUtil.getStringFromObject(data.get("projectCode")); + if( projectCode != null ) { + if( !lpszProjectCodesWithComma.equals("") ) { + lpszProjectCodesWithComma += " OR "; + } + lpszProjectCodesWithComma += "PROJECT_CODE='" + projectCode + "'"; + } + } + + jsonResponse.put("data", 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() ); + } + } + + +} diff --git a/src/main/java/kr/or/geoinfo/mybatis/HotDeployableMybatisSessionFactoryBean.java b/src/main/java/kr/or/geoinfo/mybatis/HotDeployableMybatisSessionFactoryBean.java new file mode 100644 index 0000000..9adffe6 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/mybatis/HotDeployableMybatisSessionFactoryBean.java @@ -0,0 +1,214 @@ +package kr.or.geoinfo.mybatis; + +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.core.io.Resource; + + +public class HotDeployableMybatisSessionFactoryBean extends SqlSessionFactoryBean implements DisposableBean { + + private static final Logger LOGGER = LoggerFactory.getLogger(HotDeployableMybatisSessionFactoryBean.class); + + private SqlSessionFactory proxy; + private int interval = 500; + private boolean running = false; + + private Timer timer; + private TimerTask task; + + private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock(); + private final Lock r = rwl.readLock(); + private final Lock w = rwl.writeLock(); + + public Resource[] mapperLocations; + + @Override + public void setMapperLocations(Resource[] mapperLocations) { + super.setMapperLocations(mapperLocations); + this.mapperLocations = mapperLocations; + } + + public void setInterval(int interval) { + this.interval = interval; + } + + public void refresh() throws Exception { + w.lock(); + + try { + super.afterPropertiesSet(); + + } finally { + w.unlock(); + } + + LOGGER.debug("Mybatis Mapper File Reloaded!"); + } + + @Override + public void afterPropertiesSet() throws Exception { + super.afterPropertiesSet(); + + setRefreshable(); + } + + private void setRefreshable() { + proxy = (SqlSessionFactory) Proxy.newProxyInstance( + SqlSessionFactory.class.getClassLoader(), + new Class[]{SqlSessionFactory.class}, + new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, + Object[] args) throws Throwable { + // log.debug("method.getName() : " + method.getName()); + return method.invoke(getParentObject(), args); + } + }); + + task = new TimerTask() { + private final Map map = new HashMap(); + + @Override + public void run() { + if (isModified()) { + try { + refresh(); + } catch (NumberFormatException e) { + if (LOGGER.isDebugEnabled()) { + LOGGER.error("Refresh Error Exception", e); + } else { + LOGGER.error("Refresh Error Exception"); + } + } catch (SQLException e) { + if (LOGGER.isDebugEnabled()) { + LOGGER.error("Refresh Error Exception", e); + } else { + LOGGER.error("Refresh Error Exception"); + } + } catch (Exception e) { + if (LOGGER.isDebugEnabled()) { + LOGGER.error("Refresh Error Exception", e); + } else { + LOGGER.error("Refresh Error Exception"); + } + } + } + } + + private boolean isModified() { + boolean retVal = false; + + if (mapperLocations != null) { + for (int i = 0; i < mapperLocations.length; i++) { + Resource mappingLocation = mapperLocations[i]; + retVal |= findModifiedResource(mappingLocation); + } + } + + return retVal; + } + + private boolean findModifiedResource(Resource resource) { + boolean retVal = false; + List modifiedResources = new ArrayList(); + + try { + long modified = resource.lastModified(); + + if (map.containsKey(resource)) { + long lastModified = map.get(resource).longValue(); + + if (lastModified != modified) { + map.put(resource, new Long(modified)); + modifiedResources.add(resource.getDescription()); + retVal = true; + } + } else { + map.put(resource, new Long(modified)); + } + } catch (NumberFormatException e) { + LOGGER.debug("Exception: " + e); + } catch (IOException e) { + LOGGER.debug("Exception: " + e.toString()); + } catch (Exception e) { + LOGGER.debug("Exception: " + e); + } + + if (retVal) { + LOGGER.debug("Mybatis Mapper File Changed: " + modifiedResources); + } + return retVal; + } + }; + + timer = new Timer(true); + resetInterval(); + + } + + private Object getParentObject() throws Exception { + r.lock(); + try { + return super.getObject(); + } finally { + r.unlock(); + } + } + + @Override + public SqlSessionFactory getObject() { + return this.proxy; + } + + @Override + public Class getObjectType() { + return (this.proxy != null ? this.proxy.getClass() : SqlSessionFactory.class); + } + + @Override + public boolean isSingleton() { + return true; + } + + public void setCheckInterval(int ms) { + interval = ms; + + if (timer != null) { + resetInterval(); + } + } + + private void resetInterval() { + if (running) { + timer.cancel(); + running = false; + } + if (interval > 0) { + timer.schedule(task, 0, interval); + running = true; + } + } + + @Override + public void destroy() { + timer.cancel(); + } + +} diff --git a/src/main/java/kr/or/geoinfo/utils/ApplicationContextUtils.java b/src/main/java/kr/or/geoinfo/utils/ApplicationContextUtils.java new file mode 100644 index 0000000..21a266c --- /dev/null +++ b/src/main/java/kr/or/geoinfo/utils/ApplicationContextUtils.java @@ -0,0 +1,51 @@ +package kr.or.geoinfo.utils; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +/** + * Spring이 관리하지 않는 클래스(static 클래스 등)에서 + * Spring ApplicationContext에 접근하여 Bean을 가져올 수 있게 해주는 유틸리티 클래스. + * * @Component 어노테이션을 통해 Spring이 이 클래스를 Bean으로 등록하고 + * ApplicationContextAware 인터페이스를 통해 ApplicationContext를 주입받습니다. + */ +@Component +public class ApplicationContextUtils implements ApplicationContextAware { + + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext context) throws BeansException { + // Spring이 초기화될 때 이 메서드를 호출하여 ApplicationContext를 저장합니다. + applicationContext = context; + } + + /** + * 저장된 ApplicationContext를 반환합니다. + * @return ApplicationContext + */ + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + /** + * Bean 이름으로 Spring Bean을 조회합니다. + * @param beanName Spring Bean의 이름 + * @return Object 타입의 Bean (형변환 필요) + */ + public static Object getBean(String beanName) { + return applicationContext.getBean(beanName); + } + + /** + * Bean 타입(Class)으로 Spring Bean을 조회합니다. + * @param Bean의 타입 + * @param requiredType Bean의 클래스 + * @return 제네릭으로 지정된 타입의 Bean + */ + public static T getBean(Class requiredType) { + return applicationContext.getBean(requiredType); + } +} \ No newline at end of file diff --git a/src/main/java/kr/or/geoinfo/utils/MyUtil.java b/src/main/java/kr/or/geoinfo/utils/MyUtil.java new file mode 100644 index 0000000..efcb2c4 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/utils/MyUtil.java @@ -0,0 +1,908 @@ +package kr.or.geoinfo.utils; + +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; + + +public final class MyUtil { + + private static final Logger logger = LoggerFactory.getLogger(MyUtil.class); + + public static final String VERSION = "20240816_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 + + /** + * 특정 자리수의 랜덤 숫자를 생성한다. + * @param nLength 랜덤문자의 길이 + * @return 생성된 랜덤 문자 + */ + public static String getRandomNumber(int nLength) { + Random generator = new Random(); + String strRandValue = ""; + + for (int i = 0; i < nLength; i++) { + strRandValue += Integer.toString( generator.nextInt(10) ); + } + + return strRandValue; + } + + /** + * 현재 Timestamp를 반환한다 + * @return 현재 Timestamp yyyy-MM-dd hh:mm:ss + */ + public static String getCurrentDateTime() { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + System.out.println(timestamp); + + return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(timestamp); + } + + + /** + * 현재 date를 반환한다 + * @return 현재 Timestamp yyyy-MM-dd + */ + public static String getCurrentDate() { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + System.out.println(timestamp); + + return new SimpleDateFormat("yyyy-MM-dd").format(timestamp); + } + + + /** + * 현재 시각 구하기 + * @return 현재 Timestamp hh:mm:ss + */ + public static String getCurrentTime() { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + System.out.println(timestamp); + + return new SimpleDateFormat("hh:mm:ss").format(timestamp); + } + + /** + * 년 월 일 날짜 더하기 + * + * @param dt(날짜) , y(년) , m(월), d(일) + * @Exam addDate("2018-09-10",1,12,1) -->20200911 addDate("2018-09-10",1,-2,1) -->20200711 + * @return String + */ + public static String addDate(String dt, int y, int m, int d) throws Exception { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + + Calendar cal = Calendar.getInstance(); + Date date = format.parse(dt); + cal.setTime(date); + cal.add(Calendar.YEAR, y); //년 더하기 + cal.add(Calendar.MONTH, m); //월 더하기 + cal.add(Calendar.DATE, d); //일 더하기 + + return format.format(cal.getTime()); + } + + /** + * 일 구하기 + * + * @param dt(날짜) + * @Exam addDate("2018-09-10",1,12,1) -->20200911 addDate("2018-09-10",1,-2,1) -->20200711 + * @return int + */ + public static int getDate(String dt) throws Exception { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + + Calendar cal = Calendar.getInstance(); + Date date = format.parse(dt); + cal.setTime(date); + logger.info("getDate:" + cal.get(cal.DATE)); + return cal.get(cal.DATE); + } + + + + /** + * UPDATE 문에서 문자열 타입의 필드를 추가한다. + * + * @param strQuery 쿼리, strColumnName 컬럼명, strTarget + * @Exam addUpdateString("UPDATE SET ", "name", "홍길동") --> UPDATE SET name='홍길동', + * @return String + */ + public static String addUpdateString(String strQuery, String strColumnName, String strValue ) { + + if( strValue != null && strValue.isEmpty() == false && strValue.equals("undefined") == false && strValue.equals("null") == false ) { + strQuery += strColumnName + "='" + strValue + "',"; + } + return strQuery; + } + + /** + * UPDATE 문에서 Long 타입의 필드를 추가한다. + * + * @param strQuery 쿼리, strColumnName 컬럼명, longTarget + * @Exam addUpdateString("UPDATE SET ", "age", 2l) --> UPDATE SET age=2, + * @return String + */ + public static String addUpdateLong(String strQuery, String strColumnName, Long longTarget ) { + + if( longTarget != null ) { + strQuery += strColumnName + "=" + longTarget + ","; + } + return strQuery; + } + + /* + public static boolean isJSONValid(String test) { + try { + new JSONObject(test); + } catch (JSONException ex) { + // edited, to include @Arthur's comment + // e.g. in case JSONArray is valid as well... + try { + new JSONArray(test); + } catch (JSONException ex1) { + return false; + } + } + return true; + } + */ + + public static String getQuery(List params) throws UnsupportedEncodingException + { + StringBuilder result = new StringBuilder(); + boolean first = true; + + for (NameValuePair pair : params) + { + if (first) + first = false; + else + result.append("&"); + + //result.append(URLEncoder.encode(pair.getName(), "UTF-8")); + result.append(pair.getName()); + result.append("="); + result.append(pair.getValue()); + //result.append(URLEncoder.encode(pair.getValue(), "UTF-8")); + } + + return result.toString(); + } + + /** + * SHA-256으로 해싱하는 메소드 + * @param msg + * @return + * @throws NoSuchAlgorithmException + */ + public static String sha256(String msg) throws NoSuchAlgorithmException { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + md.update(msg.getBytes()); + + return bytesToHex(md.digest()); + } + + + /** + * 바이트를 헥스값으로 변환한다 + * + * @param bytes + * @return + */ + public static String bytesToHex(byte[] bytes) { + StringBuilder builder = new StringBuilder(); + for (byte b: bytes) { + builder.append(String.format("%02x", b)); + } + return builder.toString(); + } + + /** + * 세틀뱅크 수취인 조회 서비스 HTML문서에서 특정 값 추출하기 + * @param html_line + * @param inputName + * @return + */ + public static String parseInpuValueForSettleBankResponse(String html_line, String inputName) { + + String[] strArrValue = html_line.split("name=\"" + inputName + "\" value="); + String strValue = ""; + + if( strArrValue.length == 2 ) { + strValue = strArrValue[1].replaceAll("[\"|>|\\r\\n|\\n\\r|\\r|\\n|\\s|\\+)]",""); + try { + //logger.info("Encoding EUC-KR:" + URLDecoder.decode(strValue, "EUC-KR")); + //logger.info("Encoding UTF-8:" + URLDecoder.decode(strValue, "UTF-8")); + strValue = URLDecoder.decode(strValue, "UTF-8"); + } catch (UnsupportedEncodingException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } + } + return strValue; + } + + /** + * 숫자 외 소수점을 포함한 모든 특수문자를 제거해준다. + * + */ + public static String removeSpecialChractersNumber( String decimalNumber ) { + decimalNumber = decimalNumber.replaceAll("[^0-9]", ""); //숫자 외 모두 제거한다. + return decimalNumber; + } + + /** + * 수수점을 제외한 나머지 특수문자를 제거해준다. 그리고 소수점은 1개만 들어가도록 해준다. + * + */ + public static String removeSpecialChractersDecimalNumber( String decimalNumber ) { + decimalNumber = decimalNumber.replaceAll("[^0-9.\\-]", ""); //숫자와 쩜.-말고는 제거한다. + // 소수점 1개만 넣도록 하기 + int nDotIdx = decimalNumber.indexOf("."); + if( nDotIdx > -1 ) { + String[] arrSplit = decimalNumber.split("\\."); + if( arrSplit.length != 0) { + decimalNumber = ""; + } + for( int i = 0; i < arrSplit.length ; i++ ) { + decimalNumber += arrSplit[i]; + if( i == 0 ) { + decimalNumber += "."; + } + } + } + logger.info("removeSpecialChractersDecimalNumber() decimalNumber:" + decimalNumber); + return decimalNumber; + } + + + /** + * 소수점자리수가 3자리 이상이면 2자리까지만 남기고 나머지는 지운다. + * @param decimalNumber 소수점 자리 n개 이상 인 경우, 지울 숫자가 들어있는 문자열 + * @param nLimitDecimalNumber 허용할 소수점 자 + * @return + */ + public static String removeOverDecimalNumber( String decimalNumber, int nLimitDecimalNumber ) { + logger.error("decimalNumber:" + decimalNumber); + int nDotIdx = decimalNumber.indexOf("."); + if( nDotIdx > -1 ) { + String[] arrSplit = decimalNumber.split("\\."); + if( arrSplit[1].length() > nLimitDecimalNumber ) { + return arrSplit[0] + "." + arrSplit[1].substring(0,2); + } + } + logger.error("decimalNumber:" + decimalNumber); + return decimalNumber; + } + + /** + * 1,000 단위마다 콤마를 찍는다. + * @param bdAmount + * @return + */ + public static String addComma(BigDecimal bdAmount) { + return addComma(bdAmount.toPlainString()); + } + + /** + * 1,000 단위마다 콤마를 찍는다. + * @param doubleAmount + * @return + */ + public static String addComma(Double doubleAmount) { + return addComma(BigDecimal.valueOf(doubleAmount)); + } + + /** + * 1,000 단위마다 콤마를 찍는다. + * @param longAmount + * @return + */ + public static String addComma(Long longAmount) { + return addComma(BigDecimal.valueOf(longAmount)); + } + + /** + * 1,000 단위마다 콤마를 찍는다. + * @param strAmount + * @return + */ + public static String addComma(String strAmount) { + DecimalFormat formatter = (DecimalFormat) NumberFormat.getInstance(Locale.US); + DecimalFormatSymbols symbols = formatter.getDecimalFormatSymbols(); + + if( isNumeric(strAmount) == false ) { + return strAmount; + } + + int nDotIndex = strAmount.indexOf("."); + + + symbols.setGroupingSeparator(','); + formatter.setDecimalFormatSymbols(symbols); + if( nDotIndex > -1 ) { + return formatter.format(Double.parseDouble( strAmount )); + } else { + return formatter.format(Long.parseLong( strAmount )); + } + + } + + /** + * 숫자에서 끝에 0000을 제거한다. + * + */ + public static String trimTrailingZero( String decimalNumber ) { + decimalNumber = decimalNumber.replaceAll("[^0-9.\\-]", ""); //숫자와 쩜.-말고는 제거한다. + decimalNumber = decimalNumber.indexOf(".") < 0 ? decimalNumber : decimalNumber.replaceAll("0*$", "").replaceAll("\\.$", ""); + logger.info("trimTrailingZero() decimalNumber:" + decimalNumber); + return decimalNumber; + } + + /** + * SQL 인젝션 방어를 위해 특수문자를 제거한다. + * @param myString + * @return + */ + public static String removeSQLInjectionSpecialCharacter(String myString) { + if( myString == null ) { + return myString; + } + myString = myString.replaceAll( "<|>|\\(|\\)|'|\"|\\|;|=|\\+|\\||&|#|\\.\\.", " "); + + return myString; + } + + + /** + * UUID(GUID)를 얻는다. + * @return 구한 UUID(GUID) 값. + */ + public static String getUuid() { + String uuid = UUID.randomUUID().toString(); + return uuid; + } + + /** 숫자인지 아닌지 확인한다. */ + public static boolean isNumeric(String strNum) { + if (strNum == null) { + return false; + } + try { + double d = Double.parseDouble(strNum); + } catch (NumberFormatException nfe) { + return false; + } + return true; + } + + public static boolean isNumeric(Double num) { + if (num == null) { + return false; + } + return isNumeric(num.toString()); + } + + public static boolean isNumeric(Integer num) { + if (num == null) { + return false; + } + return isNumeric(num.toString()); + } + + public static boolean isNumeric(Long num) { + if (num == null) { + return false; + } + return isNumeric(num.toString()); + } + + /** Long형태의 숫자인지 아닌지 확인한다. */ + public static boolean isNumericForLong(String strNum) { + if (strNum == null) { + return false; + } + try { + Long lValue = Long.parseLong(strNum); + } catch (NumberFormatException nfe) { + return false; + } + return true; + } + + + public static Integer getIntegerFromObject(Object obj) { + if (obj instanceof Integer ) { + return (Integer) obj; + } else if (obj instanceof String ) { + return Integer.parseInt((String) obj); + } else if (obj instanceof Long) { + return ((Long) obj).intValue(); + } else if (obj instanceof Double) { + return ((Long)Math.round((Double)obj)).intValue(); + } else if (obj instanceof BigDecimal) { + return ((BigDecimal)obj).intValue(); + } + + return null; + } + + public static Long getLongFromObject(Object obj) { + if (obj instanceof String ) { + String strObj = (String) obj; + if( isNumeric(strObj) ) { + return Long.parseLong((String) obj); + } + } else if (obj instanceof Integer) { + return ((Integer) obj).longValue(); + } else if (obj instanceof Long) { + return (Long) obj; + } else if (obj instanceof Double) { + return ((Long)Math.round((Double)obj)); + } + + return null; + } + + public static Double getDoubleFromObject(Object obj) throws Exception { + String str = getStringFromObject(obj); + str = removeSpecialChractersDecimalNumber(str); + return Double.parseDouble((String) str); + } + + public static BigDecimal getBigDecimalFromObject(Object obj) throws Exception { + return BigDecimal.valueOf(getDoubleFromObject(obj)); + } + + + + public static String getStringFromObject(Object obj) throws Exception { + if (obj == null) { + return null; + } else if (obj instanceof String ) { + return (String) obj; + } else if (obj instanceof Integer) { + return ((Integer)obj).toString(); + } else if (obj instanceof Long) { + return ((Long) obj).toString(); + } else if (obj instanceof Float) { + return ((Float)obj).toString(); + } else if (obj instanceof Double) { + return ((Double)obj).toString(); + } else if (obj instanceof BigDecimal) { + return ((BigDecimal)obj).toPlainString(); + } else if (obj instanceof Date) { + return ((Date)obj).toString(); + } + + return null; + } + + public static org.json.simple.JSONObject getJSONObjectFromObject(Object obj) { + if (obj instanceof org.json.simple.JSONObject ) { + return (org.json.simple.JSONObject) obj; + } else if (obj instanceof String ) { + JSONParser parser = new JSONParser(); + try { + obj = parser.parse( (String) obj ); + } catch (ParseException e) { + e.printStackTrace(); + } + return (org.json.simple.JSONObject) obj; + } + return null; + } + + public static org.json.simple.JSONArray getJSONArrayFromObject(Object obj) { + if (obj instanceof org.json.simple.JSONArray ) { + return (org.json.simple.JSONArray) obj; + } else if (obj instanceof String ) { + JSONParser parser = new JSONParser(); + try { + obj = parser.parse( (String) obj ); + } catch (ParseException e) { + e.printStackTrace(); + } + return (org.json.simple.JSONArray) obj; + } + return null; + } + + public static Boolean getBooleanFromObject(Object obj) { + + if (obj instanceof String ) { + return Boolean.parseBoolean( ((String)obj).trim() ); + } else if (obj instanceof Boolean) { + return (Boolean)obj; + } + + return null; + } + + /** + * Parse a URI String into Name-Value Collection + * 쿼리스트링을 분석해서 Map형태로 return해준다. + * @param query + * @return query string name-value Map. + * @throws UnsupportedEncodingException + */ + public static Map splitQuery(String query, String token) throws UnsupportedEncodingException { + Map query_pairs = new LinkedHashMap(); + String[] pairs = query.split(token); + for (String pair : pairs) { + int idx = pair.indexOf("="); + query_pairs.put(URLDecoder.decode(pair.substring(0, idx), "UTF-8"), URLDecoder.decode(pair.substring(idx + 1), "UTF-8")); + } + return query_pairs; + } + + + + public static SortedMap getParameterMap(HttpServletRequest request) { + + SortedMap sMap = Collections.synchronizedSortedMap + ( new TreeMap(request.getParameterMap())); + + String params = "\n--------------------------------------------------------------\n" + + MyUtil.getBASEURL(request) + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n"; + synchronized(sMap) { + for(String key : sMap.keySet()) { + String[] value = sMap.get(key); + for(int i=0; i sMap = Collections.synchronizedSortedMap + ( new TreeMap(request.getParameterMap())); + + String params = "\n--------------------------------------------------------------\n" + + MyUtil.getBASEURL(request) + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n"; + synchronized(sMap) { + for(String key : sMap.keySet()) { + String[] value = sMap.get(key); + for(int i=0; i 1.23 + * @return + * @throws Exception + */ + public static Double floor(String strAmount, int decimalPlace) throws Exception { + + Double dPoint = Double.parseDouble(strAmount); + + String[] arrSplitedDot = strAmount.split("\\."); + int nLength = arrSplitedDot.length; + if (arrSplitedDot.length == 2) { + if (MyUtil.isNumeric(arrSplitedDot[1])) { + + //소수부 끝에 0을 제거해준다. + arrSplitedDot[1] = arrSplitedDot[1].replaceAll("0+$", ""); + + int nDecimalLength = arrSplitedDot[1].length(); + if( nDecimalLength >= decimalPlace ) { + String strDecimal = "1"; + for (int i = 0; i < decimalPlace; i++) { + strDecimal += "0"; + } + dPoint = Math.floor(dPoint*Long.valueOf(strDecimal)) / Long.valueOf(strDecimal); + } + } + } + + return dPoint; + } + + + /** + * days안에는 "월" 또는 "월,수,금" 이런 요일에 대한 한글문자가 들어가고 오늘이 주어진 요일 안에 포함되는지 여부를 알아낸다. + * + * @param days "월" 또는 "월,수,금'과 같이 요일이 한글로 들어있다. + * @return 만약 days에 "월"이 들어가 있고 오늘이 월요일이라면 true를 return한다. + */ + public static Boolean isContainDayOfWeekToday( String days ) { + + // 1. Date 생성 / 현재 날짜 + Date currentDate = new Date(); + System.out.println(currentDate); + + // 2. Calendar 생성 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(currentDate); + + // 3. 텍스트 요일 구하기 (숫자) + int dayOfWeekNumber = calendar.get(Calendar.DAY_OF_WEEK); + + if( dayOfWeekNumber == 1 ) { + if( days.indexOf("일") > -1 ) { + return true; + } + } else if( dayOfWeekNumber == 2 ) { + if( days.indexOf("월") > -1 ) { + return true; + } + } else if( dayOfWeekNumber == 3 ) { + if( days.indexOf("화") > -1 ) { + return true; + } + } else if( dayOfWeekNumber == 4 ) { + if( days.indexOf("수") > -1 ) { + return true; + } + } else if( dayOfWeekNumber == 5 ) { + if( days.indexOf("목") > -1 ) { + return true; + } + } else if( dayOfWeekNumber == 6 ) { + if( days.indexOf("금") > -1 ) { + return true; + } + } else if( dayOfWeekNumber == 7 ) { + if( days.indexOf("토") > -1 ) { + return true; + } + } + + return false; + } + + /** + * 현재 시각이 timeRange에 명시한 시간대 안에 포함되는지 여부를 return 한다. + * @param timeRange 01~14 -> 오전 1시부터 오후 2시를 의미하며 ~ 구분자를 사용한다. + * @return 현재 시각이 해당 시간대 내에 포함되면 true를 return 한다. + * @throws Exception timeRange이 형식에 맞지 않으면 Exception이 발생한다. + */ + public static Boolean isInTimeRange( String timeRange ) throws Exception { + + String[] arrTimeRange = timeRange.split("~"); + if( arrTimeRange.length != 2 ) { + throw new Exception("timeRange이 형식에 맞지 않습니다."); + } + + if( MyUtil.isNumeric(arrTimeRange[0]) == false ) { + throw new Exception("timeRange이 형식에 맞지 않습니다 - 1"); + } + + if( MyUtil.isNumeric(arrTimeRange[1]) == false ) { + throw new Exception("timeRange이 형식에 맞지 않습니다 - 1"); + } + + + Date currentDate = new Date(); + // 포맷팅 정의 + SimpleDateFormat formatter = new SimpleDateFormat("HH"); + // 포맷팅 적용 + String formatedNow = formatter.format(currentDate); + + Integer currentHour = MyUtil.getIntegerFromObject( formatedNow ); + Integer rangeStart = MyUtil.getIntegerFromObject( arrTimeRange[0] ); + Integer rangeEnd = MyUtil.getIntegerFromObject( arrTimeRange[0] ); + + if( rangeStart <= rangeEnd && rangeEnd <= rangeEnd ) { + return true; + } + + return false; + } + + /** + * Oracle 11g의 CLOB값을 String 값으로 변환한다. + * @param clob + * @return + * @throws SQLException + */ + public static String ClobToString(java.sql.Clob clob) throws SQLException { + String clobData = ""; + if (clob != null) { + java.io.Reader reader = clob.getCharacterStream(); + java.io.BufferedReader br = new java.io.BufferedReader(reader); + StringBuilder sb = new StringBuilder(); + String line; + try { + while ((line = br.readLine()) != null) { + sb.append(line); + sb.append("\n"); // 필요에 따라 줄바꿈 추가 + } + clobData = sb.toString(); + } catch (java.io.IOException e) { + e.printStackTrace(); + // 오류 처리 + } finally { + try { + br.close(); + reader.close(); + } catch (java.io.IOException e) { + e.printStackTrace(); + } + } + } + return clobData; + } + + // JSONObject를 HashMap으로 변환 + public static HashMap JSONObjectToHashMap( JSONObject jsonObject ) { + + HashMap params = new HashMap<>(); + for (Object key : jsonObject.keySet()) { + String keyStr = (String) key; + Object value = jsonObject.get(keyStr); + params.put(keyStr, value); + } + + return params; + } + + /** + * 문자열의 공백을 제거 후 return한다 + * @param target 공백을 제거할 대상 + * @return + * @throws Exception + */ + public static String removeBlank( Object target ) throws Exception { + + String str = getStringFromObject( target ); + + if( str != null ) { + str = str.replaceAll("\\s", ""); + } + + return str; + } + + public static String removeBlank( String target ) throws Exception { + return removeBlank( (Object) target ); + } + + + + public static String getIpAddress( HttpServletRequest request ) throws Exception { + String clientIp = ""; + clientIp = request.getHeader("X-Forwarded-For"); + + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("Proxy-Client-IP"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("WL-Proxy-Client-IP"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("HTTP_CLIENT_IP"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("X-Real-IP"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("X-RealIP"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getHeader("REMOTE_ADDR"); + } + if (clientIp == null || clientIp.length() == 0 || "unknown".equalsIgnoreCase(clientIp)) { + clientIp = request.getRemoteAddr(); + } + + return clientIp; + } + + +} diff --git a/src/main/java/com/geotwo/webserver/core/ServerContext.java b/src/main/java/kr/or/geoinfo/webserver/core/ServerContext.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/ServerContext.java rename to src/main/java/kr/or/geoinfo/webserver/core/ServerContext.java index 144186d..8809aa6 100644 --- a/src/main/java/com/geotwo/webserver/core/ServerContext.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/ServerContext.java @@ -1,22 +1,22 @@ -package com.geotwo.webserver.core; +package kr.or.geoinfo.webserver.core; -import com.geotwo.webserver.core.cache.ImgCacheMngr; -import com.geotwo.webserver.core.coverage.O2DemLayerMngr; -import com.geotwo.webserver.core.coverage.O2ImgLayerMngr; -import com.geotwo.webserver.core.coverage.WpsCovStoreMngr; -import com.geotwo.webserver.core.init.ServerConfiguration; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.Map; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.map.layer.O2DemLayer; -import com.geotwo.webserver.core.tile.tms.TMSMngr; -import com.geotwo.webserver.core.tile.wmts.WMTSMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.GWaveStoreMngr; -import com.geotwo.webserver.core.vector.JdbcStoreMngr; -import com.geotwo.webserver.core.vector.ShpStoreMngr; -import com.geotwo.webserver.core.vector.WpsVecStoreMngr; +import kr.or.geoinfo.webserver.core.cache.ImgCacheMngr; +import kr.or.geoinfo.webserver.core.coverage.O2DemLayerMngr; +import kr.or.geoinfo.webserver.core.coverage.O2ImgLayerMngr; +import kr.or.geoinfo.webserver.core.coverage.WpsCovStoreMngr; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.Map; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.map.layer.O2DemLayer; +import kr.or.geoinfo.webserver.core.tile.tms.TMSMngr; +import kr.or.geoinfo.webserver.core.tile.wmts.WMTSMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.GWaveStoreMngr; +import kr.or.geoinfo.webserver.core.vector.JdbcStoreMngr; +import kr.or.geoinfo.webserver.core.vector.ShpStoreMngr; +import kr.or.geoinfo.webserver.core.vector.WpsVecStoreMngr; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/com/geotwo/webserver/core/ServerInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/ServerInfo.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/ServerInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/ServerInfo.java index 964ce07..9f5bfee 100644 --- a/src/main/java/com/geotwo/webserver/core/ServerInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/ServerInfo.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core; +package kr.or.geoinfo.webserver.core; public class ServerInfo { diff --git a/src/main/java/com/geotwo/webserver/core/cache/ImgCacheMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/ImgCacheMngr.java similarity index 95% rename from src/main/java/com/geotwo/webserver/core/cache/ImgCacheMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/ImgCacheMngr.java index 905fa88..7b44472 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/ImgCacheMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/ImgCacheMngr.java @@ -1,14 +1,14 @@ -package com.geotwo.webserver.core.cache; +package kr.or.geoinfo.webserver.core.cache; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.cache.ic.CacheFormat; -import com.geotwo.webserver.core.cache.ic.CacheLevel; -import com.geotwo.webserver.core.cache.ic.CacheLevelSet; -import com.geotwo.webserver.core.cache.ic.ImgCacheLayer; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.cache.ic.CacheFormat; +import kr.or.geoinfo.webserver.core.cache.ic.CacheLevel; +import kr.or.geoinfo.webserver.core.cache.ic.CacheLevelSet; +import kr.or.geoinfo.webserver.core.cache.ic.ImgCacheLayer; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/geotwo/webserver/core/cache/LogCacheManager.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/LogCacheManager.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/cache/LogCacheManager.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/LogCacheManager.java index d6b753f..3b60789 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/LogCacheManager.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/LogCacheManager.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.cache; +package kr.or.geoinfo.webserver.core.cache; -import com.geotwo.webserver.core.cache.util.FileComparator; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.cache.util.FileComparator; +import kr.or.geoinfo.webserver.core.log.LogMngr; import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/geotwo/webserver/core/cache/ic/CacheFormat.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheFormat.java similarity index 91% rename from src/main/java/com/geotwo/webserver/core/cache/ic/CacheFormat.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheFormat.java index 833b49a..3c535f2 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/ic/CacheFormat.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheFormat.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.cache.ic; +package kr.or.geoinfo.webserver.core.cache.ic; public class CacheFormat { int width = 256; diff --git a/src/main/java/com/geotwo/webserver/core/cache/ic/CacheLevel.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheLevel.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/cache/ic/CacheLevel.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheLevel.java index 27ade9d..4b6e1b7 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/ic/CacheLevel.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheLevel.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.cache.ic; +package kr.or.geoinfo.webserver.core.cache.ic; import java.io.File; import javax.management.modelmbean.XMLParseException; diff --git a/src/main/java/com/geotwo/webserver/core/cache/ic/CacheLevelSet.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheLevelSet.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/cache/ic/CacheLevelSet.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheLevelSet.java index b876d6e..4657cf1 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/ic/CacheLevelSet.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/CacheLevelSet.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.cache.ic; +package kr.or.geoinfo.webserver.core.cache.ic; import java.io.File; import java.util.TreeMap; diff --git a/src/main/java/com/geotwo/webserver/core/cache/ic/ImgCacheLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/ImgCacheLayer.java similarity index 90% rename from src/main/java/com/geotwo/webserver/core/cache/ic/ImgCacheLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/ic/ImgCacheLayer.java index 954ff9e..fe5b781 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/ic/ImgCacheLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/ic/ImgCacheLayer.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.cache.ic; +package kr.or.geoinfo.webserver.core.cache.ic; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.File; import java.io.IOException; import org.geotools.geometry.jts.ReferencedEnvelope; diff --git a/src/main/java/com/geotwo/webserver/core/cache/util/FileComparator.java b/src/main/java/kr/or/geoinfo/webserver/core/cache/util/FileComparator.java similarity index 83% rename from src/main/java/com/geotwo/webserver/core/cache/util/FileComparator.java rename to src/main/java/kr/or/geoinfo/webserver/core/cache/util/FileComparator.java index d195cc9..a578590 100644 --- a/src/main/java/com/geotwo/webserver/core/cache/util/FileComparator.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/cache/util/FileComparator.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.cache.util; +package kr.or.geoinfo.webserver.core.cache.util; import java.io.File; import java.util.Comparator; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/O2DemLayerMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/O2DemLayerMngr.java similarity index 92% rename from src/main/java/com/geotwo/webserver/core/coverage/O2DemLayerMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/O2DemLayerMngr.java index 0488c8b..40ab88a 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/O2DemLayerMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/O2DemLayerMngr.java @@ -1,15 +1,15 @@ -package com.geotwo.webserver.core.coverage; +package kr.or.geoinfo.webserver.core.coverage; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerInfo; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerLevelSet; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerUtil; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.map.layer.O2DemLayer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerInfo; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerLevelSet; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.map.layer.O2DemLayer; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/O2ImgLayerMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/O2ImgLayerMngr.java similarity index 91% rename from src/main/java/com/geotwo/webserver/core/coverage/O2ImgLayerMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/O2ImgLayerMngr.java index 83a6535..d24bcc1 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/O2ImgLayerMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/O2ImgLayerMngr.java @@ -1,15 +1,15 @@ -package com.geotwo.webserver.core.coverage; +package kr.or.geoinfo.webserver.core.coverage; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerInfo; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerLevelSet; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerUtil; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.map.layer.O2ImgLayer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerInfo; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerLevelSet; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.map.layer.O2ImgLayer; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/WpsCovStoreMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/WpsCovStoreMngr.java similarity index 82% rename from src/main/java/com/geotwo/webserver/core/coverage/WpsCovStoreMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/WpsCovStoreMngr.java index ecfdb70..0d26242 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/WpsCovStoreMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/WpsCovStoreMngr.java @@ -1,15 +1,15 @@ -package com.geotwo.webserver.core.coverage; +package kr.or.geoinfo.webserver.core.coverage; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerLevelSet; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerUtil; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.map.layer.O2DemLayer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.WpsVecStoreMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerLevelSet; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.map.layer.O2DemLayer; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.WpsVecStoreMngr; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerIndex.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerIndex.java similarity index 92% rename from src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerIndex.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerIndex.java index c7b559b..ff213d9 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerIndex.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerIndex.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.coverage.o2layer; +package kr.or.geoinfo.webserver.core.coverage.o2layer; import com.vividsolutions.jts.geom.Envelope; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerInfo.java similarity index 92% rename from src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerInfo.java index 9bb89a5..763ca53 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerInfo.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.coverage.o2layer; +package kr.or.geoinfo.webserver.core.coverage.o2layer; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import java.io.File; import org.opengis.referencing.crs.CoordinateReferenceSystem; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerLevel.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerLevel.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerLevel.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerLevel.java index f11df39..6da6ba2 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerLevel.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerLevel.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.coverage.o2layer; +package kr.or.geoinfo.webserver.core.coverage.o2layer; import com.vividsolutions.jts.geom.Envelope; import java.io.File; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerLevelSet.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerLevelSet.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerLevelSet.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerLevelSet.java index 2fdb86b..dc2f579 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerLevelSet.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerLevelSet.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.coverage.o2layer; +package kr.or.geoinfo.webserver.core.coverage.o2layer; -import com.geotwo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.LayerFactory; import com.vividsolutions.jts.geom.Envelope; import java.io.File; import java.util.TreeMap; diff --git a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerUtil.java b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerUtil.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerUtil.java rename to src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerUtil.java index 9081b51..6c19935 100644 --- a/src/main/java/com/geotwo/webserver/core/coverage/o2layer/O2LayerUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/coverage/o2layer/O2LayerUtil.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.coverage.o2layer; +package kr.or.geoinfo.webserver.core.coverage.o2layer; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import com.vividsolutions.jts.geom.Envelope; import java.awt.Graphics2D; import java.awt.Point; diff --git a/src/main/java/com/geotwo/webserver/core/feature/FeatureMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/feature/FeatureMngr.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/feature/FeatureMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/feature/FeatureMngr.java index 553beec..dee9fbb 100644 --- a/src/main/java/com/geotwo/webserver/core/feature/FeatureMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/feature/FeatureMngr.java @@ -1,16 +1,16 @@ -package com.geotwo.webserver.core.feature; +package kr.or.geoinfo.webserver.core.feature; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.init.ConnMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.O2DSMngr; -import com.geotwo.webserver.core.vector.jdbc.O2SqlDialect; -import com.geotwo.webserver.core.vector.jdbc.ns.NonSpatialDialect; -import com.geotwo.webserver.core.vector.jdbc.oracle.OracleDialect; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.init.ConnMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.O2DSMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2SqlDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.ns.NonSpatialDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.oracle.OracleDialect; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; import java.io.IOException; diff --git a/src/main/java/com/geotwo/webserver/core/feature/GeometryMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/feature/GeometryMngr.java similarity index 92% rename from src/main/java/com/geotwo/webserver/core/feature/GeometryMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/feature/GeometryMngr.java index 2a16764..9484efa 100644 --- a/src/main/java/com/geotwo/webserver/core/feature/GeometryMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/feature/GeometryMngr.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.feature; +package kr.or.geoinfo.webserver.core.feature; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.vector.O2DSMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.vector.O2DSMngr; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.MultiLineString; diff --git a/src/main/java/com/geotwo/webserver/core/feature/InsertParams.java b/src/main/java/kr/or/geoinfo/webserver/core/feature/InsertParams.java similarity index 87% rename from src/main/java/com/geotwo/webserver/core/feature/InsertParams.java rename to src/main/java/kr/or/geoinfo/webserver/core/feature/InsertParams.java index 111e967..28de417 100644 --- a/src/main/java/com/geotwo/webserver/core/feature/InsertParams.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/feature/InsertParams.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.feature; +package kr.or.geoinfo.webserver.core.feature; import java.util.ArrayList; import org.opengis.filter.identity.FeatureId; diff --git a/src/main/java/com/geotwo/webserver/core/feature/O2FeatureCollection.java b/src/main/java/kr/or/geoinfo/webserver/core/feature/O2FeatureCollection.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/feature/O2FeatureCollection.java rename to src/main/java/kr/or/geoinfo/webserver/core/feature/O2FeatureCollection.java index 101e208..fb788db 100644 --- a/src/main/java/com/geotwo/webserver/core/feature/O2FeatureCollection.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/feature/O2FeatureCollection.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.feature; +package kr.or.geoinfo.webserver.core.feature; import java.io.IOException; import java.util.Iterator; diff --git a/src/main/java/com/geotwo/webserver/core/feature/QueryMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/feature/QueryMngr.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/feature/QueryMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/feature/QueryMngr.java index ec7563d..67a8a5d 100644 --- a/src/main/java/com/geotwo/webserver/core/feature/QueryMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/feature/QueryMngr.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.feature; +package kr.or.geoinfo.webserver.core.feature; import com.vividsolutions.jts.geom.Envelope; import java.io.IOException; diff --git a/src/main/java/com/geotwo/webserver/core/feature/RefindInsertFeatureCollection.java b/src/main/java/kr/or/geoinfo/webserver/core/feature/RefindInsertFeatureCollection.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/feature/RefindInsertFeatureCollection.java rename to src/main/java/kr/or/geoinfo/webserver/core/feature/RefindInsertFeatureCollection.java index 1c9c796..e73d975 100644 --- a/src/main/java/com/geotwo/webserver/core/feature/RefindInsertFeatureCollection.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/feature/RefindInsertFeatureCollection.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.feature; +package kr.or.geoinfo.webserver.core.feature; -import com.geotwo.webserver.core.vector.jdbc.oracle.OracleDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.oracle.OracleDialect; import com.vividsolutions.jts.geom.Geometry; import java.io.IOException; import java.util.NoSuchElementException; diff --git a/src/main/java/com/geotwo/webserver/core/init/ConnMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/init/ConnMngr.java similarity index 87% rename from src/main/java/com/geotwo/webserver/core/init/ConnMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/ConnMngr.java index ae7b9a6..a27fbe7 100644 --- a/src/main/java/com/geotwo/webserver/core/init/ConnMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/ConnMngr.java @@ -1,14 +1,14 @@ -package com.geotwo.webserver.core.init; +package kr.or.geoinfo.webserver.core.init; -import com.geotwo.webserver.core.init.conn.ConnAltibase; -import com.geotwo.webserver.core.init.conn.ConnJDBC; -import com.geotwo.webserver.core.init.conn.ConnKairos; -import com.geotwo.webserver.core.init.conn.ConnMySQL; -import com.geotwo.webserver.core.init.conn.ConnOracle; -import com.geotwo.webserver.core.init.conn.ConnPostGIS; -import com.geotwo.webserver.core.init.conn.ConnTibero; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.ConnAltibase; +import kr.or.geoinfo.webserver.core.init.conn.ConnJDBC; +import kr.or.geoinfo.webserver.core.init.conn.ConnKairos; +import kr.or.geoinfo.webserver.core.init.conn.ConnMySQL; +import kr.or.geoinfo.webserver.core.init.conn.ConnOracle; +import kr.or.geoinfo.webserver.core.init.conn.ConnPostGIS; +import kr.or.geoinfo.webserver.core.init.conn.ConnTibero; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/com/geotwo/webserver/core/init/ServerConfiguration.java b/src/main/java/kr/or/geoinfo/webserver/core/init/ServerConfiguration.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/init/ServerConfiguration.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/ServerConfiguration.java index c376040..7a379db 100644 --- a/src/main/java/com/geotwo/webserver/core/init/ServerConfiguration.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/ServerConfiguration.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.init; +package kr.or.geoinfo.webserver.core.init; import java.io.File; import java.io.FileNotFoundException; @@ -15,12 +15,12 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.cache.LogCacheManager; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.RenderMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.O2DSMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.cache.LogCacheManager; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.RenderMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.O2DSMngr; public class ServerConfiguration { private static ServerConfiguration instance = null; diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnAltibase.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnAltibase.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnAltibase.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnAltibase.java index de040b5..3d7690d 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnAltibase.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnAltibase.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.util.HashMap; public class ConnAltibase extends ConnJDBC { diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnJDBC.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnJDBC.java similarity index 91% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnJDBC.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnJDBC.java index 1c3f578..746df11 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnJDBC.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnJDBC.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.ServerConfiguration; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.log.LogMngr; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnKairos.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnKairos.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnKairos.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnKairos.java index 1b6c0fd..a39b399 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnKairos.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnKairos.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.util.HashMap; public class ConnKairos extends ConnJDBC { diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnMySQL.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnMySQL.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnMySQL.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnMySQL.java index 8a46de6..19610f1 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnMySQL.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnMySQL.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.util.HashMap; public class ConnMySQL extends ConnJDBC { diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnOracle.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnOracle.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnOracle.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnOracle.java index 32921f8..f0b30b0 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnOracle.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnOracle.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.util.HashMap; public class ConnOracle extends ConnJDBC { diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnPostGIS.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnPostGIS.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnPostGIS.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnPostGIS.java index 9d97809..a770c33 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnPostGIS.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnPostGIS.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.util.HashMap; public class ConnPostGIS extends ConnJDBC { diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/ConnTibero.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnTibero.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/init/conn/ConnTibero.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnTibero.java index e073ebd..f1722fa 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/ConnTibero.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/ConnTibero.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn; +package kr.or.geoinfo.webserver.core.init.conn; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.util.HashMap; public class ConnTibero extends ConnJDBC { diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/util/FieldInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/util/FieldInfo.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/init/conn/util/FieldInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/util/FieldInfo.java index e565f38..3303f71 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/util/FieldInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/util/FieldInfo.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.init.conn.util; +package kr.or.geoinfo.webserver.core.init.conn.util; public class FieldInfo { private FieldSQL.FieldType type; diff --git a/src/main/java/com/geotwo/webserver/core/init/conn/util/FieldSQL.java b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/util/FieldSQL.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/init/conn/util/FieldSQL.java rename to src/main/java/kr/or/geoinfo/webserver/core/init/conn/util/FieldSQL.java index 9aab325..594605b 100644 --- a/src/main/java/com/geotwo/webserver/core/init/conn/util/FieldSQL.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/init/conn/util/FieldSQL.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.init.conn.util; +package kr.or.geoinfo.webserver.core.init.conn.util; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import com.vividsolutions.jts.geom.Geometry; import java.sql.SQLException; import java.util.Collections; diff --git a/src/main/java/com/geotwo/webserver/core/log/LogMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/log/LogMngr.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/log/LogMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/log/LogMngr.java index 869adba..a1f5edf 100644 --- a/src/main/java/com/geotwo/webserver/core/log/LogMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/log/LogMngr.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.log; +package kr.or.geoinfo.webserver.core.log; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.File; import java.util.HashMap; import java.util.Properties; diff --git a/src/main/java/com/geotwo/webserver/core/map/LayerFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/map/LayerFactory.java similarity index 82% rename from src/main/java/com/geotwo/webserver/core/map/LayerFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/LayerFactory.java index b9ee57f..5c3ba5e 100644 --- a/src/main/java/com/geotwo/webserver/core/map/LayerFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/LayerFactory.java @@ -1,13 +1,13 @@ -package com.geotwo.webserver.core.map; +package kr.or.geoinfo.webserver.core.map; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.GroupLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.map.layer.O2DemLayer; -import com.geotwo.webserver.core.map.layer.O2ImgLayer; -import com.geotwo.webserver.core.map.layer.WCSLayer; -import com.geotwo.webserver.core.map.layer.WMSLayer; -import com.geotwo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.GroupLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.map.layer.O2DemLayer; +import kr.or.geoinfo.webserver.core.map.layer.O2ImgLayer; +import kr.or.geoinfo.webserver.core.map.layer.WCSLayer; +import kr.or.geoinfo.webserver.core.map.layer.WMSLayer; +import kr.or.geoinfo.webserver.core.util.AVList; public class LayerFactory { public enum LayerType { diff --git a/src/main/java/com/geotwo/webserver/core/map/LayerSet.java b/src/main/java/kr/or/geoinfo/webserver/core/map/LayerSet.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/map/LayerSet.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/LayerSet.java index 562222f..b3dd89f 100644 --- a/src/main/java/com/geotwo/webserver/core/map/LayerSet.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/LayerSet.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.map; +package kr.or.geoinfo.webserver.core.map; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/geotwo/webserver/core/map/Map.java b/src/main/java/kr/or/geoinfo/webserver/core/map/Map.java similarity index 90% rename from src/main/java/com/geotwo/webserver/core/map/Map.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/Map.java index eb330ee..29cdc50 100644 --- a/src/main/java/com/geotwo/webserver/core/map/Map.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/Map.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.map; +package kr.or.geoinfo.webserver.core.map; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.WpsVecStoreMngr; -import com.geotwo.webserver.core.vector.o2wps.O2WpsLayerSet; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.WpsVecStoreMngr; +import kr.or.geoinfo.webserver.core.vector.o2wps.O2WpsLayerSet; import java.util.ArrayList; public class Map { diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/FeatureLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/FeatureLayer.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/map/layer/FeatureLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/FeatureLayer.java index 19a6fd0..52a6894 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/FeatureLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/FeatureLayer.java @@ -1,12 +1,12 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.RefineRenderStyleVisitor; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.O2DSMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.RefineRenderStyleVisitor; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.O2DSMngr; import java.util.ArrayList; import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/GroupLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/GroupLayer.java similarity index 91% rename from src/main/java/com/geotwo/webserver/core/map/layer/GroupLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/GroupLayer.java index b4597b6..23a4c66 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/GroupLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/GroupLayer.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.AVList; import com.vividsolutions.jts.geom.Envelope; import java.util.ArrayList; import org.geotools.geometry.jts.ReferencedEnvelope; diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/Layer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/Layer.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/map/layer/Layer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/Layer.java index 627c3ee..52171fd 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/Layer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/Layer.java @@ -1,10 +1,10 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import java.util.Date; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.referencing.CRS; diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/LinkLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/LinkLayer.java similarity index 85% rename from src/main/java/com/geotwo/webserver/core/map/layer/LinkLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/LinkLayer.java index 86cb9f9..7bae4b0 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/LinkLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/LinkLayer.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.net.URL; public abstract class LinkLayer extends Layer { diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/O2DemLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/O2DemLayer.java similarity index 93% rename from src/main/java/com/geotwo/webserver/core/map/layer/O2DemLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/O2DemLayer.java index 1d2e176..43029f6 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/O2DemLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/O2DemLayer.java @@ -1,12 +1,12 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerLevelSet; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.ExtractRasterStyleVisitor; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerLevelSet; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.ExtractRasterStyleVisitor; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.IOException; import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/O2ImgLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/O2ImgLayer.java similarity index 83% rename from src/main/java/com/geotwo/webserver/core/map/layer/O2ImgLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/O2ImgLayer.java index f4565d4..2d1c8a8 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/O2ImgLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/O2ImgLayer.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerLevelSet; -import com.geotwo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerLevelSet; +import kr.or.geoinfo.webserver.core.util.AVList; import java.io.IOException; import org.geotools.geometry.jts.ReferencedEnvelope; diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/WCSLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/WCSLayer.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/map/layer/WCSLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/WCSLayer.java index 1eb36ac..419ea8a 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/WCSLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/WCSLayer.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.AVList; import com.vividsolutions.jts.geom.Envelope; import java.net.URL; import java.net.URLConnection; diff --git a/src/main/java/com/geotwo/webserver/core/map/layer/WMSLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/WMSLayer.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/map/layer/WMSLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/map/layer/WMSLayer.java index 19343f0..f430b9b 100644 --- a/src/main/java/com/geotwo/webserver/core/map/layer/WMSLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/map/layer/WMSLayer.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.map.layer; +package kr.or.geoinfo.webserver.core.map.layer; -import com.geotwo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.AVList; import com.vividsolutions.jts.geom.Envelope; import java.net.URL; import java.net.URLConnection; diff --git a/src/main/java/com/geotwo/webserver/core/render/ExtractRasterStyleVisitor.java b/src/main/java/kr/or/geoinfo/webserver/core/render/ExtractRasterStyleVisitor.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/render/ExtractRasterStyleVisitor.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/ExtractRasterStyleVisitor.java index 2b7a60d..e495010 100644 --- a/src/main/java/com/geotwo/webserver/core/render/ExtractRasterStyleVisitor.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/ExtractRasterStyleVisitor.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render; +package kr.or.geoinfo.webserver.core.render; import org.geotools.styling.Description; import org.geotools.styling.Rule; diff --git a/src/main/java/com/geotwo/webserver/core/render/O2StyleFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/render/O2StyleFactory.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/O2StyleFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/O2StyleFactory.java index f654136..d3bb418 100644 --- a/src/main/java/com/geotwo/webserver/core/render/O2StyleFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/O2StyleFactory.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render; +package kr.or.geoinfo.webserver.core.render; import org.geotools.styling.ChannelSelection; import org.geotools.styling.ColorMap; diff --git a/src/main/java/com/geotwo/webserver/core/render/RefineRenderStyleVisitor.java b/src/main/java/kr/or/geoinfo/webserver/core/render/RefineRenderStyleVisitor.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/RefineRenderStyleVisitor.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/RefineRenderStyleVisitor.java index 6f9d868..a1587be 100644 --- a/src/main/java/com/geotwo/webserver/core/render/RefineRenderStyleVisitor.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/RefineRenderStyleVisitor.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render; +package kr.or.geoinfo.webserver.core.render; import java.awt.BasicStroke; import java.awt.Graphics2D; diff --git a/src/main/java/com/geotwo/webserver/core/render/RefineStyleVisitor.java b/src/main/java/kr/or/geoinfo/webserver/core/render/RefineStyleVisitor.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/render/RefineStyleVisitor.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/RefineStyleVisitor.java index 2ed359f..6d69063 100644 --- a/src/main/java/com/geotwo/webserver/core/render/RefineStyleVisitor.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/RefineStyleVisitor.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render; +package kr.or.geoinfo.webserver.core.render; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; diff --git a/src/main/java/com/geotwo/webserver/core/render/RenderMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/render/RenderMngr.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/render/RenderMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/RenderMngr.java index 2898e02..6c766a6 100644 --- a/src/main/java/com/geotwo/webserver/core/render/RenderMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/RenderMngr.java @@ -1,27 +1,28 @@ -package com.geotwo.webserver.core.render; +package kr.or.geoinfo.webserver.core.render; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerLevelSet; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerUtil; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.GroupLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.map.layer.LinkLayer; -import com.geotwo.webserver.core.map.layer.O2DemLayer; -import com.geotwo.webserver.core.map.layer.O2ImgLayer; -import com.geotwo.webserver.core.map.layer.WMSLayer; -import com.geotwo.webserver.core.render.io.RenderFeatureSource; -import com.geotwo.webserver.core.render.layer.ExFeatureLayer; -import com.geotwo.webserver.core.render.layer.ExO2ImgLayer; -import com.geotwo.webserver.core.render.layer.ExWMSLayer; -import com.geotwo.webserver.core.render.style.MapStyle; -import com.geotwo.webserver.core.render.style.label.LabelCacheEx; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.O2DSMngr; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.drilling.inquiry.service.DrillingInquiryService; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerLevelSet; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.GroupLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.map.layer.LinkLayer; +import kr.or.geoinfo.webserver.core.map.layer.O2DemLayer; +import kr.or.geoinfo.webserver.core.map.layer.O2ImgLayer; +import kr.or.geoinfo.webserver.core.map.layer.WMSLayer; +import kr.or.geoinfo.webserver.core.render.io.RenderFeatureSource; +import kr.or.geoinfo.webserver.core.render.layer.ExFeatureLayer; +import kr.or.geoinfo.webserver.core.render.layer.ExO2ImgLayer; +import kr.or.geoinfo.webserver.core.render.layer.ExWMSLayer; +import kr.or.geoinfo.webserver.core.render.style.MapStyle; +import kr.or.geoinfo.webserver.core.render.style.label.LabelCacheEx; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.O2DSMngr; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Envelope; import java.awt.Color; @@ -74,11 +75,13 @@ import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.feature.type.Name; import org.opengis.filter.Filter; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.springframework.beans.factory.annotation.Autowired; public class RenderMngr { static boolean useImageAntialias = true; static boolean useTextAntialias = true; static Interpolation interpolationMethod = Interpolation.NN; static ThreadPoolExecutor RENDERING_POOL; + public static BufferedImage productMap(AVList params) throws Exception { String[] layers = (String[])params.getValue("request.wms.layers"); @@ -145,6 +148,7 @@ public class RenderMngr { private static void addRenderLayers(ArrayList targetLayers, Layer[] layers, String[] styles, AVList params) throws Exception { int i = 0; + System.out.println("private static void addRenderLayers(ArrayList targetLayers, Layer[] layers, String[] styles, AVList params) throws Exception { layers.length:" + layers.length); while (i < layers.length) { RenderMngr.makeNamedLayer(targetLayers, layers[i], styles[i], params); ++i; @@ -287,7 +291,7 @@ public class RenderMngr { if (layer instanceof FeatureLayer) { Filter filter = (Filter)params.getValue("request.wms.filter"); Style layerStyle = ((FeatureLayer)layer).getRenderStyle(styleName); - RenderMngr.addFeatureLayer(targetLayers, layerStyle, (FeatureLayer)layer, filter); + RenderMngr.addFeatureLayer(targetLayers, layerStyle, (FeatureLayer)layer, filter); // 여기를 주석처리하면 쩜이 박히지 않은 이미지만 생성된다. } else if (layer instanceof GroupLayer) { GroupLayer groupLayer = (GroupLayer)layer; Filter filter = (Filter)params.getValue("request.wms.filter"); @@ -359,6 +363,11 @@ public class RenderMngr { LinkedList styleList = new LinkedList(); for (FeatureTypeStyle fStyle : style.featureTypeStyles()) { if (fStyle.featureTypeNames().isEmpty()) { + System.out.println( + "layer.getLayerType(): [" + layer.getLayerType() + "]\n" + + "layer.getServerName(): [" + layer.getServerName() + "]\n" + + "layer.getSourceName(): [" + layer.getSourceName() + "]\n" + ); RenderMngr.addFeatureTypeStyleList(styleList, layer.getLayerType(), layer.getServerName(), layer.getSourceName(), fStyle); continue; } diff --git a/src/main/java/com/geotwo/webserver/core/render/StyleMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/render/StyleMngr.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/render/StyleMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/StyleMngr.java index 17b5315..d13dc3b 100644 --- a/src/main/java/com/geotwo/webserver/core/render/StyleMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/StyleMngr.java @@ -1,13 +1,13 @@ -package com.geotwo.webserver.core.render; +package kr.or.geoinfo.webserver.core.render; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.feature.GeometryMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.render.sld.SLDConfiguration110; -import com.geotwo.webserver.core.render.sld.SLDParser100; -import com.geotwo.webserver.core.render.sld.SLDTransformer110; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.feature.GeometryMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.render.sld.SLDConfiguration110; +import kr.or.geoinfo.webserver.core.render.sld.SLDParser100; +import kr.or.geoinfo.webserver.core.render.sld.SLDTransformer110; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.awt.AlphaComposite; import java.awt.BasicStroke; import java.awt.Color; diff --git a/src/main/java/com/geotwo/webserver/core/render/io/O2PngWriter.java b/src/main/java/kr/or/geoinfo/webserver/core/render/io/O2PngWriter.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/io/O2PngWriter.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/io/O2PngWriter.java index 503a8d3..af911d1 100644 --- a/src/main/java/com/geotwo/webserver/core/render/io/O2PngWriter.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/io/O2PngWriter.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.io; +package kr.or.geoinfo.webserver.core.render.io; import ar.com.hjg.pngj.FilterType; import ar.com.hjg.pngj.IImageLine; diff --git a/src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureCollection.java b/src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureCollection.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureCollection.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureCollection.java index fbf4325..aa4c722 100644 --- a/src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureCollection.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureCollection.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.io; +package kr.or.geoinfo.webserver.core.render.io; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Point; diff --git a/src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureReader.java b/src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureReader.java similarity index 93% rename from src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureReader.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureReader.java index ade3c46..e4e37cb 100644 --- a/src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureReader.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureReader.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.io; +package kr.or.geoinfo.webserver.core.render.io; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; @@ -14,6 +14,12 @@ import org.geotools.renderer.ScreenMap; import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeatureType; +//--- SQL을 얻기 위해 필요한 import --- +import org.geotools.jdbc.JDBCDataStore; +import org.geotools.jdbc.JDBCFeatureStore; +import org.geotools.jdbc.SQLDialect; +import java.io.StringWriter; + class RenderFeatureReader implements FeatureReader { SimpleFeatureSource source; diff --git a/src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureSource.java b/src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureSource.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureSource.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureSource.java index a8a7a75..440b910 100644 --- a/src/main/java/com/geotwo/webserver/core/render/io/RenderFeatureSource.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/io/RenderFeatureSource.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.io; +package kr.or.geoinfo.webserver.core.render.io; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Point; diff --git a/src/main/java/com/geotwo/webserver/core/render/layer/ExFeatureLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExFeatureLayer.java similarity index 81% rename from src/main/java/com/geotwo/webserver/core/render/layer/ExFeatureLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExFeatureLayer.java index 0aabf7f..4a7ee88 100644 --- a/src/main/java/com/geotwo/webserver/core/render/layer/ExFeatureLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExFeatureLayer.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.layer; +package kr.or.geoinfo.webserver.core.render.layer; -import com.geotwo.webserver.core.render.style.MapStyle; +import kr.or.geoinfo.webserver.core.render.style.MapStyle; import org.geotools.data.FeatureSource; import org.geotools.map.FeatureLayer; import org.geotools.styling.Style; diff --git a/src/main/java/com/geotwo/webserver/core/render/layer/ExO2ImgLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExO2ImgLayer.java similarity index 84% rename from src/main/java/com/geotwo/webserver/core/render/layer/ExO2ImgLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExO2ImgLayer.java index 0fcd76a..69b1f42 100644 --- a/src/main/java/com/geotwo/webserver/core/render/layer/ExO2ImgLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExO2ImgLayer.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.render.layer; +package kr.or.geoinfo.webserver.core.render.layer; -import com.geotwo.webserver.core.coverage.o2layer.O2LayerUtil; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.O2ImgLayer; -import com.geotwo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.coverage.o2layer.O2LayerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.O2ImgLayer; +import kr.or.geoinfo.webserver.core.util.AVList; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import org.geotools.geometry.jts.ReferencedEnvelope; diff --git a/src/main/java/com/geotwo/webserver/core/render/layer/ExWMSLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExWMSLayer.java similarity index 95% rename from src/main/java/com/geotwo/webserver/core/render/layer/ExWMSLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExWMSLayer.java index 8c296b7..1f947ef 100644 --- a/src/main/java/com/geotwo/webserver/core/render/layer/ExWMSLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/layer/ExWMSLayer.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.render.layer; +package kr.or.geoinfo.webserver.core.render.layer; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.LinkLayer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.LinkLayer; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.awt.Color; import java.awt.Graphics2D; import java.awt.image.BufferedImage; diff --git a/src/main/java/com/geotwo/webserver/core/render/legend/LegendGraphicBuilder.java b/src/main/java/kr/or/geoinfo/webserver/core/render/legend/LegendGraphicBuilder.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/render/legend/LegendGraphicBuilder.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/legend/LegendGraphicBuilder.java index 1eea59d..08f106d 100644 --- a/src/main/java/com/geotwo/webserver/core/render/legend/LegendGraphicBuilder.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/legend/LegendGraphicBuilder.java @@ -1,13 +1,13 @@ -package com.geotwo.webserver.core.render.legend; +package kr.or.geoinfo.webserver.core.render.legend; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.GroupLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.O2DSMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.GroupLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.O2DSMngr; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; diff --git a/src/main/java/com/geotwo/webserver/core/render/legend/LegendUtils.java b/src/main/java/kr/or/geoinfo/webserver/core/render/legend/LegendUtils.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/legend/LegendUtils.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/legend/LegendUtils.java index 99e72ba..bc0ebac 100644 --- a/src/main/java/com/geotwo/webserver/core/render/legend/LegendUtils.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/legend/LegendUtils.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.legend; +package kr.or.geoinfo.webserver.core.render.legend; import java.awt.Color; import java.awt.Font; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/CategorizeBinding110.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/CategorizeBinding110.java similarity index 95% rename from src/main/java/com/geotwo/webserver/core/render/sld/CategorizeBinding110.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/CategorizeBinding110.java index 979d4b5..1013f9b 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/CategorizeBinding110.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/CategorizeBinding110.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.awt.Color; import java.util.List; import javax.xml.namespace.QName; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/InterpolateBinding110.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/InterpolateBinding110.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/render/sld/InterpolateBinding110.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/InterpolateBinding110.java index d14090b..7ea5cf2 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/InterpolateBinding110.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/InterpolateBinding110.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.awt.Color; import java.util.List; import javax.xml.namespace.QName; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/SLDConfiguration110.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDConfiguration110.java similarity index 93% rename from src/main/java/com/geotwo/webserver/core/render/sld/SLDConfiguration110.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDConfiguration110.java index b9c7549..8b472a4 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/SLDConfiguration110.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDConfiguration110.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; -import com.geotwo.webserver.core.render.O2StyleFactory; +import kr.or.geoinfo.webserver.core.render.O2StyleFactory; import java.util.Map; import javax.xml.namespace.QName; import org.geotools.se.v1_1.SE; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/SLDParser100.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDParser100.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/sld/SLDParser100.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDParser100.java index 3f3a2c0..3076fff 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/SLDParser100.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDParser100.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; import java.awt.Component; import java.awt.Graphics; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/SLDTransformer110.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDTransformer110.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/sld/SLDTransformer110.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDTransformer110.java index f502935..3a38e1f 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/SLDTransformer110.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/SLDTransformer110.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; -import com.geotwo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.render.StyleMngr; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/StyledLayerDescriptorBinding110.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/StyledLayerDescriptorBinding110.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/render/sld/StyledLayerDescriptorBinding110.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/StyledLayerDescriptorBinding110.java index ffb2db9..8a98e9e 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/StyledLayerDescriptorBinding110.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/StyledLayerDescriptorBinding110.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/geotwo/webserver/core/render/sld/XSBooleanBinding110.java b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/XSBooleanBinding110.java similarity index 89% rename from src/main/java/com/geotwo/webserver/core/render/sld/XSBooleanBinding110.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/sld/XSBooleanBinding110.java index de742b8..5f41081 100644 --- a/src/main/java/com/geotwo/webserver/core/render/sld/XSBooleanBinding110.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/sld/XSBooleanBinding110.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.sld; +package kr.or.geoinfo.webserver.core.render.sld; import org.geotools.xml.InstanceComponent; import org.geotools.xs.bindings.XSBooleanBinding; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/MapStyle.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/MapStyle.java similarity index 93% rename from src/main/java/com/geotwo/webserver/core/render/style/MapStyle.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/MapStyle.java index 39b6ac2..31f0838 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/MapStyle.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/MapStyle.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.style; +package kr.or.geoinfo.webserver.core.render.style; -import com.geotwo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.LayerFactory; import org.geotools.styling.StyleImpl; public class MapStyle extends StyleImpl { diff --git a/src/main/java/com/geotwo/webserver/core/render/style/O2WellKnownMarkFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/O2WellKnownMarkFactory.java similarity index 92% rename from src/main/java/com/geotwo/webserver/core/render/style/O2WellKnownMarkFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/O2WellKnownMarkFactory.java index 3950510..6f2ecdc 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/O2WellKnownMarkFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/O2WellKnownMarkFactory.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style; +package kr.or.geoinfo.webserver.core.render.style; import java.awt.Graphics2D; import java.awt.Shape; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelCacheEx.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelCacheEx.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/style/label/LabelCacheEx.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelCacheEx.java index 0999f65..c99b442 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelCacheEx.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelCacheEx.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.render.style.label; +package kr.or.geoinfo.webserver.core.render.style.label; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.render.style.label.util.AWTLabelUtil; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.render.style.label.util.AWTLabelUtil; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelCacheItemEx.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelCacheItemEx.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/render/style/label/LabelCacheItemEx.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelCacheItemEx.java index dfc18de..aace1dd 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelCacheItemEx.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelCacheItemEx.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style.label; +package kr.or.geoinfo.webserver.core.render.style.label; import org.geotools.geometry.jts.LiteShape2; import org.geotools.renderer.label.LabelCacheItem; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelInfo.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/render/style/label/LabelInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelInfo.java index 46c1d5b..0afd926 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelInfo.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style.label; +package kr.or.geoinfo.webserver.core.render.style.label; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Polygon; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelPainterEx.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelPainterEx.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/style/label/LabelPainterEx.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelPainterEx.java index 93b74ed..f5aa162 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/LabelPainterEx.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/LabelPainterEx.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style.label; +package kr.or.geoinfo.webserver.core.render.style.label; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/TextStyle2DEx.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/TextStyle2DEx.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/render/style/label/TextStyle2DEx.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/TextStyle2DEx.java index b0e6ad1..0a32dbd 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/TextStyle2DEx.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/TextStyle2DEx.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style.label; +package kr.or.geoinfo.webserver.core.render.style.label; import com.vividsolutions.jts.algorithm.MinimumDiameter; import com.vividsolutions.jts.geom.Coordinate; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/TransformedIconEx.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/TransformedIconEx.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/render/style/label/TransformedIconEx.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/TransformedIconEx.java index b082ae5..e98723e 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/TransformedIconEx.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/TransformedIconEx.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style.label; +package kr.or.geoinfo.webserver.core.render.style.label; import java.awt.Component; import java.awt.Graphics; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/util/AWTLabelUtil.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/util/AWTLabelUtil.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/render/style/label/util/AWTLabelUtil.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/util/AWTLabelUtil.java index 5764c28..2924ebc 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/util/AWTLabelUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/util/AWTLabelUtil.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.render.style.label.util; +package kr.or.geoinfo.webserver.core.render.style.label.util; -import com.geotwo.webserver.core.render.style.label.LabelInfo; +import kr.or.geoinfo.webserver.core.render.style.label.LabelInfo; import java.awt.geom.AffineTransform; import java.awt.geom.GeneralPath; import java.awt.geom.Line2D; diff --git a/src/main/java/com/geotwo/webserver/core/render/style/label/util/KLISLabelUtil.java b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/util/KLISLabelUtil.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/render/style/label/util/KLISLabelUtil.java rename to src/main/java/kr/or/geoinfo/webserver/core/render/style/label/util/KLISLabelUtil.java index 784b2b2..35cd080 100644 --- a/src/main/java/com/geotwo/webserver/core/render/style/label/util/KLISLabelUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/render/style/label/util/KLISLabelUtil.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.render.style.label.util; +package kr.or.geoinfo.webserver.core.render.style.label.util; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Polygon; diff --git a/src/main/java/kr/or/geoinfo/webserver/core/service/AbstractService.java b/src/main/java/kr/or/geoinfo/webserver/core/service/AbstractService.java new file mode 100644 index 0000000..a8870e1 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/webserver/core/service/AbstractService.java @@ -0,0 +1,29 @@ +package kr.or.geoinfo.webserver.core.service; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public abstract class AbstractService extends HttpServlet { + private static final long serialVersionUID = 2014061020172321L; + + public abstract Object parseQuery(HttpServletRequest paramHttpServletRequest) throws Exception; + + public abstract String doProcess(String paramString); + + public void service(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException { + super.service(arg0, arg1); + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + super.doGet(req, resp); + } + + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + super.doPost(req, resp); + } +} \ No newline at end of file diff --git a/src/main/java/com/geotwo/webserver/core/service/InitServer.java b/src/main/java/kr/or/geoinfo/webserver/core/service/InitServer.java similarity index 79% rename from src/main/java/com/geotwo/webserver/core/service/InitServer.java rename to src/main/java/kr/or/geoinfo/webserver/core/service/InitServer.java index b6d35e9..c9a5071 100644 --- a/src/main/java/com/geotwo/webserver/core/service/InitServer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/service/InitServer.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.service; +package kr.or.geoinfo.webserver.core.service; -import com.geotwo.webserver.core.ServerInfo; -import com.geotwo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.ServerInfo; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/src/main/java/com/geotwo/webserver/core/service/ServerInfoService.java b/src/main/java/kr/or/geoinfo/webserver/core/service/ServerInfoService.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/service/ServerInfoService.java rename to src/main/java/kr/or/geoinfo/webserver/core/service/ServerInfoService.java index 0ea79e1..b7801fd 100644 --- a/src/main/java/com/geotwo/webserver/core/service/ServerInfoService.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/service/ServerInfoService.java @@ -1,13 +1,13 @@ -package com.geotwo.webserver.core.service; +package kr.or.geoinfo.webserver.core.service; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.ServerInfo; -import com.geotwo.webserver.core.cache.ImgCacheMngr; -import com.geotwo.webserver.core.init.ServerConfiguration; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.plugin.ows.util.PluginUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.ServerInfo; +import kr.or.geoinfo.webserver.core.cache.ImgCacheMngr; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.plugin.ows.util.PluginUtil; import java.io.IOException; import java.io.OutputStream; import java.util.HashMap; diff --git a/src/main/java/kr/or/geoinfo/webserver/core/service/Service.java b/src/main/java/kr/or/geoinfo/webserver/core/service/Service.java new file mode 100644 index 0000000..509df5d --- /dev/null +++ b/src/main/java/kr/or/geoinfo/webserver/core/service/Service.java @@ -0,0 +1,182 @@ +package kr.or.geoinfo.webserver.core.service; + +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.ServerInfo; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.plugin.ows.util.PluginUtil; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; +import java.text.DecimalFormat; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +public class Service extends AbstractService { + private static final long serialVersionUID = 2014061008205121L; + + private static final int SLEEP_TIME = 1000; + + private static final int MAX_SLEEP_TIME = 20000; + + public String parseQuery(HttpServletRequest req) throws Exception { + return null; + } + + public String doProcess(String str) { + return null; + } + + public void service(ServletRequest req, ServletResponse resp) throws ServletException, IOException { + req.setCharacterEncoding("UTF-8"); + String rootPath = ((HttpServletRequest) req).getContextPath(); + String serviceName = ((HttpServletRequest) req).getRequestURI().replace(rootPath, ""); + while (serviceName.endsWith("/")) + serviceName = serviceName.substring(0, serviceName.length() - 1); + long reqId = System.currentTimeMillis(); + if (((HttpServletRequest) req).getMethod().equalsIgnoreCase("GET")) { + LogMngr.getInstance().reqInfo("[REQUEST]", + "[" + reqId + "] GET, From " + PluginUtil.getClientIP((HttpServletRequest) req) + + " To " + ((serviceName.length() == 0) ? "/" : serviceName) + " , Request : " + ((HttpServletRequest) req).getQueryString()); + } else { + LogMngr.getInstance().reqInfo("[REQUEST]", + "[" + reqId + "] POST, From " + PluginUtil.getClientIP((HttpServletRequest) req) + + " To " + ((serviceName.length() == 0) ? "/" : serviceName) + " , Request : " + ((HttpServletRequest) req).getQueryString()); + } + if (serviceName.length() == 0) { + RequestDispatcher dispatcher = req.getRequestDispatcher("index.html"); + dispatcher.forward(req, resp); + return; + } + if (isFileService(serviceName)) { + File file = new File(getServletContext().getRealPath(serviceName)); + writeFileResponse(resp, file); + return; + } + HttpServlet service = ServiceMngr.getService(serviceName); + if (service != null) { + if (service instanceof ServerInfoService) { + service.service(req, resp); + } else if (ServerInfo.getInstance().isStarted()) { + if (ServerInfo.getInstance().isReStarting()) { + long sleepTile = System.currentTimeMillis(); + while (true) { + if (System.currentTimeMillis() - sleepTile > 20000L) { + writeFailResponse(resp, "O2Map Web is busy to restart. Waiting time for request has been exceeded. [20/sec]"); + break; + } + if (!ServerInfo.getInstance().isReStarting()) { + service.service(req, resp); + break; + } + try { + Thread.sleep(1000L); + } catch (InterruptedException interruptedException) {} + } + } else { + service.service(req, resp); + } + } else { + writeFailResponse(resp, "O2Map Web is not ready. Please check up server configurations and restart server."); + } + } else { + writeFailResponse(resp, "Service [" + serviceName + "] is unregistered Service on O2Map Web."); + } + LogMngr.getInstance().reqInfo("[RESPONSE]", + "[" + reqId + "] is Finish." + + + "Time : " + (new DecimalFormat(".##")).format((System.currentTimeMillis() - reqId) / 1000.0D) + "/sec"); + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + super.doGet(req, resp); + } + + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + super.doPost(req, resp); + } + + private boolean isFileService(String uri) { + try { + File file = new File(getServletContext().getRealPath(uri)); + if (file.exists()) + return true; + } catch (Exception exception) {} + return false; + } + + private void writeFileResponse(ServletResponse resp, File file) { + try { + int length = 0; + ServletOutputStream outStream = resp.getOutputStream(); + String mimetype = getServletContext().getMimeType(file.getAbsolutePath()); + if (mimetype == null) + mimetype = "application/octet-stream"; + resp.setContentType(mimetype); + resp.setContentLength((int) file.length()); + byte[] byteBuffer = new byte[1024]; + FileInputStream in = new FileInputStream(file); + while (in != null && (length = in.read(byteBuffer)) != -1) + outStream.write(byteBuffer, 0, length); + in.close(); + outStream.close(); + } catch (FileNotFoundException e) { + LogMngr.getInstance().logError("[SERVICE]", "Request file not found. :: " + e.getMessage()); + } catch (IOException e) { + LogMngr.getInstance().logError("[SERVICE]", "Can't make response output stream. :: " + e.getMessage()); + } + } + + private void writeFailResponse(ServletResponse resp, String msg) { + try { + LogMngr.getInstance().logError("[SERVICE]", msg); + Document doc = getFailDocument(msg); + Transformer xformer = TransformerFactory.newInstance().newTransformer(); + if (ServerContext.getDocIndent().intValue() > 0) { + xformer.setOutputProperty("indent", "yes"); + xformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", ServerContext.getDocIndent().toString()); + } + resp.setContentType("text/xml; charset=UTF-8"); + xformer.transform(new DOMSource(doc), new StreamResult((OutputStream) resp.getOutputStream())); + } catch (Exception e) { + LogMngr.getInstance().logError("[SERVICE]", "Do not create XML : " + Service.class + " / " + e.getMessage()); + } + } + + private static Document getFailDocument(String msg) throws ParserConfigurationException { + DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); + Document doc = docBuilder.newDocument(); + Element rootElement = doc.createElement("SERVER"); + doc.appendChild(rootElement); + Element result = doc.createElement("RESULT"); + result.appendChild(doc.createTextNode("Fail")); + rootElement.appendChild(result); + Element errorMessage = doc.createElement("INFO"); + errorMessage.appendChild(doc.createTextNode(msg)); + rootElement.appendChild(errorMessage); + return doc; + } + + public void destroy() { + super.destroy(); + ServerConfiguration.getInstance().stopServer(); + } +} \ No newline at end of file diff --git a/src/main/java/com/geotwo/webserver/core/service/ServiceMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/service/ServiceMngr.java similarity index 70% rename from src/main/java/com/geotwo/webserver/core/service/ServiceMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/service/ServiceMngr.java index 3902193..705dc2e 100644 --- a/src/main/java/com/geotwo/webserver/core/service/ServiceMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/service/ServiceMngr.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.service; +package kr.or.geoinfo.webserver.core.service; -import com.geotwo.webserver.core.ServerInfo; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.ServerInfo; +import kr.or.geoinfo.webserver.core.log.LogMngr; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; @@ -59,20 +59,8 @@ public class ServiceMngr { LogMngr.getInstance().logInfo("[SERVICE]", "======================================"); LogMngr.getInstance().logDebug("[SERVICE]", "Exist Services clear all"); ServiceMngr.clearService(); - ServiceMngr.createService("/serverinfo", "geoinfo.map.myMap.ServerInfoService"); if (ServerInfo.getInstance().isStarted()) { - ServiceMngr.createService("/service", "geoinfo.map.myMap.ServicesService"); - ServiceMngr.createService("/drilling/map/start.do", "com.geotwo.webserver.plugin.ows.service.WMSService"); - ServiceMngr.createService("/drilling/map/wms.do", "com.geotwo.webserver.plugin.ows.service.WMSService"); - ServiceMngr.createService("/services/wms", "com.geotwo.webserver.plugin.ows.service.WMSService"); - ServiceMngr.createService("/services/wfs", "com.geotwo.webserver.plugin.ows.service.WFSService"); - ServiceMngr.createService("/services/wcs", "com.geotwo.webserver.plugin.ows.service.WCSService"); - ServiceMngr.createService("/services/wps", "com.geotwo.webserver.plugin.ows.service.WPSService"); - ServiceMngr.createService("/services/wmts", "com.geotwo.webserver.plugin.ows.service.WMTSService"); - ServiceMngr.createService("/services/tms", "com.geotwo.webserver.plugin.ows.service.TMSService"); - ServiceMngr.createService("/services/uwes", "com.geotwo.webserver.plugin.uwes.service.UWESService"); - ServiceMngr.createService("/services/o2wps", "com.geotwo.webserver.plugin.o2wps.service.O2WPSService"); - ServiceMngr.createService("/services/icache", "com.geotwo.webserver.plugin.ows.service.ImgCacheService"); + ServiceMngr.createService("/services/wms", "kr.or.geoinfo.webserver.plugin.ows.service.WMSService"); } LogMngr.getInstance().logInfo("[SERVICE]", ""); LogMngr.getInstance().logInfo("[SERVER]", "================================="); diff --git a/src/main/java/com/geotwo/webserver/core/tile/tms/TMSInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/tms/TMSInfo.java similarity index 90% rename from src/main/java/com/geotwo/webserver/core/tile/tms/TMSInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/tms/TMSInfo.java index 53bb686..c679246 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/tms/TMSInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/tms/TMSInfo.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.tile.tms; +package kr.or.geoinfo.webserver.core.tile.tms; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.File; public class TMSInfo { diff --git a/src/main/java/com/geotwo/webserver/core/tile/tms/TMSMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/tms/TMSMngr.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/tile/tms/TMSMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/tms/TMSMngr.java index 5222e37..72e2459 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/tms/TMSMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/tms/TMSMngr.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.tile.tms; +package kr.or.geoinfo.webserver.core.tile.tms; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrix.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrix.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrix.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrix.java index 8d875d5..2147bc7 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrix.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrix.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.tile.wmts; +package kr.or.geoinfo.webserver.core.tile.wmts; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; diff --git a/src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrixRule.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrixRule.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrixRule.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrixRule.java index f6869ce..bdf962e 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrixRule.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrixRule.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.tile.wmts; +package kr.or.geoinfo.webserver.core.tile.wmts; -import com.geotwo.webserver.core.tile.wmts.TileMatrix; +import kr.or.geoinfo.webserver.core.tile.wmts.TileMatrix; import java.io.File; public class TileMatrixRule { diff --git a/src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrixSet.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrixSet.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrixSet.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrixSet.java index 357c3d6..413f3bc 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/wmts/TileMatrixSet.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/TileMatrixSet.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.tile.wmts; +package kr.or.geoinfo.webserver.core.tile.wmts; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/geotwo/webserver/core/tile/wmts/WMTSLayer.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/WMTSLayer.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/tile/wmts/WMTSLayer.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/WMTSLayer.java index 8650287..433b1e0 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/wmts/WMTSLayer.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/WMTSLayer.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.tile.wmts; +package kr.or.geoinfo.webserver.core.tile.wmts; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import org.geotools.geometry.jts.ReferencedEnvelope; public class WMTSLayer { diff --git a/src/main/java/com/geotwo/webserver/core/tile/wmts/WMTSMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/WMTSMngr.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/tile/wmts/WMTSMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/WMTSMngr.java index 2dd6872..c3a47e7 100644 --- a/src/main/java/com/geotwo/webserver/core/tile/wmts/WMTSMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/tile/wmts/WMTSMngr.java @@ -1,10 +1,10 @@ -package com.geotwo.webserver.core.tile.wmts; +package kr.or.geoinfo.webserver.core.tile.wmts; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import java.io.File; import java.io.FilenameFilter; import java.util.ArrayList; diff --git a/src/main/java/com/geotwo/webserver/core/util/AVList.java b/src/main/java/kr/or/geoinfo/webserver/core/util/AVList.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/util/AVList.java rename to src/main/java/kr/or/geoinfo/webserver/core/util/AVList.java index ad87bab..57d81f1 100644 --- a/src/main/java/com/geotwo/webserver/core/util/AVList.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/util/AVList.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.util; +package kr.or.geoinfo.webserver.core.util; import java.awt.Color; import java.net.URL; diff --git a/src/main/java/com/geotwo/webserver/core/util/EncryptUtil.java b/src/main/java/kr/or/geoinfo/webserver/core/util/EncryptUtil.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/util/EncryptUtil.java rename to src/main/java/kr/or/geoinfo/webserver/core/util/EncryptUtil.java index f027913..aaea1cb 100644 --- a/src/main/java/com/geotwo/webserver/core/util/EncryptUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/util/EncryptUtil.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.util; +package kr.or.geoinfo.webserver.core.util; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/geotwo/webserver/core/util/ServerUtil.java b/src/main/java/kr/or/geoinfo/webserver/core/util/ServerUtil.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/util/ServerUtil.java rename to src/main/java/kr/or/geoinfo/webserver/core/util/ServerUtil.java index 81832b1..a949191 100644 --- a/src/main/java/com/geotwo/webserver/core/util/ServerUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/util/ServerUtil.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.util; +package kr.or.geoinfo.webserver.core.util; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; import com.vividsolutions.jts.geom.Envelope; import java.awt.Color; import java.awt.Rectangle; diff --git a/src/main/java/com/geotwo/webserver/core/vector/GWaveStoreMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/GWaveStoreMngr.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/GWaveStoreMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/GWaveStoreMngr.java index d530896..e84f113 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/GWaveStoreMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/GWaveStoreMngr.java @@ -1,15 +1,15 @@ -package com.geotwo.webserver.core.vector; +package kr.or.geoinfo.webserver.core.vector; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.core.vector.geowave.GWaveLayerInfo; -import com.geotwo.webserver.core.vector.geowave.GeoWaveDataStore; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.vector.geowave.GWaveLayerInfo; +import kr.or.geoinfo.webserver.core.vector.geowave.GeoWaveDataStore; import com.geowave.drvier.GWDriver; import com.geowave.vectordrvier.GWVectorDriver; import java.io.BufferedReader; diff --git a/src/main/java/com/geotwo/webserver/core/vector/JdbcStoreMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/JdbcStoreMngr.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/JdbcStoreMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/JdbcStoreMngr.java index 03d1e52..bafa155 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/JdbcStoreMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/JdbcStoreMngr.java @@ -1,17 +1,17 @@ -package com.geotwo.webserver.core.vector; +package kr.or.geoinfo.webserver.core.vector; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.init.ConnMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.EncryptUtil; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.init.ConnMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.EncryptUtil; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/geotwo/webserver/core/vector/O2DSMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/O2DSMngr.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/O2DSMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/O2DSMngr.java index 4f2ab60..0faa049 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/O2DSMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/O2DSMngr.java @@ -1,10 +1,10 @@ -package com.geotwo.webserver.core.vector; +package kr.or.geoinfo.webserver.core.vector; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.geowave.GeoWaveDataStore; -import com.geotwo.webserver.core.vector.memory.O2SpatialIndexFeatureCollection; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.geowave.GeoWaveDataStore; +import kr.or.geoinfo.webserver.core.vector.memory.O2SpatialIndexFeatureCollection; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/geotwo/webserver/core/vector/ShpStoreMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/ShpStoreMngr.java similarity index 95% rename from src/main/java/com/geotwo/webserver/core/vector/ShpStoreMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/ShpStoreMngr.java index 986236b..b391f4e 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/ShpStoreMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/ShpStoreMngr.java @@ -1,15 +1,15 @@ -package com.geotwo.webserver.core.vector; +package kr.or.geoinfo.webserver.core.vector; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.shape.ShpIndexMngr; -import com.geotwo.webserver.core.vector.shape.ShpLayerInfo; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.shape.ShpIndexMngr; +import kr.or.geoinfo.webserver.core.vector.shape.ShpLayerInfo; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/com/geotwo/webserver/core/vector/WpsVecStoreMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/WpsVecStoreMngr.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/WpsVecStoreMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/WpsVecStoreMngr.java index 32abc53..16bfbb5 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/WpsVecStoreMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/WpsVecStoreMngr.java @@ -1,19 +1,19 @@ -package com.geotwo.webserver.core.vector; +package kr.or.geoinfo.webserver.core.vector; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.init.ConnMngr; -import com.geotwo.webserver.core.init.ServerConfiguration; -import com.geotwo.webserver.core.init.conn.util.FieldInfo; -import com.geotwo.webserver.core.init.conn.util.FieldSQL; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; -import com.geotwo.webserver.core.vector.shape.ShpIndexMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.init.ConnMngr; +import kr.or.geoinfo.webserver.core.init.ServerConfiguration; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldInfo; +import kr.or.geoinfo.webserver.core.init.conn.util.FieldSQL; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.vector.shape.ShpIndexMngr; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; diff --git a/src/main/java/com/geotwo/webserver/core/vector/crs/CRSMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/crs/CRSMngr.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/vector/crs/CRSMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/crs/CRSMngr.java index ef04604..6b41488 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/crs/CRSMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/crs/CRSMngr.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.vector.crs; +package kr.or.geoinfo.webserver.core.vector.crs; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.Map; -import com.geotwo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.Map; +import kr.or.geoinfo.webserver.core.map.layer.Layer; import java.awt.RenderingHints; import java.util.Iterator; import org.geotools.factory.GeoTools; diff --git a/src/main/java/com/geotwo/webserver/core/vector/crs/O2CRSFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/crs/O2CRSFactory.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/crs/O2CRSFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/crs/O2CRSFactory.java index 8251964..e8d63af 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/crs/O2CRSFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/crs/O2CRSFactory.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.vector.crs; +package kr.or.geoinfo.webserver.core.vector.crs; -import com.geotwo.webserver.core.init.ConnMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.init.ConnMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; diff --git a/src/main/java/com/geotwo/webserver/core/vector/crs/O2CRSOverrideFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/crs/O2CRSOverrideFactory.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/crs/O2CRSOverrideFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/crs/O2CRSOverrideFactory.java index 016c3bb..77928cc 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/crs/O2CRSOverrideFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/crs/O2CRSOverrideFactory.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.vector.crs; +package kr.or.geoinfo.webserver.core.vector.crs; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/com/geotwo/webserver/core/vector/geowave/GWaveLayerInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GWaveLayerInfo.java similarity index 90% rename from src/main/java/com/geotwo/webserver/core/vector/geowave/GWaveLayerInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GWaveLayerInfo.java index 6d6684c..5b2e1a4 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/geowave/GWaveLayerInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GWaveLayerInfo.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.vector.geowave; +package kr.or.geoinfo.webserver.core.vector.geowave; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; public class GWaveLayerInfo { private boolean activate = false; diff --git a/src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveDataStore.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveDataStore.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveDataStore.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveDataStore.java index 796cfbd..3480cb1 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveDataStore.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveDataStore.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.core.vector.geowave; +package kr.or.geoinfo.webserver.core.vector.geowave; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.StyleMngr; import com.geowave.vectordrvier.GWVectorDriver; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveFeatureReader.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveFeatureReader.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveFeatureReader.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveFeatureReader.java index 25e950a..658101a 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveFeatureReader.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveFeatureReader.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.geowave; +package kr.or.geoinfo.webserver.core.vector.geowave; import com.geowave.vectordrvier.GWVectorDriver; import com.geowave.vectordrvier.GWVectorQuery; diff --git a/src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveFeatureSource.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveFeatureSource.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveFeatureSource.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveFeatureSource.java index 8d5972a..9b30007 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/geowave/GeoWaveFeatureSource.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/geowave/GeoWaveFeatureSource.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.geowave; +package kr.or.geoinfo.webserver.core.vector.geowave; import com.geowave.metadata.FeatureColumnInfo; import com.geowave.vectordrvier.GWVectorDriver; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2DSFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2DSFactory.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/O2DSFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2DSFactory.java index 7209270..61c2be0 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2DSFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2DSFactory.java @@ -1,12 +1,12 @@ -package com.geotwo.webserver.core.vector.jdbc; +package kr.or.geoinfo.webserver.core.vector.jdbc; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.init.ConnMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.vector.jdbc.ns.NonSpatialDialect; -import com.geotwo.webserver.core.vector.jdbc.oracle.OracleDialect; -import com.geotwo.webserver.core.vector.jdbc.simple.SimpleDialect; -import com.geotwo.webserver.core.vector.jdbc.simple.SimpleSql; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.init.ConnMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.ns.NonSpatialDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.oracle.OracleDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.simple.SimpleDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.simple.SimpleSql; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2DSPrimaryKeyFinder.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2DSPrimaryKeyFinder.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/O2DSPrimaryKeyFinder.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2DSPrimaryKeyFinder.java index b0b2674..1db8efc 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2DSPrimaryKeyFinder.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2DSPrimaryKeyFinder.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.vector.jdbc; +package kr.or.geoinfo.webserver.core.vector.jdbc; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.ResultSet; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2GeometryTypeMap.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2GeometryTypeMap.java similarity index 95% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/O2GeometryTypeMap.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2GeometryTypeMap.java index 0ae5f66..7b113e7 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2GeometryTypeMap.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2GeometryTypeMap.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc; +package kr.or.geoinfo.webserver.core.vector.jdbc; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryCollection; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2SqlDialect.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2SqlDialect.java similarity index 87% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/O2SqlDialect.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2SqlDialect.java index 9f17e31..b81f97a 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/O2SqlDialect.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/O2SqlDialect.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc; +package kr.or.geoinfo.webserver.core.vector.jdbc; import java.sql.Connection; import java.util.List; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/WKBAttributeIO.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/WKBAttributeIO.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/WKBAttributeIO.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/WKBAttributeIO.java index cb2a282..fd75509 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/WKBAttributeIO.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/WKBAttributeIO.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc; +package kr.or.geoinfo.webserver.core.vector.jdbc; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/ns/NonSpatialDialect.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/ns/NonSpatialDialect.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/ns/NonSpatialDialect.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/ns/NonSpatialDialect.java index 3f10b5e..3badd8c 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/ns/NonSpatialDialect.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/ns/NonSpatialDialect.java @@ -1,11 +1,11 @@ -package com.geotwo.webserver.core.vector.jdbc.ns; +package kr.or.geoinfo.webserver.core.vector.jdbc.ns; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; -import com.geotwo.webserver.core.vector.jdbc.O2GeometryTypeMap; -import com.geotwo.webserver.core.vector.jdbc.O2SqlDialect; -import com.geotwo.webserver.core.vector.jdbc.WKBAttributeIO; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2GeometryTypeMap; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2SqlDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.WKBAttributeIO; import com.tmax.tibero.jdbc.TbBlob; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/ns/NonSpatialFilterToSQL.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/ns/NonSpatialFilterToSQL.java similarity index 95% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/ns/NonSpatialFilterToSQL.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/ns/NonSpatialFilterToSQL.java index 5a5b249..b44791d 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/ns/NonSpatialFilterToSQL.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/ns/NonSpatialFilterToSQL.java @@ -1,9 +1,9 @@ -package com.geotwo.webserver.core.vector.jdbc.ns; +package kr.or.geoinfo.webserver.core.vector.jdbc.ns; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import com.vividsolutions.jts.geom.Envelope; import java.sql.Connection; import java.sql.ResultSet; @@ -125,7 +125,7 @@ public class NonSpatialFilterToSQL extends PreparedFilterToSQL { try { ArrayList layers = ServerContext.getMap().getAllLayers(); for (Layer layer : layers) { - if (!(layer instanceof com.geotwo.webserver.core.map.layer.FeatureLayer)) + if (!(layer instanceof kr.or.geoinfo.webserver.core.map.layer.FeatureLayer)) continue; if (layer.getServerName().equalsIgnoreCase(this.dsDialectNS.serverName) && layer.getSourceName().equalsIgnoreCase(this.featureType.getTypeName())) @@ -152,7 +152,7 @@ public class NonSpatialFilterToSQL extends PreparedFilterToSQL { try { ArrayList layers = ServerContext.getMap().getAllLayers(); for (Layer layer : layers) { - if (!(layer instanceof com.geotwo.webserver.core.map.layer.FeatureLayer)) + if (!(layer instanceof kr.or.geoinfo.webserver.core.map.layer.FeatureLayer)) continue; if (layer.getSourceName().equalsIgnoreCase(typeName)) return layer.getCRS(); diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/OracleDialect.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/OracleDialect.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/OracleDialect.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/OracleDialect.java index 461bd5f..51fff26 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/OracleDialect.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/OracleDialect.java @@ -1,11 +1,11 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; -import com.geotwo.webserver.core.vector.jdbc.O2GeometryTypeMap; -import com.geotwo.webserver.core.vector.jdbc.O2SqlDialect; -import com.geotwo.webserver.core.vector.jdbc.oracle.sdo.GeometryConverter; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2GeometryTypeMap; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2SqlDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo.GeometryConverter; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.CoordinateSequence; import com.vividsolutions.jts.geom.Envelope; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/OracleFilterToSQL.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/OracleFilterToSQL.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/OracleFilterToSQL.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/OracleFilterToSQL.java index ee52f41..4db3a03 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/OracleFilterToSQL.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/OracleFilterToSQL.java @@ -1,10 +1,10 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle; //thkim 완전히 검증됨 -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.vector.jdbc.oracle.OracleDialect; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.vector.jdbc.oracle.OracleDialect; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.Polygon; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/AttributeList.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/AttributeList.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/AttributeList.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/AttributeList.java index 4e3ccff..5618edd 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/AttributeList.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/AttributeList.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import java.lang.reflect.Array; import java.util.AbstractList; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccess.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccess.java similarity index 93% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccess.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccess.java index 5178acf..3e715a5 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccess.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccess.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import com.vividsolutions.jts.geom.CoordinateSequence; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccessFactory.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccessFactory.java similarity index 82% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccessFactory.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccessFactory.java index ba40ea8..3d73843 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccessFactory.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/CoordinateAccessFactory.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import com.vividsolutions.jts.geom.CoordinateSequenceFactory; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/Coordinates.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/Coordinates.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/Coordinates.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/Coordinates.java index 1d86af0..335a8bc 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/Coordinates.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/Coordinates.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.CoordinateSequence; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/GeometryConverter.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/GeometryConverter.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/GeometryConverter.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/GeometryConverter.java index 1506859..02b612d 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/GeometryConverter.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/GeometryConverter.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.CoordinateList; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/OrdinateList.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/OrdinateList.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/OrdinateList.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/OrdinateList.java index f30a814..5545bc7 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/OrdinateList.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/OrdinateList.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import java.util.AbstractList; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/SDO.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/SDO.java similarity index 99% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/SDO.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/SDO.java index 1cca4a5..c4507f7 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/oracle/sdo/SDO.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/oracle/sdo/SDO.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.oracle.sdo; +package kr.or.geoinfo.webserver.core.vector.jdbc.oracle.sdo; import com.vividsolutions.jts.algorithm.RobustCGAlgorithms; import com.vividsolutions.jts.geom.Coordinate; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleDialect.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleDialect.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleDialect.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleDialect.java index 312eafe..cc353b8 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleDialect.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleDialect.java @@ -1,11 +1,11 @@ -package com.geotwo.webserver.core.vector.jdbc.simple; +package kr.or.geoinfo.webserver.core.vector.jdbc.simple; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.core.vector.jdbc.O2DSFactory; -import com.geotwo.webserver.core.vector.jdbc.O2GeometryTypeMap; -import com.geotwo.webserver.core.vector.jdbc.O2SqlDialect; -import com.geotwo.webserver.core.vector.jdbc.WKBAttributeIO; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2DSFactory; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2GeometryTypeMap; +import kr.or.geoinfo.webserver.core.vector.jdbc.O2SqlDialect; +import kr.or.geoinfo.webserver.core.vector.jdbc.WKBAttributeIO; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleFilterToSQL.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleFilterToSQL.java similarity index 94% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleFilterToSQL.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleFilterToSQL.java index c12db0f..a69849a 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleFilterToSQL.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleFilterToSQL.java @@ -1,12 +1,12 @@ -package com.geotwo.webserver.core.vector.jdbc.simple; +package kr.or.geoinfo.webserver.core.vector.jdbc.simple; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.core.vector.jdbc.simple.SimpleDialect; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.vector.jdbc.simple.SimpleDialect; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.Polygon; diff --git a/src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleSql.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleSql.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleSql.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleSql.java index f41cf8a..8f0f84c 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/jdbc/simple/SimpleSql.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/jdbc/simple/SimpleSql.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.jdbc.simple; +package kr.or.geoinfo.webserver.core.vector.jdbc.simple; public class SimpleSql { public final String KEY_GEOMTRY = "?GEOMETRY?"; diff --git a/src/main/java/com/geotwo/webserver/core/vector/memory/O2SpatialIndexFeatureCollection.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/memory/O2SpatialIndexFeatureCollection.java similarity index 97% rename from src/main/java/com/geotwo/webserver/core/vector/memory/O2SpatialIndexFeatureCollection.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/memory/O2SpatialIndexFeatureCollection.java index 6f63e99..6dad28b 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/memory/O2SpatialIndexFeatureCollection.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/memory/O2SpatialIndexFeatureCollection.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.core.vector.memory; +package kr.or.geoinfo.webserver.core.vector.memory; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.index.ItemVisitor; diff --git a/src/main/java/com/geotwo/webserver/core/vector/o2wps/O2WpsLayerSet.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/o2wps/O2WpsLayerSet.java similarity index 96% rename from src/main/java/com/geotwo/webserver/core/vector/o2wps/O2WpsLayerSet.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/o2wps/O2WpsLayerSet.java index 99a4e94..f57cf14 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/o2wps/O2WpsLayerSet.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/o2wps/O2WpsLayerSet.java @@ -1,14 +1,14 @@ -package com.geotwo.webserver.core.vector.o2wps; +package kr.or.geoinfo.webserver.core.vector.o2wps; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.map.LayerFactory; -import com.geotwo.webserver.core.map.LayerFactory.LayerType; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.WpsVecStoreMngr; -import com.geotwo.webserver.core.vector.WpsVecStoreMngr.O2WpsMetaFieldName; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.map.LayerFactory; +import kr.or.geoinfo.webserver.core.map.LayerFactory.LayerType; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.WpsVecStoreMngr; +import kr.or.geoinfo.webserver.core.vector.WpsVecStoreMngr.O2WpsMetaFieldName; import java.io.IOException; import java.sql.Connection; diff --git a/src/main/java/com/geotwo/webserver/core/vector/shape/ShpIndexMngr.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/shape/ShpIndexMngr.java similarity index 98% rename from src/main/java/com/geotwo/webserver/core/vector/shape/ShpIndexMngr.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/shape/ShpIndexMngr.java index bfb5872..fa42fd1 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/shape/ShpIndexMngr.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/shape/ShpIndexMngr.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.core.vector.shape; +package kr.or.geoinfo.webserver.core.vector.shape; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.GeometryFactory; import java.io.File; diff --git a/src/main/java/com/geotwo/webserver/core/vector/shape/ShpLayerInfo.java b/src/main/java/kr/or/geoinfo/webserver/core/vector/shape/ShpLayerInfo.java similarity index 90% rename from src/main/java/com/geotwo/webserver/core/vector/shape/ShpLayerInfo.java rename to src/main/java/kr/or/geoinfo/webserver/core/vector/shape/ShpLayerInfo.java index d6ef3d5..8c34286 100644 --- a/src/main/java/com/geotwo/webserver/core/vector/shape/ShpLayerInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/core/vector/shape/ShpLayerInfo.java @@ -1,8 +1,8 @@ -package com.geotwo.webserver.core.vector.shape; +package kr.or.geoinfo.webserver.core.vector.shape; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; import java.io.File; import org.opengis.referencing.crs.CoordinateReferenceSystem; diff --git a/src/main/java/com/geotwo/webserver/plugin/ServicesService.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ServicesService.java similarity index 88% rename from src/main/java/com/geotwo/webserver/plugin/ServicesService.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ServicesService.java index f73620d..b73e863 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ServicesService.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ServicesService.java @@ -1,11 +1,11 @@ -package com.geotwo.webserver.plugin; +package kr.or.geoinfo.webserver.plugin; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.service.AbstractService; -import com.geotwo.webserver.core.service.Service; -import com.geotwo.webserver.core.service.ServiceMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.plugin.ows.util.XMLUtil; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.service.AbstractService; +import kr.or.geoinfo.webserver.core.service.Service; +import kr.or.geoinfo.webserver.core.service.ServiceMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.plugin.ows.util.XMLUtil; import java.io.IOException; import java.util.Iterator; import java.util.Set; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/OWSConstants.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/OWSConstants.java similarity index 98% rename from src/main/java/com/geotwo/webserver/plugin/ows/OWSConstants.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/OWSConstants.java index 95f2ba0..ead4dab 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/OWSConstants.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/OWSConstants.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.plugin.ows; +package kr.or.geoinfo.webserver.plugin.ows; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/exception/OWSServiceException.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/exception/OWSServiceException.java similarity index 95% rename from src/main/java/com/geotwo/webserver/plugin/ows/exception/OWSServiceException.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/exception/OWSServiceException.java index 295a707..220127a 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/exception/OWSServiceException.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/exception/OWSServiceException.java @@ -1,7 +1,7 @@ -package com.geotwo.webserver.plugin.ows.exception; +package kr.or.geoinfo.webserver.plugin.ows.exception; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.log.LogMngr; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/gml/O2GML.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/gml/O2GML.java similarity index 98% rename from src/main/java/com/geotwo/webserver/plugin/ows/gml/O2GML.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/gml/O2GML.java index 21ca216..e5841fd 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/gml/O2GML.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/gml/O2GML.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.plugin.ows.gml; +package kr.or.geoinfo.webserver.plugin.ows.gml; -import com.geotwo.webserver.plugin.ows.util.XMLUtil; +import kr.or.geoinfo.webserver.plugin.ows.util.XMLUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/kr/or/geoinfo/webserver/plugin/ows/service/WMSService.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/service/WMSService.java new file mode 100644 index 0000000..f10f384 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/service/WMSService.java @@ -0,0 +1,104 @@ +package kr.or.geoinfo.webserver.plugin.ows.service; + +import kr.or.geoinfo.drilling.inquiry.service.DrillingInquiryService; +import kr.or.geoinfo.utils.ApplicationContextUtils; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.service.AbstractService; +import kr.or.geoinfo.webserver.plugin.ows.exception.OWSServiceException; +import kr.or.geoinfo.webserver.plugin.ows.service.parser.WMSParser; +import kr.or.geoinfo.webserver.plugin.ows.util.XMLUtil; +import kr.or.geoinfo.webserver.plugin.ows.wms.request.Request; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.WMSGetCapabilities; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.WMSGetFeatureInfo; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.WMSGetLegendGraphic; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.WMSGetMap; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetCapabilitiesRequest; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetFeatureInfoRequest; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetLegendGraphicRequest; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetMapRequest; +import java.io.IOException; +import java.util.HashMap; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.json.simple.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.w3c.dom.Document; + +public class WMSService extends AbstractService { + private static final long serialVersionUID = 2014061021213030L; + + @Autowired + DrillingInquiryService drillingInquiryService; + + public Request parseQuery(HttpServletRequest req) throws OWSServiceException, Exception { + Request requestObj = (new WMSParser(req)).parseQuery(); + return requestObj; + } + + public String doProcess(String str) { + return null; + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + doPost(req, resp); + } + + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + Request requestObj = null; + Document doc = null; + + try { + requestObj = parseQuery(req); + } catch (OWSServiceException e) { + doc = e.getDocument(); + LogMngr.getInstance().logDebug("[SERVICE]", "WMS Request Prasing Exception : " + e.getMessage()); + } catch (Exception e) { + OWSServiceException ose = new OWSServiceException("[" + e.getClass().toString() + "] " + e.getMessage()); + doc = ose.getDocument(); + LogMngr.getInstance().logError("[SERVICE]", "WMS Request Prasing Exception : [" + e.getClass().toString() + "] " + e.getMessage()); + } + boolean isXMLWriteHere = true; + if (requestObj != null) { + if (requestObj.getVersion().equals("1.3.0")) { + if (requestObj instanceof GetCapabilitiesRequest) { + WMSGetCapabilities wmsGetCapabilities = new WMSGetCapabilities((GetCapabilitiesRequest) requestObj); + doc = wmsGetCapabilities.getCapabilities(); + } else if (requestObj instanceof GetMapRequest) { + WMSGetMap wmsGetMap = new WMSGetMap((GetMapRequest) requestObj); + doc = wmsGetMap.getMap(resp); + isXMLWriteHere = false; + } else if (requestObj instanceof GetFeatureInfoRequest) { + WMSGetFeatureInfo wmsGet = new WMSGetFeatureInfo((GetFeatureInfoRequest) requestObj); + doc = wmsGet.getFeatureInfo(resp); + isXMLWriteHere = false; + } else if (requestObj instanceof GetLegendGraphicRequest) { + WMSGetLegendGraphic wmsGetLegendGraphic = new WMSGetLegendGraphic((GetLegendGraphicRequest) requestObj); + doc = wmsGetLegendGraphic.getLegendGraphic(resp); + isXMLWriteHere = false; + } + } else { + LogMngr.getInstance().logDebug("[SERVICE]", "ver." + requestObj.getVersion() + " is not supported"); + } + } else { + LogMngr.getInstance().logDebug("[SERVICE]", "requestObj is not generated."); + } + if (doc != null) + try { + XMLUtil.writeToResponse(resp, doc); + } catch (Exception e) { + LogMngr.getInstance().logError("[SERVICE]", "Write XML Exception : " + e.getMessage()); + doc = null; + } + if (doc == null && isXMLWriteHere) { + resp.setContentType("text/xml; charset=UTF-8"); + RequestDispatcher dispatcher = req.getRequestDispatcher("/OWSServiceError.xml"); + dispatcher.forward((ServletRequest) req, (ServletResponse) resp); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/service/parser/WMSParser.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/service/parser/WMSParser.java similarity index 93% rename from src/main/java/com/geotwo/webserver/plugin/ows/service/parser/WMSParser.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/service/parser/WMSParser.java index 688b77c..f1425a0 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/service/parser/WMSParser.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/service/parser/WMSParser.java @@ -1,20 +1,23 @@ -package com.geotwo.webserver.plugin.ows.service.parser; +package kr.or.geoinfo.webserver.plugin.ows.service.parser; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.feature.QueryMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.render.StyleMngr; -import com.geotwo.webserver.core.util.ServerUtil; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.plugin.ows.OWSConstants; -import com.geotwo.webserver.plugin.ows.exception.OWSServiceException; -import com.geotwo.webserver.plugin.ows.util.PluginUtil; -import com.geotwo.webserver.plugin.ows.wms.request.Request; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetCapabilitiesRequest; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetFeatureInfoRequest; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetLegendGraphicRequest; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetMapRequest; +import kr.or.geoinfo.drilling.inquiry.service.DrillingInquiryService; +import kr.or.geoinfo.utils.ApplicationContextUtils; +import kr.or.geoinfo.utils.MyUtil; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.feature.QueryMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.render.StyleMngr; +import kr.or.geoinfo.webserver.core.util.ServerUtil; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.plugin.ows.OWSConstants; +import kr.or.geoinfo.webserver.plugin.ows.exception.OWSServiceException; +import kr.or.geoinfo.webserver.plugin.ows.util.PluginUtil; +import kr.or.geoinfo.webserver.plugin.ows.wms.request.Request; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetCapabilitiesRequest; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetFeatureInfoRequest; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetLegendGraphicRequest; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetMapRequest; import java.awt.Color; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -45,6 +48,7 @@ import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.styling.StyledLayerDescriptor; import org.geotools.xml.Configuration; import org.geotools.xml.Parser; +import org.json.simple.JSONObject; import org.opengis.filter.And; import org.opengis.filter.Filter; import org.opengis.referencing.crs.CoordinateReferenceSystem; @@ -268,6 +272,9 @@ public class WMSParser { } Filter cFilter = null; String strCql = this.reqMap.get("CQL"); + + // thkim 발주기관에서 요청한 경우, 발주기관에 소속된 시추공만 보여준다. + strCql = drillingProjectCodes(strCql); if (!ServerUtil.isNullString(strCql)) cFilter = CQL.toFilter(strCql); if (fFilter != null) { @@ -924,4 +931,52 @@ public class WMSParser { } return filter; } + + + + private String drillingProjectCodes(String strCql) throws Exception { + JSONObject result = null; + String projectCodes = null; + + String projectMasterCompanyCode = req.getParameter("projectMasterCompanyCode"); + if( projectMasterCompanyCode != null ) { + try { + // 1. ApplicationContext에서 Service Bean을 직접 가져옵니다. + DrillingInquiryService inquiryService = + (DrillingInquiryService) ApplicationContextUtils.getBean("drillingInquiryService"); + + // 2. 서비스 호출에 필요한 파라미터 준비 + HashMap serviceParams = new HashMap<>(); + // 예: req에서 파라미터를 꺼내서 serviceParams에 담기 + // serviceParams.put("constName", req.getParameter("constName")); + + // 3. 서비스 메서드 호출 + result = inquiryService.drillingInquiryProjectCodes(req, serviceParams); + + projectCodes = MyUtil.getStringFromObject( result.get("data") ); + + // 4. 결과 사용 + System.out.println("WMSService에서 조회된 코드: " + projectCodes); + + } catch (Exception e) { + // Bean을 가져오거나 서비스 호출 시 발생한 예외 처리 + LogMngr.getInstance().logError("[SERVICE]", "DrillingInquiryService 호출 오류: " + e.getMessage()); + } + + + if( projectCodes == null ) { + throw new Exception("projectCodes를 구할 수 없습니다."); + } + if( strCql == null ) { + strCql = " PROJECT_CODE IN (" + projectCodes + ") "; + } else { + strCql = " ( " + strCql + " ) AND (" + projectCodes + ") "; + } + } + + return strCql; + } + + + } diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/util/JsonUtil.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/JsonUtil.java similarity index 95% rename from src/main/java/com/geotwo/webserver/plugin/ows/util/JsonUtil.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/JsonUtil.java index a012362..547a155 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/util/JsonUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/JsonUtil.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.plugin.ows.util; +package kr.or.geoinfo.webserver.plugin.ows.util; import java.io.StringWriter; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/util/PluginUtil.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/PluginUtil.java similarity index 97% rename from src/main/java/com/geotwo/webserver/plugin/ows/util/PluginUtil.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/PluginUtil.java index 35fee76..cda27de 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/util/PluginUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/PluginUtil.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.plugin.ows.util; +package kr.or.geoinfo.webserver.plugin.ows.util; import java.io.File; import java.net.URLDecoder; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/util/XMLUtil.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/XMLUtil.java similarity index 98% rename from src/main/java/com/geotwo/webserver/plugin/ows/util/XMLUtil.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/XMLUtil.java index 03aa4b9..ea824da 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/util/XMLUtil.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/util/XMLUtil.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.plugin.ows.util; +package kr.or.geoinfo.webserver.plugin.ows.util; -import com.geotwo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.ServerContext; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/request/Request.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/request/Request.java similarity index 95% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/request/Request.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/request/Request.java index 78e65fd..81c6956 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/request/Request.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/request/Request.java @@ -1,4 +1,4 @@ -package com.geotwo.webserver.plugin.ows.wms.request; +package kr.or.geoinfo.webserver.plugin.ows.wms.request; import org.opengis.filter.Filter; public class Request { diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetCapabilities.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetCapabilities.java similarity index 97% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetCapabilities.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetCapabilities.java index 086ffd9..372fa16 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetCapabilities.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetCapabilities.java @@ -1,13 +1,13 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130; +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.feature.GeometryMngr; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.core.vector.crs.CRSMngr; -import com.geotwo.webserver.plugin.ows.OWSConstants; -import com.geotwo.webserver.plugin.ows.exception.OWSServiceException; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetCapabilitiesRequest; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.feature.GeometryMngr; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.core.vector.crs.CRSMngr; +import kr.or.geoinfo.webserver.plugin.ows.OWSConstants; +import kr.or.geoinfo.webserver.plugin.ows.exception.OWSServiceException; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetCapabilitiesRequest; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetFeatureInfo.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetFeatureInfo.java similarity index 92% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetFeatureInfo.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetFeatureInfo.java index 6dab4c6..fafba66 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetFeatureInfo.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetFeatureInfo.java @@ -1,17 +1,17 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130; +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130; -import com.geotwo.webserver.core.ServerContext; -import com.geotwo.webserver.core.feature.FeatureMngr; -import com.geotwo.webserver.core.feature.GeometryMngr; -import com.geotwo.webserver.core.feature.O2FeatureCollection; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.map.layer.FeatureLayer; -import com.geotwo.webserver.core.map.layer.Layer; -import com.geotwo.webserver.plugin.ows.exception.OWSServiceException; -import com.geotwo.webserver.plugin.ows.gml.O2GML; -import com.geotwo.webserver.plugin.ows.util.JsonUtil; -import com.geotwo.webserver.plugin.ows.util.XMLUtil; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetFeatureInfoRequest; +import kr.or.geoinfo.webserver.core.ServerContext; +import kr.or.geoinfo.webserver.core.feature.FeatureMngr; +import kr.or.geoinfo.webserver.core.feature.GeometryMngr; +import kr.or.geoinfo.webserver.core.feature.O2FeatureCollection; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.map.layer.FeatureLayer; +import kr.or.geoinfo.webserver.core.map.layer.Layer; +import kr.or.geoinfo.webserver.plugin.ows.exception.OWSServiceException; +import kr.or.geoinfo.webserver.plugin.ows.gml.O2GML; +import kr.or.geoinfo.webserver.plugin.ows.util.JsonUtil; +import kr.or.geoinfo.webserver.plugin.ows.util.XMLUtil; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetFeatureInfoRequest; import com.vividsolutions.jts.geom.Polygon; import java.io.IOException; import java.nio.charset.Charset; @@ -77,9 +77,9 @@ public class WMSGetFeatureInfo { Layer mapLayer = ServerContext.getMap().getLayer(layerName); if (mapLayer == null) throw new IllegalArgumentException("QUERY_LAYERS [" + layerName + "] is not exist."); - if (mapLayer instanceof com.geotwo.webserver.core.map.layer.LinkLayer) + if (mapLayer instanceof kr.or.geoinfo.webserver.core.map.layer.LinkLayer) throw new IllegalArgumentException("[" + layerName + "] is not support this operation."); - if (mapLayer instanceof com.geotwo.webserver.core.map.layer.GroupLayer) + if (mapLayer instanceof kr.or.geoinfo.webserver.core.map.layer.GroupLayer) throw new IllegalArgumentException("[" + layerName + "] is not support this operation."); mapLayers.add((FeatureLayer)mapLayer); } catch (Exception e) { diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetLegendGraphic.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetLegendGraphic.java similarity index 88% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetLegendGraphic.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetLegendGraphic.java index 2490bad..bcbb0ba 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/WMSGetLegendGraphic.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetLegendGraphic.java @@ -1,10 +1,10 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130; +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130; -import com.geotwo.webserver.core.log.LogMngr; -import com.geotwo.webserver.core.render.legend.LegendGraphicBuilder; -import com.geotwo.webserver.core.util.AVList; -import com.geotwo.webserver.plugin.ows.exception.OWSServiceException; -import com.geotwo.webserver.plugin.ows.wms.wms130.request.GetLegendGraphicRequest; +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.legend.LegendGraphicBuilder; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.plugin.ows.exception.OWSServiceException; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetLegendGraphicRequest; import java.awt.image.BufferedImage; import java.io.OutputStream; import javax.imageio.ImageIO; diff --git a/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetMap.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetMap.java new file mode 100644 index 0000000..b5c66f8 --- /dev/null +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/WMSGetMap.java @@ -0,0 +1,78 @@ +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130; + +import kr.or.geoinfo.webserver.core.log.LogMngr; +import kr.or.geoinfo.webserver.core.render.RenderMngr; +import kr.or.geoinfo.webserver.core.render.io.O2PngWriter; +import kr.or.geoinfo.webserver.core.util.AVList; +import kr.or.geoinfo.webserver.plugin.ows.exception.OWSServiceException; +import kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request.GetMapRequest; +import java.awt.image.BufferedImage; +import java.io.OutputStream; +import javax.imageio.ImageIO; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import org.w3c.dom.Document; + +public class WMSGetMap { + GetMapRequest requestObj = null; + + public WMSGetMap(GetMapRequest requestObj) { + this.requestObj = requestObj; + } + + public Document getMap(HttpServletResponse resp) { + AVList params = new AVList(); + params.setValue("request.wms.layers", this.requestObj.getLayers()); + params.setValue("request.wms.bbox", this.requestObj.getBbox()); + params.setValue("request.wms.width", Integer.valueOf(this.requestObj.getWidth())); + params.setValue("request.wms.height", Integer.valueOf(this.requestObj.getHeight())); + params.setValue("request.wms.format", this.requestObj.getFormat()); + params.setValue("request.wms.transparent", Boolean.valueOf(this.requestObj.isTransparent())); + params.setValue("request.wms.bgcolor", this.requestObj.getBgcolor()); + params.setValue("request.wms.styles", this.requestObj.getStyles()); + params.setValue("request.wms.filter", this.requestObj.getFilter()); + if (this.requestObj.getSld() != null) + params.setValue("request.wms.sld", this.requestObj.getSld()); + BufferedImage image = null; + Document doc = null; + try { + image = RenderMngr.productMap(params); + } catch (Exception e) { + OWSServiceException ose = new OWSServiceException("WMS GetMap Exception : Image process fails : " + e.getMessage()); + doc = ose.getDocument(); + LogMngr.getInstance().logError("[SERVICE]", "WMS GetMap Exception : Image process fails : " + e.getMessage()); + } + if (image != null) + try { + writeImage(image, resp); + } catch (Exception e) { + OWSServiceException ose = new OWSServiceException("WMS GetMap Exception : Write IMAGE fails : " + e.getMessage()); + doc = ose.getDocument(); + LogMngr.getInstance().logError("[SERVICE]", "WMS GetMap Exception : Write IMAGE fails : " + e.getMessage()); + } + return doc; + } + + private void writeImage(BufferedImage image, HttpServletResponse resp) throws Exception { + ServletOutputStream servletOutputStream = null; + OutputStream out = null; + try { + String format = this.requestObj.getFormat(); + String[] formatElement = format.split("/"); + resp.setContentType(format); + servletOutputStream = resp.getOutputStream(); + if (format.toUpperCase().contains("PNG")) { + O2PngWriter.writePNG(image, (OutputStream) servletOutputStream); + } else { + ImageIO.write(image, formatElement[1], (OutputStream) servletOutputStream); + } + } catch (Exception e) { + throw e; + } finally { + if (servletOutputStream != null) { + servletOutputStream.flush(); + servletOutputStream.close(); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetCapabilitiesRequest.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetCapabilitiesRequest.java new file mode 100644 index 0000000..452a05f --- /dev/null +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetCapabilitiesRequest.java @@ -0,0 +1,5 @@ +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request; + +import kr.or.geoinfo.webserver.plugin.ows.wms.request.Request; + +public class GetCapabilitiesRequest extends Request {} diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetFeatureInfoRequest.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetFeatureInfoRequest.java similarity index 94% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetFeatureInfoRequest.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetFeatureInfoRequest.java index e3b92cf..c06c789 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetFeatureInfoRequest.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetFeatureInfoRequest.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130.request; +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request; -import com.geotwo.webserver.plugin.ows.wms.request.Request; +import kr.or.geoinfo.webserver.plugin.ows.wms.request.Request; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.styling.StyledLayerDescriptor; import org.opengis.referencing.crs.CoordinateReferenceSystem; diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetLegendGraphicRequest.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetLegendGraphicRequest.java similarity index 91% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetLegendGraphicRequest.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetLegendGraphicRequest.java index 925b0c1..8a32f1b 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetLegendGraphicRequest.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetLegendGraphicRequest.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130.request; +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request; -import com.geotwo.webserver.plugin.ows.wms.request.Request; +import kr.or.geoinfo.webserver.plugin.ows.wms.request.Request; import org.geotools.styling.StyledLayerDescriptor; public class GetLegendGraphicRequest extends Request { diff --git a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetMapRequest.java b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetMapRequest.java similarity index 95% rename from src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetMapRequest.java rename to src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetMapRequest.java index 34fe6d9..5f44dbd 100644 --- a/src/main/java/com/geotwo/webserver/plugin/ows/wms/wms130/request/GetMapRequest.java +++ b/src/main/java/kr/or/geoinfo/webserver/plugin/ows/wms/wms130/request/GetMapRequest.java @@ -1,6 +1,6 @@ -package com.geotwo.webserver.plugin.ows.wms.wms130.request; +package kr.or.geoinfo.webserver.plugin.ows.wms.wms130.request; -import com.geotwo.webserver.plugin.ows.wms.request.Request; +import kr.or.geoinfo.webserver.plugin.ows.wms.request.Request; import java.awt.Color; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.styling.StyledLayerDescriptor; diff --git a/src/main/resources/egovframework/spring/context-common.xml b/src/main/resources/egovframework/spring/context-common.xml index b96145f..58079a3 100644 --- a/src/main/resources/egovframework/spring/context-common.xml +++ b/src/main/resources/egovframework/spring/context-common.xml @@ -4,7 +4,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - + diff --git a/src/main/resources/egovframework/spring/context-mybatis.xml b/src/main/resources/egovframework/spring/context-mybatis.xml new file mode 100644 index 0000000..a76fb6a --- /dev/null +++ b/src/main/resources/egovframework/spring/context-mybatis.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml deleted file mode 100644 index 127c108..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/home/DrillingHomeMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/home/DrillingHomeMapper.xml deleted file mode 100644 index 0e50303..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/home/DrillingHomeMapper.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml deleted file mode 100644 index 2dc5735..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml index 16f0071..e035958 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/drilling/inquiry/DrillingInquiryMapper.xml @@ -1,11 +1,21 @@ - - - - + SELECT + LISTAGG(COM_CODE, ',') WITHIN GROUP ( + ORDER BY COM_CODE) AS COM_CODES + FROM + TBL_CONST_COMPANY + WHERE + REPLACE(COM_NAME, ' ', '') LIKE '%' || #{constCompanyName} || '%' + + + + + - - - - - - + { CALL SP_GET_MASTER_COMPANY_DISTRICT( + #{projectMasterCompanyName}, + #{v_gl, mode=OUT, jdbcType=VARCHAR}, + #{v_gm, mode=OUT, jdbcType=VARCHAR}, + #{v_gs, mode=OUT, jdbcType=VARCHAR}, + #{v_gf, mode=OUT, jdbcType=VARCHAR} ) } - - - - - - - - - - - + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/jibanModel/jibanModel_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/jibanModel/jibanModel_SQL.xml deleted file mode 100644 index 914a6de..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/jibanModel/jibanModel_SQL.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/jihaanjeonMoel/jihaanjeonModel_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/jihaanjeonMoel/jihaanjeonModel_SQL.xml deleted file mode 100644 index a7d84cb..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/jihaanjeonMoel/jihaanjeonModel_SQL.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Community_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Community_SQL.xml deleted file mode 100644 index 35a4fd1..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Community_SQL.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Data_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Data_SQL.xml deleted file mode 100644 index 0d72a26..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Data_SQL.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Faq_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Faq_SQL.xml deleted file mode 100644 index d94b83a..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Faq_SQL.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/File2019_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/File2019_SQL.xml deleted file mode 100644 index 267f813..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/File2019_SQL.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - SELECT MAX(FILE_NO)+1 FROM WEB_COMM_FILE - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/File_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/File_SQL.xml deleted file mode 100644 index e9c10f4..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/File_SQL.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/GroundReport_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/GroundReport_SQL.xml deleted file mode 100644 index 35600f3..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/GroundReport_SQL.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml deleted file mode 100644 index e39df5e..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml +++ /dev/null @@ -1,324 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO WEB_MEMBER_EXIT - (USERID, USERNAME, UPJONG_CODE, EXIT_CAUSE) - VALUES (#{userId}, #{userName}, #{upjong_code}, #{exit_cause}) - - - DELETE WEB_MEMBER_IN - WHERE TRIM(USERID) = #{userId} - AND TRIM(PASSWD) = #{pass} - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Join_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Join_SQL.xml deleted file mode 100644 index 5e33b93..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Join_SQL.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - INSERT INTO WEB_MEMBER_IN (USERID,PASSWD,USER_NAME,PHONE,EMAIL,COMPANY_NAME,PART_NAME,ZIP_CODE,ADDRESS,COMPANY_REGIST_NO,UPJONG_CODE,CLS, DUPINFO, VIRTUALNO, LAST_LOGIN_DATE, AGREEYN, LOGIN_COUNT, ENCRYPT_CHANGE, SEQ, LIQ_YN, FILENAME, SAVENAME, GOVEMENT_CODE, CERTIFICATION_YN, COMPANY_CEO, COMPANY_OPENING_DATE) - VALUES(#{userId, jdbcType=VARCHAR},#{password, jdbcType=VARCHAR},#{userName, jdbcType=VARCHAR},#{phone, jdbcType=VARCHAR},#{email, jdbcType=VARCHAR},#{companyName3, jdbcType=VARCHAR},#{part, jdbcType=VARCHAR}, - - - - - - - #{address, jdbcType=VARCHAR},#{companyNo, jdbcType=VARCHAR},#{upjong, jdbcType=VARCHAR},#{cls},#{DUPINFO},#{VIRTUALNO},SYSDATE-1, - #{agreeyn},0,'Y', (select max(seq)+1 from web_member_in), #{liqYn}, #{fileName}, #{saveName}, #{companyName2}, 1, #{companyCeo}, #{companyOpeningDate}) - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml deleted file mode 100644 index 173bad6..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml +++ /dev/null @@ -1,590 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE ${table} SET ${values} WHERE ${where} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE WEB_DOWNLOAD_LOG - SET DOWNYN = 'R' - - , USE_CONTENTS = #{content} - - - , FILENAME = #{filename} - , SAVENAME = #{savename} - - - , FILENAME2 = #{filename2} - , SAVENAME2 = #{savename2} - - , PHONE = #{phone} - WHERE APPROVE = 'Y' - AND USERID = #{userId} - - AND DOWNYN = 'W' - - - AND IDX = #{idx} - - - AND DOWNYN = 'R' - - - - - - - - - - - - - - - - - - - - - - - '5' - ]]> - - - - - - INSERT INTO WEB_MEMBER_IN (USERID,PASSWD,USER_NAME,PHONE,EMAIL,COMPANY_NAME,PART_NAME,COMPANY_REGIST_NO,UPJONG_CODE,CLS,LAST_LOGIN_DATE,AGREEYN, LOGIN_COUNT, SEQ, LIQ_YN,GOVEMENT_CODE) - VALUES(#{userId},'528fe0ece2ee8afa2b26',#{userName},#{phone},#{email},#{companyName},#{part},#{companyNo},#{upjong},#{cls},SYSDATE,'Y','0',(select max(seq)+1 from web_member_in), 'N', '00') - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Notice_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Notice_SQL.xml deleted file mode 100644 index 516250c..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Notice_SQL.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/QnA_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/QnA_SQL.xml deleted file mode 100644 index 5ce0d32..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/QnA_SQL.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Vote_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Vote_SQL.xml deleted file mode 100644 index 2c95fca..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Vote_SQL.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapCom_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapCom_SQL.xml deleted file mode 100644 index 7b63b55..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapCom_SQL.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml deleted file mode 100644 index 4f81a62..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml +++ /dev/null @@ -1,787 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE WEB_CART SET DATETIME = SYSDATE, SELECT_CODE = #{selectCode} WHERE TRIM(USERID) = #{userId} - - - - INSERT INTO WEB_CART - ( - SELECT - NVL(MAX(IDX),0) + 1, #{userId}, #{mId}, SYSDATE, #{hcode}, #{cartType}, #{selectCode} - FROM WEB_CART - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml deleted file mode 100644 index 2f438dd..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapInformation_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapInformation_SQL.xml deleted file mode 100644 index 17f447c..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapInformation_SQL.xml +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml deleted file mode 100644 index a62fde2..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml +++ /dev/null @@ -1,1436 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT NVL(MAX(IDX),0) + 1 FROM WEB_DOWNLOAD_LOG - - - - - - - SELECT 1 FROM DUAL - - - INSERT INTO WEB_DIST_SURVEY - ( - SELECT - - - FROM WEB_DIST_SURVEY - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml deleted file mode 100644 index 4adb37d..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml deleted file mode 100644 index 2394a96..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml +++ /dev/null @@ -1,838 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/basic_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/basic_SQL.xml deleted file mode 100644 index 981b91c..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/basic_SQL.xml +++ /dev/null @@ -1,772 +0,0 @@ - - - - - - - - - - - DELETE FROM TEMP_SPT WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - DELETE FROM TEMP_SPT WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} AND (SEQ > #{seq}) - - - - INSERT INTO TEMP_SPT ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DEPTH_SPT - , SPT_N - , SPT_DEPTH - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_SPT WHERE PROJECT_CODE=#{projectCode} AND HOLE_CODE=#{holeCode}) - , #{depthSpt} - , #{sptN} - , #{sptDepth} - , #{userId} - , SYSDATE - ) - - - - INSERT - INTO TEMP_SPT ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DEPTH_SPT - , SPT_N - , SPT_DEPTH - , USERID - , DATETIME - ) - ${insertSet} - - - - - - - - - - - - DELETE FROM TEMP_SLICKENSIDE_INFO WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_SLICKENSIDE_INFO ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , SLICKENSIDE_DEPTH_FROM - , SLICKENSIDE_DEPTH_TO - , SLICKENSIDE_DIRECTION - , SLICKENSIDE_ANGLE - , SLICKENSIDE_MAX - , SLICKENSIDE_MIN - , SLICKENSIDE_AVG - , SLICKENSIDE_ROUGH - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_SLICKENSIDE_INFO WHERE - PROJECT_CODE=#{projectCode} AND HOLE_CODE=#{holeCode}) - , #{slickensideDepthFrom} - , #{slickensideDepthTo} - , #{slickensideDirection} - , #{slickensideAngle} - , #{slickensideMax} - , #{slickensideMin} - , #{slickensideAvg} - , #{slickensideRough} - , #{userId} - , SYSDATE - ) - - - - - - DELETE FROM TEMP_RQD WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_RQD ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , RT_DEPTH_FROM - , RT_DEPTH_TO - , RT_TCR - , RT_RQD - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_RQD WHERE PROJECT_CODE=#{projectCode} AND HOLE_CODE=#{holeCode}) - , #{rtDepthFrom} - , #{rtDepthTo} - , #{rtTcr} - , #{rtRqd} - , #{userId} - , SYSDATE - ) - - - - - - DELETE FROM TEMP_DSF WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_DSF ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DSF_DEPTH_FROM - , DSF_DEPTH_TO - , DSF_DECOMPOSITION - , DSF_STRENGTH - , DSF_FRACTURING - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_DSF WHERE PROJECT_CODE=#{projectCode} AND HOLE_CODE=#{holeCode}) - , #{dsfDepthFrom} - , #{dsfDepthTo} - , #{dsfDecomposition} - , #{dsfStrength} - , #{dsfFracturing} - , #{userId} - , SYSDATE - ) - - - - - - - - DELETE FROM TEMP_Q WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_Q ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DEPTH_FROM - , DEPTH_TO - , ROCK_TYPE - , RQD - , RQD_DESC - , JN - , JN_DESC - , JR - , JR_DESC - , JA - , JA_DESC - , JW - , JW_DESC - , SRF - , SRF_DESC - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_Q WHERE PROJECT_CODE=#{projectCode} AND HOLE_CODE=#{holeCode}) - , #{depthFrom} - , #{depthTo} - , #{rockType} - , #{rqd} - , #{rqdDesc} - , #{jn} - , #{jnDesc} - , #{jr} - , #{jrDesc} - , #{ja} - , #{jaDesc} - , #{jw} - , #{jwDesc} - , #{srf} - , #{srfDesc} - , #{userId} - , SYSDATE - ) - - - - - - DELETE FROM TEMP_RMR WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_RMR ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DEPTH_FROM - , DEPTH_TO - , ROCK_TYPE - , ROCK_STRENGTH - , ROCK_STRENGTH_POINT - , ROCK_STRENGTH_DESC - , RQD - , RQD_POINT - , RQD_DESC - , JOINTS_SPACING - , JOINTS_SPACING_POINT - , JOINTS_SPACING_DESC - , JOINT_CONDITION - , JOINT_CONDITION_POINT - , GROUNDWATER_CONDITION - , GROUNDWATER_CONDITION_POINT - , JOINT_ORIENTATION - , JOINT_ORIENTATION_POINT - , JOINT_ORIENTATION_DESC - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_RMR WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode}) - , #{depthFrom} - , #{depthTo} - , #{rockType} - , #{rockStrength} - , #{rockStrengthPoint} - , #{rockStrengthDesc} - , #{rqd} - , #{rqdPoint} - , #{rqdDesc} - , #{jointsSpacing} - , #{jointsSpacingPoint} - , #{jointsSpacingDesc} - , #{jointCondition} - , #{jointConditionPoint} - , #{groundwaterCondition} - , #{groundwaterConditionPoint} - , #{jointOrientation} - , #{jointOrientationPoint} - , #{jointOrientationDesc} - , #{userId} - , SYSDATE - ) - - - - - - DELETE FROM TEMP_FIELD_PRESSUREMETER WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_FIELD_PRESSUREMETER ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , FIELDPRES_CODE - , FIELDPRES_TUBE_TYPE - , FIELDPRES_INSPECTED_BY - , FIELDPRES_CHECKED_BY - , FIELDPRES_DEPTH - , FIELDPRES_KP - , FIELDPRES_EP - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_FIELD_PRESSUREMETER WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode}) - , #{fieldpresCode} - , #{fieldpresTubeType} - , #{fieldpresInspectedBy} - , #{fieldpresCheckedBy} - , #{fieldpresDepth} - , #{fieldpresKp} - , #{fieldpresEp} - , #{userId} - , SYSDATE - ) - - - - INSERT INTO TEMP_FIELD_PRESSUREMETER ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , FIELDPRES_CODE - , FIELDPRES_TUBE_TYPE - , FIELDPRES_INSPECTED_BY - , FIELDPRES_CHECKED_BY - , FIELDPRES_DEPTH - , FIELDPRES_KP - , FIELDPRES_EP - , USERID - , DATETIME - , GRAPH_IMAGE - , GRAPH_LOCAL - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_FIELD_PRESSUREMETER WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode}) - , #{fieldpresCode} - , #{fieldpresTubeType} - , #{fieldpresInspectedBy} - , #{fieldpresCheckedBy} - , #{fieldpresDepth} - , #{fieldpresKp} - , #{fieldpresEp} - , #{userId} - , SYSDATE - , #{graphImage} - , #{graphLocal} - ) - - - - - - - - - - - - - - - - - - - - - DELETE FROM TEMP_FIELD_CONE_PENETRATION WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_FIELD_CONE_PENETRATION ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , CP_CODE - , CP_DEPTH_FROM - , CP_DEPTH_TO - , CP_EDGE_RESISTENCE - , CP_CORRECTED_EDGE_RESISTENCE - , CP_SLEEVE_FRICTIONAL_FORCE - , CP_NEUTRALSTRESS - , CP_FRICTIONAL_RATIO - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , (SELECT NVL(MAX(SEQ),0)+1 FROM TEMP_FIELD_CONE_PENETRATION WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode}) - , #{cpCode} - , #{cpDepthFrom} - , #{cpDepthTo} - , #{cpEdgeResistence} - , #{cpCorrectedEdgeResistence} - , #{cpSleeveFrictionalForce} - , #{cpNeutralstress} - , #{cpFrictionalRatio} - , #{userId} - , SYSDATE - ) - - - - MERGE INTO TEMP_CONE_PENETRATION_IMAGES - USING DUAL - ON ( PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - ) - WHEN MATCHED THEN - UPDATE SET - GRAPH_IMAGE = #{graphImage} - , GRAPH_LOCAL = #{graphLocal} - , USERID = #{userId} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , HOLE_CODE - , GRAPH_IMAGE - , GRAPH_LOCAL - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{graphImage} - , #{graphLocal} - , #{userId} - , SYSDATE - ) - - - - DELETE FROM TEMP_CONE_PENETRATION_IMAGES WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - - - - - UPDATE TEMP_WP_TEST - SET WP_CODE = #{wpCode} - , USERID = #{userId} - , DATETIME = SYSDATE - WHERE PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - AND WP_CODE = #{oldWpCode} - - - - DELETE FROM TEMP_FIELD_WATERPRESSURE WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - DELETE FROM TEMP_WP_TEST WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} AND SEQ = #{seq} - - - - INSERT INTO TEMP_WP_TEST ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , WP_CODE - , WPTEST_ORDER - , WPTEST_WATER_PRESSURE - , WPTEST_TOTAL_HEAD - , WPTEST_QUANTITY - , WPTEST_PERMEABILITY - , WPLUGEON_ORDER - , WPLUGEON_PRESSURE - , WPLUGEON_INJECT_WATER - , WPLUGEON_LU - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{seq} - , #{newWpCode} - , #{wptestOrder} - , #{wptestWaterPressure} - , #{wptestTotalHead} - , #{wptestQuantity} - , #{wptestPermeability} - , #{wplugeonOrder} - , #{wplugeonPressure} - , #{wplugeonInjectWater} - , #{wplugeonLu} - , #{userId} - , SYSDATE - ) - - - - INSERT INTO TEMP_FIELD_WATERPRESSURE ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , WP_CODE - , FIELDWP_DEPTH_FROM - , FIELDWP_DEPTH_TO - , FIELDWP_PACKER_TYPE - , FIELDWP_TEST_SPACING - , FIELDWB_WATER_PRESSURE - , FIELDWP_AVG_PERMEABILITY - , FIELDWP_LU - , FIELDWP_INSPECTED_BY - , FIELDWP_CHECKED_BY - , FIELDWP_REMARK - , GRAPH_IMAGE - , GRAPH_LOCAL - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{seq} - , #{wpCode} - , #{fieldwpDepthFrom} - , #{fieldwpDepthTo} - , #{fieldwpPackerType} - , #{fieldwpTestSpacing} - , #{fieldwbWaterPressure} - , #{fieldwpAvgPermeability} - , #{fieldwpLu} - , #{fieldwpInspectedBy} - , #{fieldwpCheckedBy} - , #{fieldwpRemark} - , #{graphImage} - , #{graphLocal} - , #{userId} - , SYSDATE - ) - - - - - - - - UPDATE TEMP_FIELDPER_SUB - SET FIELDPER_CODE = #{fieldperCode} - , USERID = #{userId} - , DATETIME = SYSDATE - WHERE PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - AND FIELDPER_CODE = #{oldFieldperCode} - - - - DELETE FROM TEMP_FIELD_PERMEABILITY WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_FIELD_PERMEABILITY ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , FIELDPER_CODE - , FIELDPER_DEPTH_FROM - , FIELDPER_DEPTH_TO - , FIELDPER_CASING_DIA - , FIELDPER_CASING_HEIGHT - , FIELDPER_AVG_PERMEABILITY - , FIELDPER_INSPECTED_BY - , FIELDPER_CHECKED_BY - , FIELDPER_REMARK - , GRAPH_IMAGE - , GRAPH_LOCAL - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{seq} - , #{fieldperCode} - , #{fieldperDepthFrom} - , #{fieldperDepthTo} - , #{fieldperCasingDia} - , #{fieldperCasingHeight} - , #{fieldperAvgPermeability} - , #{fieldperInspectedBy} - , #{fieldperCheckedBy} - , #{fieldperRemark} - , #{graphImage} - , #{graphLocal} - , #{userId} - , SYSDATE - ) - - - - DELETE FROM TEMP_FIELDPER_SUB WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} AND SEQ = #{seq} - - - - INSERT INTO TEMP_FIELDPER_SUB ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , FIELDPER_CODE - , FIELDPER_ORDER - , FIELDPER_SUB_TIME - , FIELDPER_SUB_TOTAL_HEAD - , FIELDPER_SUB_FALLING_HEAD - , FIELDPER_SUB_WATER_LOOSE - , FIELDPER_SUB_QUANTITY - , FIELDPER_SUB_PERMEABILITY - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{seq} - , #{fieldperCode} - , #{fieldperOrder} - , #{fieldperSubTime} - , #{fieldperSubTotalHead} - , #{fieldperSubFallingHead} - , #{fieldperSubWaterLoose} - , #{fieldperSubQuantity} - , #{fieldperSubPermeability} - , #{userId} - , SYSDATE - ) - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml deleted file mode 100644 index dcd3bae..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml +++ /dev/null @@ -1,631 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml deleted file mode 100644 index 7ab02cd..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/complete.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml deleted file mode 100644 index 5df3b61..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/geoLogging_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/geoLogging_SQL.xml deleted file mode 100644 index 70b4b17..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/geoLogging_SQL.xml +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - DELETE FROM TEMP_BOREHOLE_WAVE_PS WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_BOREHOLE_WAVE_PS ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , BH_DEPTH_FROM - , BH_DEPTH_TO - , BH_VP_VELOCITY - , BH_VS_VELOCITY - , BH_POISSONS_RATIO - , BH_SHEAR_MODULUS - , BH_YOUNGS_MODULUS - , BH_DENSITY - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{seq} - , #{bhDepthFrom} - , #{bhDepthTo} - , #{bhVpVelocity} - , #{bhVsVelocity} - , #{bhPoissonsRatio} - , #{bhShearModulus} - , #{bhYoungsModulus} - , #{bhDensity} - , #{userId} - , SYSDATE - ) - - - - MERGE INTO TEMP_BOREHOLE_WAVE - USING DUAL - ON ( PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - ) - WHEN MATCHED THEN - UPDATE SET BH_CHECKED_BY = #{bhCheckedBy} - , GRAPH_IMAGE = #{graphImage} - , GRAPH_LOCAL = #{graphLocal} - , USERID = #{userId} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , HOLE_CODE - , BH_CHECKED_BY - , GRAPH_IMAGE - , GRAPH_LOCAL - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{bhCheckedBy} - , #{graphImage} - , #{graphLocal} - , #{userId} - , SYSDATE - ) - - - - - - - - DELETE FROM TEMP_DOWNHOLE_PS WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_DOWNHOLE_PS ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DH_DEPTH_FROM - , DH_DEPTH_TO - , DH_VP_VELOCITY - , DH_VS_VELOCITY - , DH_POISSONS_RATIO - , DH_SHEAR_MODULUS - , DH_YOUNGS_MODULUS - , DH_DENSITY - , USERID - , DATETIME - ) VALUES ( - #{PROJECT_CODE} - , #{HOLE_CODE} - , #{SEQ} - , #{DH_DEPTH_FROM} - , #{DH_DEPTH_TO} - , #{DH_VP_VELOCITY} - , #{DH_VS_VELOCITY} - , #{DH_POISSONS_RATIO} - , #{DH_SHEAR_MODULUS} - , #{DH_YOUNGS_MODULUS} - , #{DH_DENSITY} - , #{userId} - , SYSDATE - ) - - - - MERGE INTO TEMP_DOWNHOLE - USING DUAL - ON ( PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - ) - WHEN MATCHED THEN - UPDATE SET DH_CHECKED_BY = #{DH_CHECKED_BY} - , GRAPH_IMAGE = #{GRAPH_IMAGE} - , GRAPH_LOCAL = #{GRAPH_LOCAL} - , USERID = #{userId} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , HOLE_CODE - , DH_CHECKED_BY - , GRAPH_IMAGE - , GRAPH_LOCAL - , USERID - , DATETIME - ) VALUES ( - #{PROJECT_CODE} - , #{HOLE_CODE} - , #{DH_CHECKED_BY} - , #{GRAPH_IMAGE} - , #{GRAPH_LOCAL} - , #{USERID} - , SYSDATE - ) - - - - - - - - DELETE FROM TEMP_DENSITY_SUB WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_DENSITY_SUB ( - PROJECT_CODE - , HOLE_CODE - , SEQ - , DEPTH_FROM - , DEPTH_TO - , LAYER - , DENSITY - , USERID - , DATETIME - ) VALUES ( - #{PROJECT_CODE} - , #{HOLE_CODE} - , #{SEQ} - , #{DEPTH_FROM} - , #{DEPTH_TO} - , #{LAYER} - , #{DENSITY} - , #{userId} - , SYSDATE - ) - - - - MERGE INTO TEMP_DENSITY - USING DUAL - ON ( PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - ) - WHEN MATCHED THEN - UPDATE SET RS_CHECKED_BY = #{RS_CHECKED_BY} - , RS_WATER_LEVEL= #{RS_WATER_LEVEL} - , GRAPH_IMAGE = #{GRAPH_IMAGE} - , GRAPH_LOCAL = #{GRAPH_LOCAL} - , USERID = #{USERID} - , DATETIME = SYSDATE - , JOSAID = #{JOSAID} - , JOSA_START_TIME = #{JOSA_START_TIME} - , JOSA_END_TIME = #{JOSA_END_TIME} - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , HOLE_CODE - , RS_CHECKED_BY - , RS_WATER_LEVEL - , GRAPH_IMAGE - , GRAPH_LOCAL - , USERID - , DATETIME - , JOSAID - , JOSA_START_TIME - , JOSA_END_TIME - ) VALUES ( - #{PROJECT_CODE} - , #{HOLE_CODE} - , #{RS_CHECKED_BY} - , #{RS_WATER_LEVEL} - , #{GRAPH_IMAGE} - , #{GRAPH_LOCAL} - , #{userId} - , SYSDATE - , #{JOSAID} - , #{JOSA_START_TIME} - , #{JOSA_END_TIME} - ) - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml deleted file mode 100644 index f0ea332..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 'N' AND PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE} -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml deleted file mode 100644 index ff1bfce..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml deleted file mode 100644 index 5ebb10f..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - UPDATE TEMP_PROJECT_INFO SET - CLASS_CODE= #{CLASS_CODE} - ,CLASS_DETAIL_CODE= #{CLASS_DETAIL_CODE} - ,PROJECT_NAME= #{PROJECT_NAME} - ,PROJECT_CONSTRUCTION_CODE= #{PROJECT_CONSTRUCTION_CODE} - ,PROJECT_INSTRUCTION_CODE= #{PROJECT_INSTRUCTION_CODE} - ,PROJECT_INSTRUCTION_DESC= #{PROJECT_INSTRUCTION_DESC} - ,PROJECT_MASTER_COMPANY_O_CODE= #{PROJECT_MASTER_COMPANY_O_CODE} - ,PROJECT_MASTER_COMPANY_TW_CODE= #{PROJECT_MASTER_COMPANY_TW_CODE} - ,PROJECT_MASTER_COMPANY_TH_CODE= #{PROJECT_MASTER_COMPANY_TH_CODE} - ,PROJECT_MASTER_COMPANY_F_CODE= #{PROJECT_MASTER_COMPANY_F_CODE} - ,PROJECT_MASTER_COMPANY_NAME= #{PROJECT_MASTER_COMPANY_NAME} - ,PROJECT_CONST_COMPANY= #{PROJECT_CONST_COMPANY} - ,PROJECT_DESIGN_COMPANY= #{PROJECT_DESIGN_COMPANY} - ,PROJECT_ADMIN_COMPANY= #{PROJECT_ADMIN_COMPANY} - ,PROJECT_WORK_COMPANY= #{PROJECT_WORK_COMPANY} - ,PROJECT_START_DATE= #{PROJECT_START_DATE} - ,PROJECT_END_DATE= #{PROJECT_END_DATE} - ,PROJECT_START_SPOT_SD= #{PROJECT_START_SPOT_SD} - ,PROJECT_START_SPOT_SGG= #{PROJECT_START_SPOT_SGG} - ,PROJECT_START_SPOT_EMD= #{PROJECT_START_SPOT_EMD} - ,PROJECT_START_SPOT= #{PROJECT_START_SPOT} - ,PROJECT_END_SPOT_SD= #{PROJECT_END_SPOT_SD} - ,PROJECT_END_SPOT_SGG= #{PROJECT_END_SPOT_SGG} - ,PROJECT_END_SPOT_EMD= #{PROJECT_END_SPOT_EMD} - ,PROJECT_END_SPOT= #{PROJECT_END_SPOT} - ,PROJECT_LANGE= #{PROJECT_LANGE} - ,PROJECT_LANGE_UNIT= #{PROJECT_LANGE_UNIT} - ,HOLE_CB_NUMBER= #{HOLE_CB_NUMBER} - ,HOLE_SB_NUMBER= #{HOLE_SB_NUMBER} - ,HOLE_BB_NUMBER= #{HOLE_BB_NUMBER} - ,HOLE_TB_NUMBER= #{HOLE_TB_NUMBER} - ,HOLE_BH_NUMBER= #{HOLE_BH_NUMBER} - ,PROJECT_TESTPITT_NUMBER= #{PROJECT_TESTPITT_NUMBER} - ,PROJECT_ORGERBORING_NUMBER= #{PROJECT_ORGERBORING_NUMBER} - ,PROJECT_HOLE_NUMBER= #{PROJECT_HOLE_NUMBER} - ,PROJECT_DOCUMENT= #{PROJECT_DOCUMENT} - ,PROJECT_DESC= #{PROJECT_DESC} - ,PROJECT_GOAL= #{PROJECT_GOAL} - ,RESISTIVITY_LINES= #{RESISTIVITY_LINES} - ,REFRACTION_LINES= #{REFRACTION_LINES} - ,MODUSERID= #{MODUSERID} - ,REPORT_TYPE= #{REPORT_TYPE} - ,MODDATETIME= SYSDATE - WHERE PROJECT_CODE = #{PROJECT_CODE} - - - - DELETE FROM ${tableName} WHERE 1=1 - - AND PROJECT_CODE = #{projectCode} - - - AND HOLE_CODE = #{holeCode} - - - - - DELETE FROM ${tableName} WHERE 1=1 - - AND PROJECT_CODE = #{projectCode} - - - AND LINE_NUMBER = #{lineNumber} - - - - - - - - - DELETE FROM TEMP_TOPO_GEOLOGY WHERE PROJECT_CODE = #{projectCode} - - - - INSERT INTO TEMP_TOPO_GEOLOGY (PROJECT_CODE, TGEO_TOPOGRAPHY, TGEO_GEOLOGY, TGEO_REMARK, USERID, DATETIME) VALUES - (#{projectCode},#{tgeoTopography},#{tgeoGeology},#{tgeoRemark},#{userId},SYSDATE) - - - - - - MERGE INTO TEMP_EXPERT_OPINION - USING DUAL - ON ( PROJECT_CODE = #{projectCode}) - WHEN MATCHED THEN - UPDATE SET EO_OPINOIN = #{eoOpinoin} - , EO_REMARK = #{eoRemark} - , REPORT_FILE = #{reportFile} - , REPORT_LOCAL = #{reportLocal} - , USERID = #{userId} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , EO_OPINOIN - , EO_REMARK - , REPORT_FILE - , REPORT_LOCAL - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{eoOpinoin} - , #{eoRemark} - , #{reportFile} - , #{reportLocal} - , #{userId} - , SYSDATE - ) - - - - - - UPDATE - TEMP_META_INFO - SET - HOLE_NUMBER = #{HOLE_NUMBER} - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/layerInfo2019_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/layerInfo2019_SQL.xml deleted file mode 100644 index 0e1e2d1..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/layerInfo2019_SQL.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - INSERT INTO TEMP_LAYER_INFO ( - PROJECT_CODE , - HOLE_CODE , - LAYER_CODE , - LAYER_DEPTH_FROM , - LAYER_DEPTH_TO , - LAYER_SOIL_COLOR , - LAYER_DESC , - LAYER_THICKNESS , - LAYER_ENG_NAME , - LAYER_SCIENCE_NAME , - USERID , - DATETIME - )VALUES( - #{projectCode}, - #{holeCode}, - #{layerCode}, - #{layerDepthFrom}, - #{layerDepthTo}, - #{layerSoilColor}, - #{layerDesc}, - #{layerThickness}, - #{layerEngName}, - #{layerScienceName}, - #{userId}, - SYSDATE - ) - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/layerInfo_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/layerInfo_SQL.xml deleted file mode 100644 index 7da41ea..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/layerInfo_SQL.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - DELETE FROM TEMP_LAYER_INFO WHERE PROJECT_CODE=#{projectCode} AND HOLE_CODE=#{holeCode} AND LAYER_CODE=#{layerCode} - - - - INSERT INTO TEMP_LAYER_INFO ( - PROJECT_CODE , - HOLE_CODE , - LAYER_CODE , - LAYER_DEPTH_FROM , - LAYER_DEPTH_TO , - LAYER_SOIL_COLOR , - LAYER_DESC , - LAYER_THICKNESS , - LAYER_ENG_NAME , - LAYER_SCIENCE_NAME , - USERID , - DATETIME - )VALUES( - #{projectCode}, - #{holeCode}, - #{layerCode}, - #{layerDepthFrom}, - #{layerDepthTo}, - #{layerSoilColor}, - #{layerDesc}, - #{layerThickness}, - #{layerEngName}, - #{layerScienceName}, - #{userId}, - SYSDATE - ) - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml deleted file mode 100644 index 66d788e..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/listReg.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/manageAdd.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/manageAdd.xml deleted file mode 100644 index f7defbb..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/manageAdd.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - PASSWD = #{passwd}, - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml deleted file mode 100644 index 799f760..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml deleted file mode 100644 index 2e19d89..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml deleted file mode 100644 index f3c70af..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml deleted file mode 100644 index 9a130d7..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml +++ /dev/null @@ -1,1364 +0,0 @@ - - - - - - - - - - - - - - - - - UPDATE TEMP_META_INFO SET - INPUT_COMPANY = #{INPUT_COMPANY} , - DEPT = #{DEPT} , - ADMIN_NAME = #{ADMIN_NAME} , - EMAIL = #{EMAIL} , - TEL = #{TEL} , - PHONE = #{PHONE} , - SEARCHDATE = #{SEARCHDATE} , - INPUTDATE = #{INPUTDATE} , - PROJECT_NAME = #{PROJECT_NAME} , - HOLE_NUMBER = #{HOLE_NUMBER} , - HOLE_ADMIN_NAME = #{HOLE_ADMIN_NAME}, - HOLE_COMPANY = #{HOLE_COMPANY} , - HOLE_TYPE = #{HOLE_TYPE} , - HOLE_SPOT_SD = #{HOLE_SPOT_SD} , - HOLE_SPOT_SGG = #{HOLE_SPOT_SGG} , - HOLE_SPOT = #{HOLE_SPOT} , - REMARK = #{REMARK} , - MODUSERID = #{USERID} , - MODDATETIME= SYSDATE - - - UPDATE TEMP_PROJECT_INFO SET - STATE = #{STATE} - - - - - - - - - - - - - - - - ' ' AND PROJECT_CODE = #{PROJECT_CODE} -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 'N' AND PROJECT_CODE = #{PROJECT_CODE} ) - , #{STATE} - , #{FILENAME} - , #{PROJECT_CODE} - ) -]]> - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml deleted file mode 100644 index 28954ac..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ /dev/null @@ -1,1425 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml deleted file mode 100644 index 95f29fe..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml +++ /dev/null @@ -1,1038 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO TEMP_ROCK_TRIAXIAL( - PROJECT_CODE, - HOLE_CODE, - RTRI_CODE, - TEST_ORDER , - GRAPH_LOCAL , - GRAPH_IMAGE , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RTRI_CODE}, - #{TEST_ORDER}, - #{GRAPH_LOCAL}, - #{GRAPH_IMAGE}, - #{USERID}, - SYSDATE - ) - - - - - - DELETE FROM TEMP_ROCK_TRIAXIAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RTRI_CODE IN (${sampleCode}) - - - - - - DELETE FROM TEMP_ROCK_TRIAXIAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RTRI_CODE =#{RTRI_CODE} - - - - - INSERT INTO TEMP_ROCK_TRIAXIAL( - PROJECT_CODE, - HOLE_CODE, - RTRI_CODE, - TEST_ORDER , - RTRI_DEPTH_FROM , - RTRI_DEPTH_TO , - RTRI_PHI , - RTRI_C , - RTRI_TENSILESTRENGTH , - RTRI_50_DIA , - RTRI_50_LENGTH , - RTRI_50_CONFPRES , - RTRI_50_MAXSTRENGTH , - RTRI_100_DIA , - RTRI_100_LENGTH , - RTRI_100_CONFPRES , - RTRI_100_MAXSTRENGTH , - RTRI_150_DIA , - RTRI_150_LENGTH , - RTRI_150_CONFPRES , - RTRI_150_MAXSTRENGTH , - RTRI_REMARK , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RTRI_CODE}, - #{TEST_ORDER}, - #{RTRI_DEPTH_FROM} , - #{RTRI_DEPTH_TO} , - #{RTRI_PHI} , - #{RTRI_C} , - #{RTRI_TENSILESTRENGTH} , - #{RTRI_50_DIA} , - #{RTRI_50_LENGTH} , - #{RTRI_50_CONFPRES} , - #{RTRI_50_MAXSTRENGTH} , - #{RTRI_100_DIA} , - #{RTRI_100_LENGTH} , - #{RTRI_100_CONFPRES} , - #{RTRI_100_MAXSTRENGTH} , - #{RTRI_150_DIA} , - #{RTRI_150_LENGTH} , - #{RTRI_150_CONFPRES} , - #{RTRI_150_MAXSTRENGTH} , - #{RTRI_REMARK} , - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - SYSDATE - ) - - - - - - - - - - - - - - - - - - - - - - - DELETE FROM TEMP_ROCK_REPEATED_TRIAXIAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RT_SEQ=#{RT_SEQ} - - - - DELETE FROM TEMP_ROCK_REPEATED_TRIAXIAL_U - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RT_SEQ=#{RT_SEQ} - - - - INSERT INTO TEMP_ROCK_REPEATED_TRIAXIAL_U ( - PROJECT_CODE, - HOLE_CODE, - RT_SEQ, - RT_DEPTH_FROM, - RT_DEPTH_TO, - RT_RELATIVE_DENSITY , - RT_DRY_UNIT_WEIGHT, - RT_EFFECTIVE_PRESSURE, - RT_CORRECTION_FACTOR , - RT_ARSPRT , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID, - DATETIME ) VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RT_SEQ}, - #{RT_DEPTH_FROM}, - #{RT_DEPTH_TO}, - #{RT_RELATIVE_DENSITY}, - #{RT_DRY_UNIT_WEIGHT}, - #{RT_EFFECTIVE_PRESSURE}, - #{RT_CORRECTION_FACTOR}, - #{RT_ARSPRT}, - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - SYSDATE) - - - - INSERT INTO TEMP_ROCK_REPEATED_TRIAXIAL ( - PROJECT_CODE , - HOLE_CODE , - RT_SEQ , - RT_DETAIL_SEQ , - RT_RSPR , - RT_ARSPR , - RT_LNUM, - USERID , - DATETIME ) VALUES( - #{PROJECT_CODE} , - #{HOLE_CODE} , - #{RT_SEQ} , - #{RT_DETAIL_SEQ} , - #{RT_RSPR} , - #{RT_ARSPR} , - #{RT_LNUM}, - #{USERID} , - SYSDATE ) - - - - - - - - - - DELETE FROM TEMP_ROCK_RESONANT - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RC_SEQ=#{RC_SEQ} - - - - DELETE FROM TEMP_ROCK_RESONANT_USUAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RC_SEQ=#{RC_SEQ} - - - - - INSERT INTO TEMP_ROCK_RESONANT_USUAL ( - PROJECT_CODE, - HOLE_CODE, - RC_SEQ, - RC_DEPTH_FROM, - RC_DEPTH_TO, - RC_DENSITY_IN_SITU , - RC_DRY_UNIT_WEIGHT, - RC_MOISTURE_CONTENT, - RC_REMARK , - RC_RESTRAINED_PRESSURE , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID, - DATETIME ) VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RC_SEQ}, - #{RC_DEPTH_FROM}, - #{RC_DEPTH_TO}, - #{RC_DENSITY_IN_SITU}, - #{RC_DRY_UNIT_WEIGHT}, - #{RC_MOISTURE_CONTENT}, - #{RC_REMARK}, - #{RC_RESTRAINED_PRESSURE}, - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - SYSDATE) - - - - - - INSERT INTO TEMP_ROCK_RESONANT ( - PROJECT_CODE , - HOLE_CODE , - RC_SEQ , - RC_DETAIL_SEQ , - RC_SHEAR_STRAIN , - RC_SHEAR_FACTOR , - RC_SHEAR_VELOCITY , - RC_REGULAR_SHEAR_MODULUS, - RC_DAMPED_RATIO , - USERID , - DATETIME ) VALUES( - #{PROJECT_CODE} , - #{HOLE_CODE} , - #{RC_SEQ} , - #{RC_DETAIL_SEQ} , - #{RC_SHEAR_STRAIN} , - #{RC_SHEAR_FACTOR} , - #{RC_SHEAR_VELOCITY} , - #{RC_REGULAR_SHEAR_MODULUS}, - #{RC_DAMPED_RATIO} , - #{USERID} , - SYSDATE ) - - - - - - - - - - - - - - - - INSERT INTO TEMP_ROCK_JOINTSHEAR( - PROJECT_CODE, - HOLE_CODE, - RJOINT_CODE, - TEST_ORDER , - GRAPH_LOCAL , - GRAPH_IMAGE , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RJOINT_CODE}, - #{TEST_ORDER}, - #{GRAPH_LOCAL}, - #{GRAPH_IMAGE}, - #{USERID}, - SYSDATE - ) - - - - - - DELETE FROM TEMP_ROCK_JOINTSHEAR - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RJOINT_CODE IN (${sampleCode}) - - - - DELETE FROM TEMP_ROCK_JOINTSHEAR - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RJOINT_CODE =#{RJOINT_CODE} - - - - INSERT INTO TEMP_ROCK_JOINTSHEAR( - PROJECT_CODE, - HOLE_CODE, - RJOINT_CODE, - TEST_ORDER , - RJOINT_DEPTH_FROM , - RJOINT_DEPTH_TO , - RJOINT_PHI , - RJOINT_C , - RJOINT_NORAML_STRESS , - RJOINT_SHEAR_STRESS , - RJOINT_JCS , - RJOINT_REMARK , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RJOINT_CODE}, - #{testOrder}, - #{rjointDepthFrom} , - #{rjointDepthTo} , - #{rjointPhi} , - #{rjointC} , - #{rjointNoramlStress} , - #{rjointShearStress} , - #{rjointJcs} , - #{rjointRemark} , - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - SYSDATE - ) - - - - - - - - - - - - INSERT INTO TEMP_ROCK_POINTLOAD( - PROJECT_CODE, - HOLE_CODE, - ROCK_POINT_CODE, - TEST_ORDER , - GRAPH_LOCAL , - GRAPH_IMAGE , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{ROCK_POINT_CODE}, - #{TEST_ORDER}, - #{GRAPH_LOCAL}, - #{GRAPH_IMAGE}, - #{USERID}, - SYSDATE - ) - - - - SELECT GRAPH_IMAGE FROM TEMP_ROCK_POINTLOAD - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND ROCK_POINT_CODE IN (${sampleCode}) - - - - DELETE FROM TEMP_ROCK_POINTLOAD - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND ROCK_POINT_CODE IN (${sampleCode}) - - - - DELETE FROM TEMP_ROCK_POINTLOAD - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND ROCK_POINT_CODE =#{ROCK_POINT_CODE} - - - - INSERT INTO TEMP_ROCK_POINTLOAD( - PROJECT_CODE, - HOLE_CODE, - ROCK_POINT_CODE, - TEST_ORDER , - DEPTH_FROM , - DEPTH_TO , - DIA , - LENGTH , - TESILESTRENGTH , - POINTSTRENGTH , - UNIAXIAL , - REMARK , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{ROCK_POINT_CODE}, - #{testOrder}, - #{depthFrom}, - #{depthTo}, - #{dia}, - #{length}, - #{tesilestrength}, - #{pointstrength}, - #{uniaxial}, - #{remark}, - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - SYSDATE - ) - - - - - - - - - - - - - - - - - DELETE FROM TEMP_ROCK_UNIAXIAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RUNI_CODE=#{RUNI_CODE} - - - - - - INSERT INTO TEMP_ROCK_UNIAXIAL( - PROJECT_CODE, - HOLE_CODE, - RUNI_CODE, - TEST_ORDER , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RUNI_CODE}, - #{TEST_ORDER}, - #{USERID}, - SYSDATE - ) - - - - - - - DELETE FROM TEMP_ROCK_UNIAXIAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RUNI_CODE IN (${sampleCode}) - - - - DELETE FROM TEMP_ROCK_UNIAXIAL - WHERE PROJECT_CODE = #{PROJECT_CODE} - AND HOLE_CODE = #{HOLE_CODE} - AND RUNI_CODE =#{RUNI_CODE} - - - - INSERT INTO TEMP_ROCK_UNIAXIAL( - PROJECT_CODE, - HOLE_CODE, - RUNI_CODE, - TEST_ORDER , - RUNI_DEPTH_FROM , - RUNI_DEPTH_TO , - RUNI_DIA , - RUNI_LENGTH , - RUNI_GS , - RUNI_WAVE_P , - RUNI_WAVE_S , - RUNI_ABS , - RUNI_UNI_STRENGTH , - RUNI_YOUNG , - RUNI_POISSON , - RUNI_REMARK , - GRAPH_IMAGE1 , - GRAPH_IMAGE2 , - GRAPH_LOCAL1 , - GRAPH_LOCAL2 , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RUNI_CODE}, - #{testOrder}, - #{runiDepthFrom} , - #{runiDepthTo} , - #{runiDia} , - #{runiLength} , - #{runiGs} , - #{runiWaveP} , - #{runiWaveS} , - #{runiAbs} , - #{runiUniStrength} , - #{runiYoung} , - #{runiPoisson} , - #{runiRemark} , - #{GRAPH_IMAGE1} , - #{GRAPH_IMAGE2} , - #{GRAPH_LOCAL1} , - #{GRAPH_LOCAL2} , - #{USERID} , - SYSDATE - ) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml deleted file mode 100644 index 1e4c9f5..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/sampleInfo.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml deleted file mode 100644 index 152683c..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml +++ /dev/null @@ -1,905 +0,0 @@ - - - - - - - - - - - - - - DELETE FROM TEMP_CLASSIFICATION WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} - - - - INSERT INTO TEMP_CLASSIFICATION( - PROJECT_CODE, - HOLE_CODE, - SAMPLE_CODE, - CLASSI_D10, - CLASSI_D30, - CLASSI_D60, - CLASSI_CU, - CLASSI_CG, - CLASSI_NO4, - CLASSI_NO6, - CLASSI_NO8, - CLASSI_NO10, - CLASSI_NO12, - CLASSI_NO16, - CLASSI_NO20, - CLASSI_NO30, - CLASSI_NO40, - CLASSI_NO50, - CLASSI_NO60, - CLASSI_NO70, - CLASSI_NO100, - CLASSI_NO140, - CLASSI_NO200, - CLASSI_NO005, - CLASSI_REMARK, - GRAPH_LOCAL, - GRAPH_IMAGE, - USERID, - DATETIME) - VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{sampleCode}, - #{classiD10}, - #{classiD30}, - #{classiD60}, - #{classiCu}, - #{classiCg}, - #{classiNo4}, - #{classiNo6}, - #{classiNo8}, - #{classiNo10}, - #{classiNo12}, - #{classiNo16}, - #{classiNo20}, - #{classiNo30}, - #{classiNo40}, - #{classiNo50}, - #{classiNo60}, - #{classiNo70}, - #{classiNo100}, - #{classiNo140}, - #{classiNo200}, - #{classiNo005}, - #{classiRemark}, - #{GRAPH_LOCAL}, - #{GRAPH_IMAGE}, - #{USERID}, - SYSDATE - ) - - - - - - DELETE FROM TEMP_CBR_COMPAC WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} - - - - INSERT INTO TEMP_CBR_COMPAC( - PROJECT_CODE, - HOLE_CODE, - SAMPLE_CODE, - CBR_MOD_CBR, - CBR_D_RD, - CBR_D_GS, - CBR_D_COMPACTION, - CBR_D_CMC, - CBR_A_RD, - CBR_A_GS, - CBR_A_COMPACTION, - CBR_A_CMC, - CBR_55_SWELLING, - CBR_55_SOAKING, - CBR_55_MOULDING, - CBR_25_SWELLING, - CBR_25_SOAKING, - CBR_25_MOULDING, - CBR_10_SWELLING, - CBR_10_SOAKING, - CBR_10_MOULDING, - CBR_REMARK, - GRAPH_IMAGE1, - GRAPH_IMAGE2, - GRAPH_LOCAL1, - GRAPH_LOCAL2, - USERID, - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{sampleCode}, - #{cbrModCbr}, - #{cbrDRd}, - #{cbrDGs}, - #{cbrDCompaction}, - #{cbrDCmc}, - #{cbrARd}, - #{cbrAGs}, - #{cbrACompaction}, - #{cbrACmc}, - #{cbr55Swelling}, - #{cbr55Soaking}, - #{cbr55Moulding}, - #{cbr25Swelling}, - #{cbr25Soaking}, - #{cbr25Moulding}, - #{cbr10Swelling}, - #{cbr10Soaking}, - #{cbr10Moulding}, - #{cbrRemark}, - #{GRAPH_IMAGE1}, - #{GRAPH_IMAGE2}, - #{GRAPH_LOCAL1}, - #{GRAPH_LOCAL2}, - #{USERID}, - SYSDATE - ) - - - - - - - - - - DELETE FROM TEMP_CONSOLIDATION_USUAL WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE} - - - - INSERT INTO TEMP_CONSOLIDATION_USUAL ( - PROJECT_CODE, - HOLE_CODE, - SAMPLE_CODE, - CONSOL_SAMPLE_DIA, - CONSOL_SAMPLE_HEIGHT, - CONSOL_W0, - CONSOL_WF, - CONSOL_RF, - CONSOL_RD, - CONSOL_S0, - CONSOL_SF, - CONSOL_PC, - CONSOL_CC, - CONSOL_REMARK, - GRAPH_IMAGE, - GRAPH_LOCAL, - USERID, - DATETIME - ) VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{SAMPLE_CODE}, - #{CONSOL_SAMPLE_DIA}, - #{CONSOL_SAMPLE_HEIGHT}, - #{CONSOL_W0}, - #{CONSOL_WF}, - #{CONSOL_RF}, - #{CONSOL_RD}, - #{CONSOL_S0}, - #{CONSOL_SF}, - #{CONSOL_PC}, - #{CONSOL_CC}, - #{CONSOL_REMARK}, - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - SYSDATE) - - - - DELETE FROM TEMP_CONSOLIDATION WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE} AND SEQ =#{SEQ} - - - - UPDATE TEMP_CONSOLIDATION SET - CONSOL_P=#{CONSOL_P}, - CONSOL_SETTLEMENT=#{CONSOL_SETTLEMENT}, - CONSOL_T90=#{CONSOL_T90}, - CONSOL_E=#{CONSOL_E}, - CONSOL_TWOHA=#{CONSOL_TWOHA}, - CONSOL_AV=#{CONSOL_AV}, - CONSOL_CV=#{CONSOL_CV}, - CONSOL_MV=#{CONSOL_MV}, - CONSOL_K=#{CONSOL_K}, - CONSOL_RP=#{CONSOL_RP}, - USERID=#{USERID}, - DATETIME=SYSDATE - WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE} AND SEQ =#{SEQ} - - - - INSERT INTO TEMP_CONSOLIDATION ( - PROJECT_CODE , - HOLE_CODE , - SAMPLE_CODE , - SEQ , - CONSOL_P , - CONSOL_SETTLEMENT , - CONSOL_T90 , - CONSOL_E , - CONSOL_TWOHA , - CONSOL_AV , - CONSOL_CV , - CONSOL_MV , - CONSOL_K , - CONSOL_RP , - USERID , - DATETIME - ) VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{SAMPLE_CODE}, - (SELECT NVL(MAX(SEQ)+1,1) FROM TEMP_CONSOLIDATION WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE}), - #{CONSOL_P}, - #{CONSOL_SETTLEMENT}, - #{CONSOL_T90}, - #{CONSOL_E}, - #{CONSOL_TWOHA}, - #{CONSOL_AV}, - #{CONSOL_CV}, - #{CONSOL_MV}, - #{CONSOL_K}, - #{CONSOL_RP}, - #{USERID}, - SYSDATE - ) - - - - - - DELETE FROM TEMP_UNCONFINED_USUAL WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} - - - - INSERT INTO TEMP_UNCONFINED_USUAL( - PROJECT_CODE, - HOLE_CODE, - SAMPLE_CODE, - UNCONF_RINGFACTOR , - UNCONF_LOAD_SCALE , - UNCONF_UNDISTURB_HEIGHT , - UNCONF_UNDISTURB_DIA , - UNCONF_UNDISTURB_W , - UNCONF_UNDISTURB_RT , - UNCONF_UNDISTURB_E , - UNCONF_UNDISTURB_S , - UNCONF_UNDISTURB_COMPSTRENGTH , - UNCONF_REMOULD_HEIGHT , - UNCONF_REMOULD_DIA , - UNCONF_REMOULD_W , - UNCONF_REMOULD_RT , - UNCONF_REMOULD_E , - UNCONF_REMOULD_S , - UNCONF_REMOULD_COMPSTRENGTH , - UNCONF_SAMPLE_SHAPE , - UNCONF_REMARK , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID, - DATETIME)VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{SAMPLE_CODE}, - #{UNCONF_RINGFACTOR} , - #{UNCONF_LOAD_SCALE} , - #{UNCONF_UNDISTURB_HEIGHT} , - #{UNCONF_UNDISTURB_DIA} , - #{UNCONF_UNDISTURB_W} , - #{UNCONF_UNDISTURB_RT} , - #{UNCONF_UNDISTURB_E} , - #{UNCONF_UNDISTURB_S} , - #{UNCONF_UNDISTURB_COMPSTRENGTH} , - #{UNCONF_REMOULD_HEIGHT} , - #{UNCONF_REMOULD_DIA} , - #{UNCONF_REMOULD_W} , - #{UNCONF_REMOULD_RT} , - #{UNCONF_REMOULD_E} , - #{UNCONF_REMOULD_S} , - #{UNCONF_REMOULD_COMPSTRENGTH} , - #{UNCONF_SAMPLE_SHAPE} , - #{UNCONF_REMARK} , - #{GRAPH_IMAGE} , - #{GRAPH_LOCAL} , - #{USERID}, - SYSDATE ) - - - - - - - - - - DELETE FROM TEMP_TRIAXIAL_USUAL WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE} AND TRI_CODE=#{TRI_CODE} - - - - INSERT INTO TEMP_TRIAXIAL_USUAL( - PROJECT_CODE, - HOLE_CODE, - SAMPLE_CODE, - TRI_CODE, - TRI_TYPEOFSAMPLE, - TRI_TYPEOFTEST, - TRI_TYPEOFCONTROLLEDTEST, - TRI_NOSTRAIN, - TRI_PHI_U, - TRI_CU, - TRI_REMARK, - GRAPH_IMAGE1 , - GRAPH_IMAGE2 , - GRAPH_LOCAL1 , - GRAPH_LOCAL2 , - USERID, - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{SAMPLE_CODE}, - #{TRI_CODE}, - #{TRI_TYPEOFSAMPLE}, - #{TRI_TYPEOFTEST}, - #{TRI_TYPEOFCONTROLLEDTEST}, - #{TRI_NOSTRAIN}, - #{TRI_PHI_U}, - #{TRI_CU}, - #{TRI_REMARK}, - #{GRAPH_IMAGE1}, - #{GRAPH_IMAGE2}, - #{GRAPH_LOCAL1}, - #{GRAPH_LOCAL2}, - #{USERID}, - SYSDATE - ) - - - - DELETE FROM TEMP_TRIAXIAL_CU WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE} AND TRI_CODE=#{TRI_CODE} - - - - INSERT INTO TEMP_TRIAXIAL_CU ( - PROJECT_CODE , - HOLE_CODE , - SAMPLE_CODE , - TRI_CODE , - TRICU_TESTORDER , - TRICU_TESTCODE , - TRICU_W0 , - TRICU_RD0 , - TRICU_S0 , - TRICU_E0 , - TRICU_WF , - TRICU_RDF , - TRICU_SF , - TRICU_EF , - TRICU_U0 , - TRICU_SIGMA3 , - TRICU_MAXSIGMA , - TRICU_ULTSIGMA , - TRICU_D0 , - TRICU_H0 , - TRICU_UF , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{SAMPLE_CODE}, - #{TRI_CODE}, - #{TRICU_TESTORDER}, - #{TRICU_TESTCODE}, - #{TRICU_W0}, - #{TRICU_RD0}, - #{TRICU_S0}, - #{TRICU_E0}, - #{TRICU_WF}, - #{TRICU_RDF}, - #{TRICU_SF}, - #{TRICU_EF}, - #{TRICU_U0}, - #{TRICU_SIGMA3}, - #{TRICU_MAXSIGMA}, - #{TRICU_ULTSIGMA}, - #{TRICU_D0}, - #{TRICU_H0}, - #{TRICU_UF}, - #{USERID}, - SYSDATE - ) - - - - DELETE FROM TEMP_TRIAXIAL_UU WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE =#{SAMPLE_CODE} AND TRI_CODE=#{TRI_CODE} - - - - INSERT INTO TEMP_TRIAXIAL_UU ( - PROJECT_CODE , - HOLE_CODE , - SAMPLE_CODE , - TRI_CODE , - TRIUU_TESTORDER , - TRIUU_TESTCODE , - TRIUU_W0 , - TRIUU_RD0 , - TRIUU_S0 , - TRIUU_E0 , - TRIUU_U0 , - TRIUU_SIGMA3 , - TRIUU_MAXSIGMA , - TRIUU_ULTSIGMA , - TRIUU_D0 , - TRIUU_H0 , - USERID , - DATETIME - )VALUES( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{SAMPLE_CODE}, - #{TRI_CODE}, - #{TRIUU_TESTORDER}, - #{TRIUU_TESTCODE}, - #{TRIUU_W0}, - #{TRIUU_RD0}, - #{TRIUU_S0}, - #{TRIUU_E0}, - #{TRIUU_U0}, - #{TRIUU_SIGMA3}, - #{TRIUU_MAXSIGMA}, - #{TRIUU_ULTSIGMA}, - #{TRIUU_D0}, - #{TRIUU_H0}, - #{USERID}, - SYSDATE - ) - - - - - - - - - - DELETE FROM TEMP_RESONANT WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND RC_SEQ=#{RC_SEQ} - - AND SAMPLE_CODE = #{SAMPLE_CODE} - - - - - DELETE FROM TEMP_RESONANT_USUAL WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND RC_SEQ=#{RC_SEQ} - - AND SAMPLE_CODE = #{SAMPLE_CODE} - - - - - INSERT INTO TEMP_RESONANT_USUAL ( - PROJECT_CODE, - HOLE_CODE, - RC_SEQ, - RC_DEPTH_FROM, - RC_DEPTH_TO, - RC_DENSITY_IN_SITU , - RC_DRY_UNIT_WEIGHT, - RC_MOISTURE_CONTENT, - RC_REMARK , - RC_RESTRAINED_PRESSURE , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID, - SAMPLE_CODE, - DATETIME ) - VALUES ( - #{PROJECT_CODE}, - #{HOLE_CODE}, - #{RC_SEQ}, - #{RC_DEPTH_FROM}, - #{RC_DEPTH_TO}, - #{RC_DENSITY_IN_SITU}, - #{RC_DRY_UNIT_WEIGHT}, - #{RC_MOISTURE_CONTENT}, - #{RC_REMARK}, - #{RC_RESTRAINED_PRESSURE}, - #{GRAPH_IMAGE}, - #{GRAPH_LOCAL}, - #{USERID}, - #{SAMPLE_CODE}, - SYSDATE) - - - - INSERT INTO TEMP_RESONANT ( - PROJECT_CODE , - HOLE_CODE , - RC_SEQ , - RC_DETAIL_SEQ , - RC_SHEAR_STRAIN , - RC_SHEAR_FACTOR , - RC_SHEAR_VELOCITY , - RC_REGULAR_SHEAR_MODULUS, - RC_DAMPED_RATIO , - USERID , - SAMPLE_CODE, - DATETIME ) VALUES( - #{PROJECT_CODE} , - #{HOLE_CODE} , - #{RC_SEQ} , - #{RC_DETAIL_SEQ} , - #{RC_SHEAR_STRAIN} , - #{RC_SHEAR_FACTOR} , - #{RC_SHEAR_VELOCITY} , - #{RC_REGULAR_SHEAR_MODULUS}, - #{RC_DAMPED_RATIO} , - #{USERID} , - #{SAMPLE_CODE}, - SYSDATE ) - - - - - - DELETE FROM TEMP_REPEATED_TRIAXIAL WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE = #{SAMPLE_CODE} AND RT_SEQ=#{RT_SEQ} - - - - DELETE FROM TEMP_REPEATED_TRIAXIAL_USUAL WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE = #{HOLE_CODE} AND SAMPLE_CODE = #{SAMPLE_CODE} AND RT_SEQ=#{RT_SEQ} - - - - INSERT INTO TEMP_REPEATED_TRIAXIAL_USUAL ( - PROJECT_CODE , - HOLE_CODE , - RT_SEQ , - RT_DEPTH_FROM , - RT_DEPTH_TO , - RT_RELATIVE_DENSITY , - RT_DRY_UNIT_WEIGHT , - RT_EFFECTIVE_PRESSURE , - RT_CORRECTION_FACTOR , - RT_ARSPRT , - GRAPH_IMAGE , - GRAPH_LOCAL , - USERID , - DATETIME , - SAMPLE_CODE - ) - VALUES ( - #{PROJECT_CODE} , - #{HOLE_CODE} , - #{RT_SEQ} , - #{RT_DEPTH_FROM} , - #{RT_DEPTH_TO} , - #{RT_RELATIVE_DENSITY} , - #{RT_DRY_UNIT_WEIGHT} , - #{RT_EFFECTIVE_PRESSURE} , - #{RT_CORRECTION_FACTOR} , - #{RT_ARSPRT} , - #{GRAPH_IMAGE} , - #{GRAPH_LOCAL} , - #{USERID} , - SYSDATE , - #{SAMPLE_CODE} - ) - - - - INSERT INTO TEMP_REPEATED_TRIAXIAL ( - PROJECT_CODE , - HOLE_CODE , - RT_SEQ , - RT_DETAIL_SEQ , - RT_RSPR , - RT_ARSPR , - RT_LNUM , - USERID , - DATETIME , - SAMPLE_CODE - ) VALUES( - #{PROJECT_CODE} , - #{HOLE_CODE} , - #{RT_SEQ} , - #{RT_DETAIL_SEQ} , - #{RT_RSPR} , - #{RT_ARSPR} , - #{RT_LNUM} , - #{USERID} , - SYSDATE , - #{SAMPLE_CODE} - ) - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/selectClass2019_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/selectClass2019_SQL.xml deleted file mode 100644 index 9c9f91d..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/selectClass2019_SQL.xml +++ /dev/null @@ -1,839 +0,0 @@ - - - - - - - - - - - - - 'N' AND TPI.PROJECT_CODE = #{projectCode} - ) - ]]> - - - - - - 0 - ) T1 - GROUP BY PROJECT_CODE - ]]> - - - - - - 0 - ) T1 - GROUP BY PROJECT_CODE - ) T2 - CONNECT BY LEVEL <= REGEXP_COUNT(HOLE_CODE_ARRAY, '[^,]+') - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/selectClass_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/selectClass_SQL.xml deleted file mode 100644 index 8151a3d..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/selectClass_SQL.xml +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - - - - - - - DELETE FROM TEMP_SELECTCLASS_INFO - WHERE PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - - - - INSERT INTO TEMP_SELECTCLASS_INFO ( - PROJECT_CODE - , HOLE_CODE - , LAB_CHECK - , STAN_SPT - , STAN_SLICKENSIDE - , STAN_TCRRQD - , STAN_DSF - , STAN_RMR - , STAN_Q - , FIELD_WATERPRESSURE - , FIELD_PERMEABLITY - , FIELD_PRESSUREMETER - , FIELD_CONE_PENETRATION - , SAND_CLASSIFICATION - , SAND_CBR - , SAND_CONSOLIDATION - , SAND_UNCONFINED_USUAL - , SAND_TRIAXIAL - , SAND_RESONANT - , SAND_REPEATED_TRIAXIAL - , ROCK_UNIAXIAL - , ROCK_TRIAXIAL - , ROCK_POINTLOAD - , ROCK_JOINTSHEAR - , ROCK_RESONANT - , ROCK_REPEATED_TRIAXIAL - , USERID - , DATETIME - , RESISTIVITY - , REFRACTION - , BOREHOLE_WAVE - , DENSITY - , DOWNHOLE - ) - ( - SELECT - PROJECT_CODE - , #{holeCode} - , LAB_CHECK - , STAN_SPT - , STAN_SLICKENSIDE - , STAN_TCRRQD - , STAN_DSF - , STAN_RMR - , STAN_Q - , FIELD_WATERPRESSURE - , FIELD_PERMEABLITY - , FIELD_PRESSUREMETER - , FIELD_CONE_PENETRATION - , SAND_CLASSIFICATION - , SAND_CBR - , SAND_CONSOLIDATION - , SAND_UNCONFINED_USUAL - , SAND_TRIAXIAL - , SAND_RESONANT - , SAND_REPEATED_TRIAXIAL - , ROCK_UNIAXIAL - , ROCK_TRIAXIAL - , ROCK_POINTLOAD - , ROCK_JOINTSHEAR - , ROCK_RESONANT - , ROCK_REPEATED_TRIAXIAL - , #{userId} - , sysdate - , RESISTIVITY - , REFRACTION - , BOREHOLE_WAVE - , DENSITY - , DOWNHOLE - FROM TEMP_SELECTCLASS_INFO - WHERE PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{maxHoleCode} - ) - - - - DELETE FROM TEMP_REFERENCE - WHERE PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - - AND TEST_INFO_CODE = #{testInfoCode} - - - - - - INSERT INTO TEMP_REFERENCE - ( - PROJECT_CODE - , HOLE_CODE - , TEST_INFO_CODE - , ITEM_INFO_CODE - , REFERENCE_GUBUN - , REFERENCE_CODE - , USERID - , DATETIME - )( - SELECT - PROJECT_CODE - , #{holeCode} - , TEST_INFO_CODE - , ITEM_INFO_CODE - , REFERENCE_GUBUN - , REFERENCE_CODE - , #{userId} - , SYSDATE - FROM TEMP_REFERENCE - WHERE PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{maxHoleCode} - ) - - - - INSERT INTO TEMP_SELECTCLASS_INFO( - PROJECT_CODE, - HOLE_CODE, - STAN_SPT, - STAN_SLICKENSIDE, - STAN_TCRRQD, - STAN_DSF, - STAN_RMR, - STAN_Q, - FIELD_WATERPRESSURE, - FIELD_PERMEABLITY, - FIELD_PRESSUREMETER, - FIELD_CONE_PENETRATION, - SAND_CLASSIFICATION, - SAND_CBR, - SAND_CONSOLIDATION, - SAND_UNCONFINED_USUAL, - SAND_TRIAXIAL, - SAND_RESONANT, - SAND_REPEATED_TRIAXIAL, - ROCK_UNIAXIAL, - ROCK_TRIAXIAL, - ROCK_POINTLOAD, - ROCK_JOINTSHEAR, - ROCK_RESONANT, - ROCK_REPEATED_TRIAXIAL, - BOREHOLE_WAVE, - DOWNHOLE, - DENSITY, - USERID, - DATETIME - )VALUES ( - #{projectCode}, - #{holeCode}, - #{stanSpt}, - #{stanSlickenside}, - #{stanTcrrqd}, - #{stanDsf}, - #{stanRmr}, - #{stanQ}, - #{fieldWaterpressure}, - #{fieldPermeability}, - #{fieldPressuremeter}, - #{fieldConePenetration}, - #{sandClassification}, - #{sandCbr}, - #{sandConsolidation}, - #{sandUnconfinedUsual}, - #{sandTriaxial}, - #{sandResonant}, - #{sandRepeatedTriaxial}, - #{rockUniaxial}, - #{rockTriaxial}, - #{rockPointload}, - #{rockJointshear}, - #{rockResonant}, - #{rockRepeatedTriaxial}, - #{boreholeWave}, - #{downhole}, - #{density}, - #{userId}, - SYSDATE - ) - - - - - - - - DELETE FROM ${tableName} WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE=#{holeCode} - - - - MERGE INTO TEMP_REFERENCE - USING DUAL - ON ( PROJECT_CODE = #{projectCode} - AND HOLE_CODE = #{holeCode} - AND TEST_INFO_CODE = #{testInfoCode} - AND ITEM_INFO_CODE = #{itemInfoCode} - ) - WHEN MATCHED THEN - UPDATE SET REFERENCE_GUBUN = #{referenceGubun} - , REFERENCE_CODE = #{referenceCode} - , USERID = #{userId} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , HOLE_CODE - , TEST_INFO_CODE - , ITEM_INFO_CODE - , REFERENCE_GUBUN - , REFERENCE_CODE - , USERID - , DATETIME - ) VALUES ( - #{projectCode} - , #{holeCode} - , #{testInfoCode} - , #{itemInfoCode} - , #{referenceGubun} - , #{referenceCode} - , #{userId} - , SYSDATE - ) - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/surface_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/surface_SQL.xml deleted file mode 100644 index 2664628..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/surface_SQL.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - DELETE FROM TEMP_RESISTIVITY_SURVEY WHERE PROJECT_CODE = #{PROJECT_CODE} - - - - INSERT INTO TEMP_RESISTIVITY_SURVEY ( - PROJECT_CODE - , RS_CHECKED_BY - , RS_COORDINATE - , USERID - , DATETIME - , JOSAID - , JOSA_START_TIME - , JOSA_END_TIME - ) VALUES ( - #{PROJECT_CODE} - , #{RS_CHECKED_BY} - , #{RS_COORDINATE} - , #{USERID} - , SYSDATE - , #{JOSAID} - , #{JOSA_START_TIME} - , #{JOSA_END_TIME} - ) - - - - DELETE FROM TEMP_RESISTIVITY_SURVEY_SUB WHERE PROJECT_CODE=#{PROJECT_CODE} AND LINE_NUMBER=#{LINE_NUMBER} AND SEQ=#{SEQ} - - - - UPDATE TEMP_RESISTIVITY_SURVEY_SUB SET - FROM_X = #{FROM_X}, - FROM_Y = #{FROM_Y}, - TO_X = #{TO_X}, - TO_Y = #{TO_Y}, - USERID = #{USERID}, - DATETIME = SYSDATE, - APPARENT_RESISTIVITY = #{APPARENT_RESISTIVITY}, - X_NORTH = #{X_NORTH}, - Y_EAST = #{Y_EAST} - - WHERE PROJECT_CODE=#{PROJECT_CODE} AND LINE_NUMBER=#{LINE_NUMBER} AND SEQ=#{SEQ} - - - - INSERT INTO TEMP_RESISTIVITY_SURVEY_SUB ( - PROJECT_CODE, - LINE_NUMBER, - SEQ, - FROM_X, - FROM_Y, - TO_X, - TO_Y, - USERID, - DATETIME, - APPARENT_RESISTIVITY, - X_NORTH, - Y_EAST - - ) VALUES ( - #{PROJECT_CODE}, - #{LINE_NUMBER}, - (SELECT NVL(MAX(SEQ) + 1,1) FROM TEMP_RESISTIVITY_SURVEY_SUB WHERE - PROJECT_CODE = #{PROJECT_CODE} AND LINE_NUMBER=#{LINE_NUMBER}), - #{FROM_X}, - #{FROM_Y}, - #{TO_X}, - #{TO_Y}, - #{USERID}, - SYSDATE, - #{APPARENT_RESISTIVITY}, - #{X_NORTH}, - #{Y_EAST} - - ) - - - - MERGE INTO TEMP_RESISTIVITY_SURVEY_FILE - USING DUAL ON ( PROJECT_CODE = #{PROJECT_CODE} AND LINE_NUMBER = - #{LINE_NUMBER} ) - WHEN MATCHED THEN - UPDATE SET GRAPH_IMAGE1 = #{GRAPH_IMAGE1} - , GRAPH_IMAGE2 = #{GRAPH_IMAGE2} - , GRAPH_LOCAL1 = #{GRAPH_LOCAL1} - , GRAPH_LOCAL2 = #{GRAPH_LOCAL2} - , FILE_SYS = #{FILE_SYS} - , FILE_ORG = #{FILE_ORG} - , USERID = #{USERID} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , LINE_NUMBER - , GRAPH_IMAGE1 - , GRAPH_IMAGE2 - , GRAPH_LOCAL1 - , GRAPH_LOCAL2 - , FILE_SYS - , FILE_ORG - , USERID - , DATETIME - ) VALUES ( - #{PROJECT_CODE} - , #{LINE_NUMBER} - , #{GRAPH_IMAGE1} - , #{GRAPH_IMAGE2} - , #{GRAPH_LOCAL1} - , #{GRAPH_LOCAL2} - , #{FILE_SYS} - , #{FILE_ORG} - , #{USERID} - , SYSDATE - ) - - - - - - - - - - DELETE FROM TEMP_REFRACTION_SURVEY WHERE PROJECT_CODE = #{PROJECT_CODE} - - - - INSERT INTO TEMP_REFRACTION_SURVEY ( - PROJECT_CODE - , RS_CHECKED_BY - , RS_COORDINATE - , USERID - , DATETIME - , JOSAID - , JOSA_START_TIME - , JOSA_END_TIME - ) VALUES ( - #{PROJECT_CODE} - , #{RS_CHECKED_BY} - , #{RS_COORDINATE} - , #{USERID} - , SYSDATE - , #{JOSAID} - , #{JOSA_START_TIME} - , #{JOSA_END_TIME} - ) - - - - DELETE FROM TEMP_REFRACTION_SURVEY_SUB WHERE PROJECT_CODE=#{PROJECT_CODE} AND LINE_NUMBER=#{LINE_NUMBER} AND SEQ=#{SEQ} - - - - UPDATE TEMP_REFRACTION_SURVEY_SUB SET - FROM_X = #{FROM_X}, - FROM_Y = #{FROM_Y}, - TO_X = #{TO_X}, - TO_Y = #{TO_Y}, - - X_NORTH = #{X_NORTH}, - Y_EAST = #{Y_EAST}, - VELOCITY = #{VELOCITY}, - USERID = #{USERID}, - DATETIME = SYSDATE - WHERE PROJECT_CODE=#{PROJECT_CODE} AND LINE_NUMBER=#{LINE_NUMBER} AND SEQ=#{SEQ} - - - - INSERT INTO TEMP_REFRACTION_SURVEY_SUB ( - PROJECT_CODE, - LINE_NUMBER, - SEQ, - FROM_X, - FROM_Y, - TO_X, - TO_Y, - USERID, - DATETIME, - - X_NORTH, - Y_EAST, - VELOCITY - ) VALUES ( - #{PROJECT_CODE}, - #{LINE_NUMBER}, - (SELECT NVL(MAX(SEQ) + 1,1) FROM TEMP_REFRACTION_SURVEY_SUB WHERE PROJECT_CODE - = #{PROJECT_CODE} AND LINE_NUMBER=#{LINE_NUMBER}), - #{FROM_X}, - #{FROM_Y}, - #{TO_X}, - #{TO_Y}, - #{USERID}, - SYSDATE, - - #{X_NORTH}, - #{Y_EAST}, - #{VELOCITY} - ) - - - - MERGE INTO TEMP_REFRACTION_SURVEY_FILE - USING DUAL ON ( PROJECT_CODE = #{PROJECT_CODE} AND LINE_NUMBER = - #{LINE_NUMBER} ) - WHEN MATCHED THEN - UPDATE SET GRAPH_IMAGE1 = #{GRAPH_IMAGE1} - , GRAPH_IMAGE2 = #{GRAPH_IMAGE2} - , GRAPH_LOCAL1 = #{GRAPH_LOCAL1} - , GRAPH_LOCAL2 = #{GRAPH_LOCAL2} - , FILE_SYS = #{FILE_SYS} - , FILE_ORG = #{FILE_ORG} - , USERID = #{USERID} - , DATETIME = SYSDATE - WHEN NOT MATCHED THEN - INSERT( - PROJECT_CODE - , LINE_NUMBER - , GRAPH_IMAGE1 - , GRAPH_IMAGE2 - , GRAPH_LOCAL1 - , GRAPH_LOCAL2 - , FILE_SYS - , FILE_ORG - , USERID - , DATETIME - ) VALUES ( - #{PROJECT_CODE} - , #{LINE_NUMBER} - , #{GRAPH_IMAGE1} - , #{GRAPH_IMAGE2} - , #{GRAPH_LOCAL1} - , #{GRAPH_LOCAL2} - , #{FILE_SYS} - , #{FILE_ORG} - , #{USERID} - , SYSDATE - ) - - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/subsidence/subsidence_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/subsidence/subsidence_SQL.xml deleted file mode 100644 index e6ee959..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/subsidence/subsidence_SQL.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - INTO - TBL_SUBSIDENCE_LIST - ( - SAGONO, - SIDO, - SIGUNGU, - SAGOREASON, - SAGODATE, - NO - ) VALUES - ( - #{item.sagoNo}, - #{item.sido}, - #{item.sigungu}, - #{item.sagoReason}, - #{item.sagoDate}, - #{item.no} - ) - - - - - - - - - - - - - - - - INTO - TBL_SUBSIDENCE_INFO - ( - SAGONO, - SIDO, - SIGUNGU, - DONG, - ADDR, - SAGOLAT, - SAGOLON, - SAGODATE, - SINKWIDTH, - SINKEXTEND, - SINKDEPTH, - GRDKIND, - SAGODETAIL, - DEATHCNT, - INJURYCNT, - VEHICLECNT, - TRSTATUS, - TRMETHOD, - TRAMOUNT, - TRFNDATE, - DASTDATE, - NO - ) VALUES - ( - #{item.sagoNo}, - #{item.sido}, - #{item.sigungu}, - #{item.dong}, - #{item.addr}, - #{item.sagoLat}, - #{item.sagoLon}, - #{item.sagoDate}, - #{item.sinkWidth}, - #{item.sinkExtend}, - #{item.sinkDepth}, - #{item.grdKind}, - #{item.sagoDetail}, - #{item.deathCnt}, - #{item.injuryCnt}, - #{item.vehicleCnt}, - #{item.trStatus}, - #{item.trMethod}, - #{item.trAmt}, - #{item.trFnDate}, - #{item.daStDate}, - #{item.no} - ) - - - - - - DELETE - FROM - TBL_SUBSIDENCE_LIST - - - - - DELETE - FROM - TBL_SUBSIDENCE_INFO - - \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/training/home/HomeTrainingMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/training/home/HomeTrainingMapper.xml deleted file mode 100644 index 535127c..0000000 --- a/src/main/resources/egovframework/sqlmap/mapper/training/home/HomeTrainingMapper.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/config/springmvc/action-servlet.xml b/src/main/webapp/WEB-INF/config/springmvc/action-servlet.xml index 50b7640..a359e2f 100644 --- a/src/main/webapp/WEB-INF/config/springmvc/action-servlet.xml +++ b/src/main/webapp/WEB-INF/config/springmvc/action-servlet.xml @@ -11,7 +11,7 @@ xmlns:oxm="http://www.springframework.org/schema/oxm" xmlns:util="http://www.spr - + diff --git a/src/main/webapp/WEB-INF/lib/egovframework.jar b/src/main/webapp/WEB-INF/lib/egovframework.jar new file mode 100644 index 0000000..27f7298 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/egovframework.jar differ diff --git a/src/main/webapp/WEB-INF/lib/egovframework.rte.psl.dataaccess-2.7.0.jar b/src/main/webapp/WEB-INF/lib/egovframework.rte.psl.dataaccess-2.7.0.jar new file mode 100644 index 0000000..cb49225 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/egovframework.rte.psl.dataaccess-2.7.0.jar differ diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index c7a1db5..3285772 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -64,9 +64,9 @@ - O2MapService - com.geotwo.webserver.core.service.Service - + O2MapService + kr.or.geoinfo.webserver.core.service.Service + O2MapService