diff --git a/list.txt b/list.txt index 5dec3e9..fea6fc9 100644 --- a/list.txt +++ b/list.txt @@ -1,10 +1,2 @@ -src\main\webapp\WEB-INF\jsp\sgis\surveysystem\createSurvey.jsp -src\main\webapp\WEB-INF\jsp\tiles\attribute\adm.top.jsp -src\main\webapp\WEB-INF\jsp\sgis\surveysystem\createQuestion.jsp -src\main\resources\egovframework\mapper\sgis\surveysystem\SurveyMapper.xml -src\main\resources\egovframework\mapper\sgis\surveysystem\QuestionMapper.xml -src\main\webapp\WEB-INF\jsp\sgis\surveysystem\createQuestionOption.jsp -src\main\webapp\WEB-INF\jsp\sgis\map\mapMain.jsp -src\main\webapp\WEB-INF\jsp\tiles\attribute\portal.top.jsp -src\main\webapp\WEB-INF\jsp\sgis\portal\portalMain.jsp -src\main\webapp\com\img\common\main\temp_dummy_main.png \ No newline at end of file +src\main\resources\egovframework\mapper\sgis\app\AppMainMapper.xml +src\main\webapp\WEB-INF\jsp\sgis\popup\cordinateSaupMap.jsp \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0a2441e..1c651fb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,40 +25,46 @@ - - mvn2s - https://repo1.maven.org/maven2/ - - true - - - true - - - - egovframe - https://maven.egovframe.go.kr/maven/ - - true - - - false - - - - osgeo - OSGeo Release Repository - https://repo.osgeo.org/repository/release/ - false - true - - - osgeo-snapshot - OSGeo Snapshot Repository - https://repo.osgeo.org/repository/snapshot/ - true - false - + + mvn2s + https://repo1.maven.org/maven2/ + + true + + + true + + + + egovframe + https://maven.egovframe.go.kr/maven/ + + true + + + false + + + + osgeo + OSGeo Release Repository + https://repo.osgeo.org/repository/release/ + false + true + + + + geosolutions + geosolutions repository + https://maven.geosolutions.it/ + + + osgeo-snapshot + OSGeo Snapshot Repository + https://repo.osgeo.org/repository/snapshot/ + true + false + @@ -107,11 +113,11 @@ 1.4 - - commons-codec - commons-codec - 1.9 - + + commons-codec + commons-codec + 1.9 + taglibs @@ -152,33 +158,33 @@ - org.mariadb.jdbc - mariadb-java-client - 2.2.5 + org.mariadb.jdbc + mariadb-java-client + 2.2.5 - org.postgresql - postgresql - 42.2.5 + org.postgresql + postgresql + 42.2.5 - org.lazyluke - log4jdbc-remix - 0.2.7 + org.lazyluke + log4jdbc-remix + 0.2.7 + + mysql + mysql-connector-java + 5.1.31 + + --> + + --> - + commons-fileupload @@ -302,9 +309,9 @@ 2.12.4 - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.12.4 + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.12.4 com.googlecode.json-simple @@ -314,22 +321,22 @@ - org.apache.poi - poi - 4.0.1 + org.apache.poi + poi + 4.0.1 org.apache.poi - poi-ooxml - 4.0.1 + poi-ooxml + 4.0.1 - commons-io - commons-io - 2.4 + commons-io + commons-io + 2.4 @@ -348,29 +355,56 @@ junit 4.13.2 test - - - org.geotools - gt-shapefile - ${geotools.version} - + + + org.geotools + gt-epsg-hsql + ${geotools.version} + + + org.geotools.jdbc + gt-jdbc-postgis + ${geotools.version} + - org.geotools - gt-epsg-hsql - ${geotools.version} - - - org.geotools.jdbc - gt-jdbc-postgis - ${geotools.version} - - org.geotools gt-swing ${geotools.version} - + - + + + it.geosolutions.jaiext.lookup + jt-lookup + 1.1.24 + + + it.geosolutions.jaiext.bandcombine + jt-bandcombine + 1.1.24 + + + it.geosolutions.jaiext.format + jt-format + 1.1.24 + + + it.geosolutions.jaiext.utilities + jt-utilities + 1.1.24 + + + it.geosolutions.jaiext.shadedrelief + jt-shadedrelief + 1.1.24 + + + it.geosolutions.jaiext.imagefunction + jt-imagefunction + 1.1.24 + + + org.projectlombok lombok 1.18.24 @@ -378,9 +412,9 @@ - com.google.code.gson - gson - 2.9.0 + com.google.code.gson + gson + 2.9.0 @@ -465,163 +499,189 @@ jython-standalone 2.7.1 + + + + org.python + jython-standalone + 2.7.1 + + + + org.geotools + gt-shapefile + ${geotools.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/gt-shapefile-28-SNAPSHOT.jar + + + + org.geotools + gt-main + ${geotools.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/gt-main-28-SNAPSHOT.jar + + + + - - install - ${basedir}/target - smart_ground - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - 80 - / - - -Xms256m -Xmx768m -XX:MaxPermSize=256m - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - - - org.codehaus.mojo - hibernate3-maven-plugin - 2.1 - - - - hbm2ddl - annotationconfiguration - - - - - - org.hsqldb - hsqldb - 2.3.2 - - - - - - org.codehaus.mojo - emma-maven-plugin - 1.0-alpha-3 - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.1 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - once - xml - - **/Abstract*.java - **/*Suite.java - - - **/*Test.java - - - - - org.codehaus.mojo - emma-maven-plugin - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - - - ${basedir}/target/site - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - sunlink - - javadoc - - true - - - http://docs.oracle.com/javase/6/docs/api/ - - - - - - - - org.codehaus.mojo - emma-maven-plugin - true - - - org.codehaus.mojo - surefire-report-maven-plugin - true - - - - report-only - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 128m - 512m - ${encoding} - ${encoding} - ${encoding} - - - - - org.apache.maven.plugins - maven-jxr-plugin - - ${encoding} - ${encoding} - true - apidocs - - - - + + install + ${basedir}/target + smart_ground + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + 80 + / + + -Xms256m -Xmx768m -XX:MaxPermSize=256m + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + + + org.codehaus.mojo + hibernate3-maven-plugin + 2.1 + + + + hbm2ddl + annotationconfiguration + + + + + + org.hsqldb + hsqldb + 2.3.2 + + + + + + org.codehaus.mojo + emma-maven-plugin + 1.0-alpha-3 + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.1 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + once + xml + + **/Abstract*.java + **/*Suite.java + + + **/*Test.java + + + + + org.codehaus.mojo + emma-maven-plugin + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + + + ${basedir}/target/site + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + sunlink + + javadoc + + true + + + http://docs.oracle.com/javase/6/docs/api/ + + + + + + + + org.codehaus.mojo + emma-maven-plugin + true + + + org.codehaus.mojo + surefire-report-maven-plugin + true + + + + report-only + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 128m + 512m + ${encoding} + ${encoding} + ${encoding} + + + + + org.apache.maven.plugins + maven-jxr-plugin + + ${encoding} + ${encoding} + true + apidocs + + + + diff --git a/src/main/java/sgis/adm/mapper/AdmMainMapper.java b/src/main/java/sgis/adm/mapper/AdmMainMapper.java index 8c9b754..d554245 100644 --- a/src/main/java/sgis/adm/mapper/AdmMainMapper.java +++ b/src/main/java/sgis/adm/mapper/AdmMainMapper.java @@ -5,7 +5,7 @@ import java.util.List; import egovframework.rte.psl.dataaccess.mapper.Mapper; -@Mapper("admMainMapper") +@Mapper("AdmMainMapper") public interface AdmMainMapper { List selectUserList(HashMap params) throws Exception; diff --git a/src/main/java/sgis/adm/service/impl/AdmMainServiceImpl.java b/src/main/java/sgis/adm/service/impl/AdmMainServiceImpl.java index 295406a..d00cc03 100644 --- a/src/main/java/sgis/adm/service/impl/AdmMainServiceImpl.java +++ b/src/main/java/sgis/adm/service/impl/AdmMainServiceImpl.java @@ -13,11 +13,11 @@ import sgis.adm.service.AdmMainService; public class AdmMainServiceImpl implements AdmMainService { @Autowired - private AdmMainMapper AdmMainMapper; + private AdmMainMapper admMainMapper; @Override public List selectUserList(HashMap params) throws Exception { - return AdmMainMapper.selectUserList(params); + return admMainMapper.selectUserList(params); } } diff --git a/src/main/java/sgis/app/web/AppMainController.java b/src/main/java/sgis/app/web/AppMainController.java index c0afcbc..f5221a1 100644 --- a/src/main/java/sgis/app/web/AppMainController.java +++ b/src/main/java/sgis/app/web/AppMainController.java @@ -120,23 +120,23 @@ public class AppMainController extends BaseController { return "sgis/app/proj/projList"; }; - //프로젝트 데이터 호출 - @SuppressWarnings("unchecked") - @RequestMapping(value = "/app/proj/projList_jsondata.do", method = {RequestMethod.POST, RequestMethod.GET}) - public void projList_jsondata(@RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ - request.setCharacterEncoding("UTF-8"); - response.setContentType("text/html;charset=UTF-8"); +//프로젝트 데이터 호출 +@SuppressWarnings("unchecked") +@RequestMapping(value = "/app/proj/projList_jsondata.do", method = {RequestMethod.POST, RequestMethod.GET}) +public void projList_jsondata(@RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ + request.setCharacterEncoding("UTF-8"); + response.setContentType("text/html;charset=UTF-8"); - //data정보 - List result = AppMainService.selectAppProjList(params); + //data정보 + List result = AppMainService.selectAppProjList(params); - HashMap> resultMap = new HashMap>(); - resultMap.put("dataList1", result); + HashMap> resultMap = new HashMap>(); + resultMap.put("dataList1", result); - JSONObject json = new JSONObject(); - json.putAll( resultMap ); - response.getWriter().print(json); - }; + JSONObject json = new JSONObject(); + json.putAll( resultMap ); + response.getWriter().print(json); +}; //프로젝트 생성 방법 선택 화면 @RequestMapping(value="/app/proj/projForm.do") @@ -175,7 +175,7 @@ public class AppMainController extends BaseController { //프로젝트 생성 (직접입력 저장) @RequestMapping(value = "/app/proj/insertProjectInfo.do") @ResponseBody - public String insertProjectInfo(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ + public JSONObject insertProjectInfo(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ String retStr = ""; try { @@ -245,7 +245,10 @@ public class AppMainController extends BaseController { }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //프로젝트 상세조회 @@ -272,7 +275,7 @@ public class AppMainController extends BaseController { //프로젝트 지역파일 삭제 (직접입력 저장) @RequestMapping(value = "/app/proj/deleteProjectInfoFile.do") @ResponseBody - public String deleteProjectInfoFile(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ + public JSONObject deleteProjectInfoFile(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ String retStr = ""; try { @@ -300,13 +303,15 @@ public class AppMainController extends BaseController { }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //프로젝트 삭제 @RequestMapping(value = "/app/proj/deleteProj.do") @ResponseBody - public String deleteProj(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ + public JSONObject deleteProj(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ String retStr = ""; try { @@ -328,15 +333,18 @@ public class AppMainController extends BaseController { }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //지역 검증 @RequestMapping(value="/app/proj/areaValidation.do") @ResponseBody - public String areaValidation(@RequestParam HashMap dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ + public JSONObject areaValidation(@RequestParam HashMap dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ ShapefileReader r = null; - String retStr = ""; + String retStr = ""; + String message = ""; try { //shapefileLoader @@ -356,6 +364,7 @@ public class AppMainController extends BaseController { if (!decompressZip.unZip(filePath, zipFile, filePath, type, projectCode)) { System.out.println("압축 해제 실패"); + message += "압축 해제 실패" + "\n"; } ShpFiles shpFile = new ShpFiles(shpFilePath+projectCode+".shp"); @@ -380,8 +389,10 @@ public class AppMainController extends BaseController { } catch (Exception e) { System.out.println("ERROR:"+e); retStr = "fail"; } - - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + json.put("message", retStr); + return json; }; //사업 생성 (직접입력) @@ -410,7 +421,7 @@ public class AppMainController extends BaseController { //사업 생성 저장 @RequestMapping(value = "/app/saup/insertSaupInfo.do") @ResponseBody - public String insertSaupInfo(@RequestParam HashMap params, HttpServletRequest request, HttpServletResponse response, ModelMap model) throws Exception{ + public JSONObject insertSaupInfo(@RequestParam HashMap params, HttpServletRequest request, HttpServletResponse response, ModelMap model) throws Exception{ String retStr = ""; try { @@ -502,7 +513,10 @@ public class AppMainController extends BaseController { }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //사업목록 검색 @@ -575,7 +589,7 @@ public class AppMainController extends BaseController { //사업 지역파일 삭제 (직접입력 저장) @RequestMapping(value = "/app/saup/deleteSaupInfoFile.do") @ResponseBody - public String deleteSaupInfoFile(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ + public JSONObject deleteSaupInfoFile(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ String retStr = ""; try { @@ -602,25 +616,29 @@ public class AppMainController extends BaseController { }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //사업지역 검증 @RequestMapping(value="/app/saup/areaValidation.do") @ResponseBody - public String saupAreaValidation(@RequestParam HashMap dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ + public JSONObject saupAreaValidation(@RequestParam HashMap dataParam, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ String retStr = ""; try { - AppMainService.updateSaupArea(dataParam); - - + AppMainService.updateSaupArea(dataParam); + retStr = "success"; } catch (Exception e) { System.out.println("ERROR:"+e); retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; }; //사업 시추공정보(직접입력) @@ -695,7 +713,7 @@ public class AppMainController extends BaseController { //시추공정보 저장 @RequestMapping(value = "/app/saup/insertHoleInfo.do") @ResponseBody - public String insertHoleInfo(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ + public JSONObject insertHoleInfo(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ String retStr = ""; try { ComCodeVO codeVO = new ComCodeVO(); @@ -812,7 +830,10 @@ public class AppMainController extends BaseController { }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //사업 지형지질정보(직접입력) @@ -1018,7 +1039,7 @@ public class AppMainController extends BaseController { //지층정보 저장 @RequestMapping(value="/app/saup/insertLayerInfo.do", method=RequestMethod.POST) - public @ResponseBody String insertLayerInfo(@RequestParam String CustomerInformationList, @RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ + public @ResponseBody JSONObject insertLayerInfo(@RequestParam String CustomerInformationList, @RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ String retStr = ""; @@ -1072,7 +1093,9 @@ public class AppMainController extends BaseController { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; }; @@ -1111,7 +1134,7 @@ public class AppMainController extends BaseController { //기본물성시험정보 저장 @RequestMapping(value="/app/saup/insertSampleInfo.do", method=RequestMethod.POST) @ResponseBody - public String insertSampleInfo(@RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ + public JSONObject insertSampleInfo(@RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ String retStr = ""; @@ -1199,13 +1222,15 @@ public class AppMainController extends BaseController { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; }; // 부정보 입력 전 주정보 저장여부 @RequestMapping(value="/app/com/confirmInfo.do", method=RequestMethod.POST) @ResponseBody - public String confirmInfo(@RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ + public JSONObject confirmInfo(@RequestParam HashMap params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ String retStr = ""; boolean testInfoYn = false; @@ -1232,20 +1257,25 @@ public class AppMainController extends BaseController { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; }; //엑셀업로드 내용 체크 @RequestMapping(value="/app/saup/excelValidation.do") @ResponseBody - public String excelValidation(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ + public JSONObject excelValidation(@RequestParam HashMap params, HttpServletRequest request, ModelMap model) throws Exception{ String retStr = ""; try { retStr = "success"; }catch(Exception e) { retStr = "fail"; } - return "{\"result\":\""+retStr+"\"}"; + + JSONObject json = new JSONObject(); + json.put("result", retStr); + return json; } //사업 시험항목정보(직접입력) diff --git a/src/main/java/sgis/com/web/BaseController.java b/src/main/java/sgis/com/web/BaseController.java index 989d92c..c64ce25 100644 --- a/src/main/java/sgis/com/web/BaseController.java +++ b/src/main/java/sgis/com/web/BaseController.java @@ -193,6 +193,16 @@ public class BaseController { String uri = request.getRequestURI(); String businessProcessCode = ""; + String businessCode = null; + if( params.get("businessCode") != null ) { + businessCode = String.valueOf(params.get("businessCode")); + + if( businessCode.trim().isEmpty() ) { + businessCode = null; + } + } + + model.put("selectedUrl", uri); if(!"new".equals(params.get("mode"))) { if(uri.contains("proj")) { @@ -200,15 +210,18 @@ public class BaseController { model.put("projectCode", params.get("projectCode")); }else { model.put("submenuGbn", "saup"); + EgovMap saupDetailInfo = null; + if( businessCode != null ) { + saupDetailInfo = AppMainService.selectAppSaupDetail(params); + businessProcessCode = (String) saupDetailInfo.get("businessProcessCode"); + businessProcessCode = StringUtil.nullToBlank(businessProcessCode); - EgovMap saupDetailInfo = AppMainService.selectAppSaupDetail(params); - businessProcessCode = (String) saupDetailInfo.get("businessProcessCode"); - businessProcessCode = StringUtil.nullToBlank(businessProcessCode); - //시공정보 - if(!businessProcessCode.isEmpty() && "2".equals((businessProcessCode).substring(0, 1)) ) { - EgovMap constItemsInfo = AppMainService.selectConstItemsInfo(params); - model.put("constItemsInfo", constItemsInfo); + //시공정보 + if(!businessProcessCode.isEmpty() && "2".equals((businessProcessCode).substring(0, 1)) ) { + EgovMap constItemsInfo = AppMainService.selectConstItemsInfo(params); + model.put("constItemsInfo", constItemsInfo); + } } //TODO : 폴더 class에 필수값 데이터가있으면 check 붙이기 diff --git a/src/main/java/sgis/com/web/DecompressZip.java b/src/main/java/sgis/com/web/DecompressZip.java index 59ff9c2..83dfc1c 100644 --- a/src/main/java/sgis/com/web/DecompressZip.java +++ b/src/main/java/sgis/com/web/DecompressZip.java @@ -1,196 +1,154 @@ package sgis.com.web; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.nio.charset.Charset; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; + +// Apache Commons Compress 라이브러리 임포트 +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; +import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; /** - * @FileName : DecompressZip.java - * @Date : 2022. 5. 18. - * @Creator : ICTWAY KIM YOON SU - * @Discription : - */ + * @FileName : DecompressZip.java + * @Date : 2022. 5. 18. + * @Creator : ICTWAY KIM YOON SU + * @Discription : Apache Commons Compress를 이용한 압축 해제 (호환성 강화) + */ public class DecompressZip { - /** - * 압축 해제 진행 == GOGO ==! - * @param zipPath - * @param zipFileName - * @param zipUnzipPath - * @return 파일 압축 해제 성공 여부 - * @throws Exception - */ - public boolean unZip(String zipPath, String zipFileName, String zipUnzipPath, String type , String projectCode) throws Exception { - System.out.println(" unZip() - zipPath : "+zipPath); //압축 파일 위치 - System.out.println(" unZip() - zipFileName : "+zipFileName); //압축파일 이름 - System.out.println(" unZip() - zipUnzipPath : "+zipUnzipPath); //압축이 해제될 위치 + /** + * 압축 해제 진행 + * @return 파일 압축 해제 성공 여부 + */ + public boolean unZip(String zipPath, String zipFileName, String zipUnzipPath, String type , String projectCode) throws Exception { - //파일 압축 해제 성공 여부 - boolean isChk = false; + System.out.println(" unZip() - zipPath : "+zipPath); + System.out.println(" unZip() - zipFileName : "+zipFileName); + System.out.println(" unZip() - zipUnzipPath : "+zipUnzipPath); - //압축 해재할 파일의 type(.zip or .tar) 제거 - zipUnzipPath = zipUnzipPath + zipFileName.replace(type, ""); + boolean isChk = false; - //zip 파일 - File zipFile = new File(zipPath + zipFileName); - FileInputStream fis = null; - ZipInputStream zis = null; - ZipEntry zipentry = null; + //압축 해제할 폴더 경로 설정 + zipUnzipPath = zipUnzipPath + zipFileName.replace(type, ""); - try { + File zipFile = new File(zipPath + zipFileName); + FileInputStream fis = null; + ZipArchiveInputStream zis = null; - //zipFileName을 통해서 폴더 생성 - if (makeFolder(zipUnzipPath)) { - System.out.println(" --- 폴더를 생성 프로세스 완료 "); - } + try { + // 폴더 생성 + if (makeFolder(zipUnzipPath)) { + System.out.println(" --- 폴더 생성 프로세스 완료 "); + } - fis = new FileInputStream(zipFile); //파일 스트림 - zis = new ZipInputStream(fis, Charset.forName("EUC-KR")); //Zip 파일 스트림 + fis = new FileInputStream(zipFile); - //압축되어 있는 ZIP 파일의 목록 조회 - while ((zipentry = zis.getNextEntry()) != null) { - String fileName = zipentry.getName(); - String ext = fileName.substring(fileName.lastIndexOf(".") + 1); + // ZipArchiveInputStream 생성 + // 파라미터: (InputStream, 인코딩, useUnicodeExtraFields, allowStoredEntriesWithDataDescriptor) + // allowStoredEntriesWithDataDescriptor = true : 첫 번째 발생했던 에러(invalid entry size)를 해결하는 핵심 옵션입니다. + zis = new ZipArchiveInputStream(new BufferedInputStream(fis), "EUC-KR", true, true); - fileName = projectCode + "." + ext; - System.out.println("filename(zipentry.getName()) => " + fileName); + ZipArchiveEntry zipentry = null; - File file = new File(zipUnzipPath, fileName); + // 스트림 방식으로 압축 파일 순차 조회 (CEN 헤더 오류 회피) + while ((zipentry = zis.getNextZipEntry()) != null) { + String fileName = zipentry.getName(); - //entry가 디렉토리인지 파일인지 검색 - if (zipentry.isDirectory()) { + // 파일명 및 확장자 처리 + String ext = ""; + if(fileName.lastIndexOf(".") != -1) { + ext = fileName.substring(fileName.lastIndexOf(".") + 1); + fileName = projectCode + "." + ext; + } else { + fileName = projectCode; + } - //entry가 디렉토리일 경우 폴더 생성 - System.out.println(" --- zipentry가 디렉토리입니다."); - file.mkdirs(); + System.out.println("filename(zipentry.getName()) => " + fileName); - } else { + File file = new File(zipUnzipPath, fileName); - //entry가 파일일 경우 파일 생성 - System.out.println(" --- zipentry가 파일입니다."); + if (zipentry.isDirectory()) { + System.out.println(" --- zipentry가 디렉토리입니다."); + file.mkdirs(); + } else { + System.out.println(" --- zipentry가 파일입니다."); + try { + createFile(file, zis); + } catch (Throwable e) { + e.printStackTrace(); + } + } + } - try { - createFile(file, zis); + isChk = true; - } catch (Throwable e) { - e.printStackTrace(); - } - } - } + } catch (Exception e) { + e.printStackTrace(); + isChk = false; + } finally { + if (zis != null) { + try { + zis.close(); + } catch (IOException e) { + // ignore + } + } + if (fis != null) { + try { + fis.close(); + } catch (IOException e) { + // ignore + } + } + } - isChk = true; + return isChk; + } - } catch (Exception e) { - isChk = false; + private boolean makeFolder(String folder) throws Exception { + if (folder == null || folder.length() == 0) return false; + File file = new File(folder); + if (!file.exists()) { + file.mkdirs(); + } else { + // 필요 시 기존 폴더 삭제 로직 추가 (재귀 삭제 필요) + // 여기서는 기존 로직 유지 + file.delete(); + file.mkdirs(); + } + return true; + } - } finally { - if (zis != null) { - try { - zis.close(); - } catch (IOException e) { - throw e; - } - } - if (fis != null) { - try { - fis.close(); - } catch (IOException e) { - throw e; - } - } - } + // ZipArchiveInputStream을 그대로 받아서 처리 + private void createFile(File file, ZipArchiveInputStream zis) throws Exception { + File parentDir = new File(file.getParent()); + if (!parentDir.exists()) { + parentDir.mkdirs(); + } - return isChk; - - } - - - /** - * 폴더 디렉토리 체크 및 생성 - * @param folder - * @return - * @throws Exception - */ - private boolean makeFolder(String folder) throws Exception { - System.out.println(" makeFolder() - folder : "+folder); - - boolean result = false; - - if (folder.length() < 0) { - result = false; - } - - File file = new File(folder); - - //해당 디렉토리가 없을경우 디렉토리 생성 - try { - - //디렉토리 폴더 경로 체크 - if (!file.exists()) { - file.mkdirs(); //폴더 생성 - System.out.println(" makeFolder() --------- 폴더 생성 완료 ---------"); - } else { - System.out.println(" makeFolder() --------- 이미 폴더가 존재함 ---------"); - file.delete(); //폴더 삭제 - System.out.println(" makeFolder() --------- 기존 폴더를 삭제함 ---------"); - file.mkdirs(); //폴더 생성 - System.out.println(" makeFolder() --------- 폴더 생성 완료 ---------"); - } - result = true; - - } catch (Exception e) { - throw e; - } - - return result; - } - - - /** - * 파일 체크 및 생성 - * @param file - * @param zis - * @throws Exception - */ - private void createFile(File file, ZipInputStream zis) throws Exception { - System.out.println(" createFile() - file : "+file); - //디렉토리 확인 - File parentDir = new File(file.getParent()); - - //디렉토리 폴더 경로 체크 - if (!parentDir.exists()) { - parentDir.mkdirs(); - } - - FileOutputStream fos = null; //출력 스트림 - - //파일 스트림 선언 - try { - fos = new FileOutputStream(file); - byte[] buffer = new byte[256]; - int size = 0; - - //zip스트림으로부터 byte뽑아내기 - while ((size = zis.read(buffer)) > 0) { - fos.write(buffer, 0, size); //스트림 작성 - } - - } catch (Exception e) { - throw e; - - } finally { - if (fos != null) { - try { - fos.close(); - } catch (IOException e) { - throw e; - } - } - } - } -} + FileOutputStream fos = null; + try { + fos = new FileOutputStream(file); + byte[] buffer = new byte[2048]; + int size = 0; + // ZipArchiveInputStream은 ZipInputStream처럼 read()로 현재 엔트리의 데이터를 읽습니다. + while ((size = zis.read(buffer)) > 0) { + fos.write(buffer, 0, size); + } + } catch (Exception e) { + throw e; + } finally { + if (fos != null) { + try { + fos.close(); + } catch (IOException e) { + throw e; + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/egovframework/mapper/sgis/app/AppMainMapper.xml b/src/main/resources/egovframework/mapper/sgis/app/AppMainMapper.xml index 107bdf8..2a6d92b 100644 --- a/src/main/resources/egovframework/mapper/sgis/app/AppMainMapper.xml +++ b/src/main/resources/egovframework/mapper/sgis/app/AppMainMapper.xml @@ -103,10 +103,10 @@ A.PROJECT_CODE , A.PROJECT_NAME , A.PROJECT_DESC - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1 ) as PROJECT_HARBOR_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1 ) as PROJECT_ORDERING_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1 ) as PROJECT_AFFILIATED_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1 ) as PROJECT_EPSG_NAME , TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE , TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE , (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.PROJECT_INPUT_ID) AS USER_NM @@ -141,7 +141,6 @@ @@ -265,10 +264,10 @@ A.PROJECT_CODE , A.PROJECT_NAME , A.PROJECT_DESC - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1) as PROJECT_HARBOR_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1) as PROJECT_ORDERING_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1) as PROJECT_AFFILIATED_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1) as PROJECT_EPSG_NAME , A.PROJECT_HARBOR_CODE , A.PROJECT_ORDERING_CODE , A.PROJECT_AFFILIATED_CODE @@ -276,13 +275,13 @@ , A.PROJECT_AREA_FILE , TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE , TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE - , (select user_nm from comtb_user01 B where B.user_id = A.project_input_id) as USER_NM + , (select user_nm from comtb_user01 B where B.user_id = A.project_input_id LIMIT 1) as USER_NM , A.PROJECT_AREA_FILE , A.PROJECT_AREA_YN , ST_ASTEXT(ST_TRANSFORM(ST_SetSRID(A.PROJECT_AREA_GEOM, A.PROJECT_EPSG_CODE :: INTEGER),4326)) as PROJECT_AREA_GEOM - , (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_nm - , (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_strg_nm - , (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code) as saup_cnt + , (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_nm + , (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_strg_nm + , (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code LIMIT 1) as saup_cnt FROM APPTB_PROJ01 A WHERE 1=1 ]]> @@ -579,11 +578,11 @@ SELECT A.PROJECT_CODE , B.PROJECT_NAME - , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME + , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME , A.BUSINESS_CODE , A.BUSINESS_NAME - , (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val ) as BUSINESS_PROCESS_NAME - , (select user_nm from comtb_user01 where user_id = A.business_input_id) as INPUT_NAME + , (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val LIMIT 1) as BUSINESS_PROCESS_NAME + , (select user_nm from comtb_user01 where user_id = A.business_input_id LIMIT 1) as INPUT_NAME , to_char(A.SYS_REG_DT::DATE, 'yyyy-mm-dd') as INPUT_DATE FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE WHERE 1=1 @@ -619,19 +618,19 @@ SELECT A.PROJECT_CODE , B.PROJECT_NAME - , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME + , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME , A.BUSINESS_NAME , A.BUSINESS_CODE , A.BUSINESS_PROCESS_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val ) as BUSINESS_PROCESS_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val LIMIT 1) as BUSINESS_PROCESS_NAME , A.BUSINESS_CLASS_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val ) as BUSINESS_CLASS_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_NAME , A.BUSINESS_CLASS_DETAIL_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val ) as BUSINESS_CLASS_DETAIL_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_DETAIL_NAME , A.BUSINESS_FACILITIES_FORM_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val ) as BUSINESS_FACILITIES_FORM_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val LIMIT 1) as BUSINESS_FACILITIES_FORM_NAME , A.PROJECT_ORDERING_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val ) as PROJECT_ORDERING_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val LIMIT 1) as PROJECT_ORDERING_NAME , TO_CHAR(A.BUSINESS_START_DATE,'YYYY-MM-DD') AS BUSINESS_START_DATE , TO_CHAR(A.BUSINESS_END_DATE,'YYYY-MM-DD') AS BUSINESS_END_DATE , A.BUSINESS_SECTION_EXTENSION @@ -652,7 +651,7 @@ , A.BUSINESS_REPORT_SOURCE , A.BUSINESS_REPORT_FILE , A.BUSINESS_CONSTRUCTION_FILE - , (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID) as USER_NM + , (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID LIMIT 1) as USER_NM , A.BUSINESS_ZIP_NO , A.BUSINESS_ADDRESS , A.BUSINESS_ADDRESS_DETAIL @@ -662,12 +661,12 @@ , A.BUSINESS_AREA_SD_CODE , A.BUSINESS_AREA_SGG_CODE , A.BUSINESS_AREA_EMD_CODE - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME , A.BUSINESS_AREA_FILE - , (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_NM - , (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_STRG_NM + , (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_NM + , (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_STRG_NM , A.BUSINESS_AREA_YN FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE WHERE 1=1 @@ -689,15 +688,15 @@ B.PROJECT_CODE , B.BUSINESS_NAME , A.BUSINESS_CODE - , (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL ) AS BUSINESS_PROCESS_NAME + , (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL LIMIT 1) AS BUSINESS_PROCESS_NAME , A.HOLE_CODE , A.HOLE_NAME , A.HOLE_COORDINATE , A.HOLE_X , A.HOLE_Y - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME , B.BUSINESS_ADDRESS_DETAIL , A.HOLE_BORING_NAME , A.HOLE_PROSPECTER_NAME @@ -712,7 +711,7 @@ , A.HOLE_BORING_MACHINE , A.HOLE_BORING_METHOD , A.HOLE_BORING_DIRECTION - , (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID) AS USER_NM + , (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID LIMIT 1) AS USER_NM , TO_CHAR(A.SYS_REG_DT,'YYYY-MM-DD') AS SYS_REG_DT , A.HOLE_REMARK , ST_AsText(A.HOLE_POINT) AS HOLE_POINT @@ -744,7 +743,7 @@ + - SELECT - answer_id, - response_id, - question_id, - answer_text, - selected_option_id - FROM tb_answers - WHERE response_id = #{responseId, jdbcType=OTHER} + ANSWER_ID, + RESPONSE_ID, + QUESTION_ID, + ANSWER_TEXT, + SELECTED_OPTION_ID + FROM TBL_ANSWERS + WHERE RESPONSE_ID = #{_parameter, jdbcType=VARCHAR} - SELECT - answer_id, - response_id, - question_id, - answer_text, - selected_option_id - FROM tb_answers - WHERE question_id = #{questionId, jdbcType=OTHER} + ANSWER_ID, + RESPONSE_ID, + QUESTION_ID, + ANSWER_TEXT, + SELECTED_OPTION_ID + FROM TBL_ANSWERS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} - UPDATE tb_answers + UPDATE TBL_ANSWERS SET - answer_text = #{answerText}, - selected_option_id = #{selectedOptionId, jdbcType=OTHER} - WHERE answer_id = #{answerId, jdbcType=OTHER} + ANSWER_TEXT = #{answerText, jdbcType=CLOB}, + SELECTED_OPTION_ID = #{selectedOptionId, jdbcType=VARCHAR} + WHERE ANSWER_ID = #{answerId, jdbcType=VARCHAR} - - DELETE FROM tb_answers - WHERE answer_id = #{answerId, jdbcType=OTHER} + + DELETE FROM TBL_ANSWERS + WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR} - \ No newline at end of file + diff --git a/src/main/resources/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml b/src/main/resources/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml index d44eb5e..13fd17f 100644 --- a/src/main/resources/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml +++ b/src/main/resources/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml @@ -3,48 +3,48 @@ - - + + - INSERT INTO tb_answer_selected_options ( - answer_id, - option_id + INSERT INTO TBL_ANSWER_SELECTED_OPTIONS ( + ANSWER_ID, + OPTION_ID ) VALUES ( - #{answerId, jdbcType=OTHER}, - #{optionId, jdbcType=OTHER} + #{answerId, jdbcType=VARCHAR}, + #{optionId, jdbcType=VARCHAR} ) - INSERT INTO tb_answer_selected_options ( - answer_id, - option_id - ) VALUES - - ( - #{item.answerId, jdbcType=OTHER}, - #{item.optionId, jdbcType=OTHER} + INSERT INTO TBL_ANSWER_SELECTED_OPTIONS ( + ANSWER_ID, + OPTION_ID ) + + SELECT + #{item.answerId, jdbcType=VARCHAR}, + #{item.optionId, jdbcType=VARCHAR} + FROM dual - SELECT - answer_id, - option_id - FROM tb_answer_selected_options - WHERE answer_id = #{answerId, jdbcType=OTHER} + ANSWER_ID, + OPTION_ID + FROM TBL_ANSWER_SELECTED_OPTIONS + WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR} - - DELETE FROM tb_answer_selected_options - WHERE answer_id = #{answerId, jdbcType=OTHER} + + DELETE FROM TBL_ANSWER_SELECTED_OPTIONS + WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR} - - DELETE FROM tb_answer_selected_options - WHERE answer_id = #{param1, jdbcType=OTHER} AND option_id = #{param2, jdbcType=OTHER} + + DELETE FROM TBL_ANSWER_SELECTED_OPTIONS + WHERE ANSWER_ID = #{param1, jdbcType=VARCHAR} AND OPTION_ID = #{param2, jdbcType=VARCHAR} - \ No newline at end of file + diff --git a/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml b/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml index 9b3dbb8..19ca5e1 100644 --- a/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml +++ b/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml @@ -3,70 +3,70 @@ - - - - - - + + + + + + - INSERT INTO tb_questions ( - question_id, - survey_id, - question_text, - question_type, - question_order, - is_required + INSERT INTO TBL_QUESTIONS ( + QUESTION_ID, + SURVEY_ID, + QUESTION_TEXT, + QUESTION_TYPE, + QUESTION_ORDER, + IS_REQUIRED ) VALUES ( - CAST(#{questionId, jdbcType=OTHER} AS uuid), - CAST(#{surveyId, jdbcType=OTHER} AS uuid), - #{questionText}, - #{questionType}, - #{questionOrder}, - #{isRequired} + #{questionId, jdbcType=VARCHAR}, + #{surveyId, jdbcType=VARCHAR}, + #{questionText, jdbcType=CLOB}, + #{questionType, jdbcType=VARCHAR}, + #{questionOrder, jdbcType=INTEGER}, + #{isRequired, jdbcType=INTEGER} ) - SELECT - question_id, - survey_id, - question_text, - question_type, - question_order, - is_required - FROM tb_questions - WHERE survey_id = CAST(#{surveyId, jdbcType=OTHER} AS uuid) - ORDER BY question_order ASC + QUESTION_ID, + SURVEY_ID, + QUESTION_TEXT, + QUESTION_TYPE, + QUESTION_ORDER, + IS_REQUIRED + FROM TBL_QUESTIONS + WHERE SURVEY_ID = #{_parameter, jdbcType=VARCHAR} + ORDER BY QUESTION_ORDER ASC - SELECT - question_id, - survey_id, - question_text, - question_type, - question_order, - is_required - FROM tb_questions - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) + QUESTION_ID, + SURVEY_ID, + QUESTION_TEXT, + QUESTION_TYPE, + QUESTION_ORDER, + IS_REQUIRED + FROM TBL_QUESTIONS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} - UPDATE tb_questions + UPDATE TBL_QUESTIONS SET - question_text = #{questionText}, - question_type = #{questionType}, - question_order = #{questionOrder}, - is_required = #{isRequired} - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) + QUESTION_TEXT = #{questionText, jdbcType=CLOB}, + QUESTION_TYPE = #{questionType, jdbcType=VARCHAR}, + QUESTION_ORDER = #{questionOrder, jdbcType=INTEGER}, + IS_REQUIRED = #{isRequired, jdbcType=INTEGER} + WHERE QUESTION_ID = #{questionId, jdbcType=VARCHAR} - - DELETE FROM tb_questions - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) + + DELETE FROM TBL_QUESTIONS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} - \ No newline at end of file + diff --git a/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml b/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml index b8ad464..7c3d24d 100644 --- a/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml +++ b/src/main/resources/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml @@ -3,58 +3,58 @@ - - - - + + + + - INSERT INTO tb_question_options ( - option_id, - question_id, - option_text, - option_order + INSERT INTO TBL_QUESTION_OPTIONS ( + OPTION_ID, + QUESTION_ID, + OPTION_TEXT, + OPTION_ORDER ) VALUES ( - CAST(#{optionId, jdbcType=OTHER} AS uuid), - CAST(#{questionId, jdbcType=OTHER} AS uuid), - #{optionText}, - #{optionOrder} + #{optionId, jdbcType=VARCHAR}, + #{questionId, jdbcType=VARCHAR}, + #{optionText, jdbcType=VARCHAR}, + #{optionOrder, jdbcType=INTEGER} ) - SELECT - option_id, - question_id, - option_text, - option_order - FROM tb_question_options - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) - ORDER BY option_order ASC + OPTION_ID, + QUESTION_ID, + OPTION_TEXT, + OPTION_ORDER + FROM TBL_QUESTION_OPTIONS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} + ORDER BY OPTION_ORDER ASC - SELECT - option_id, - question_id, - option_text, - option_order - FROM tb_question_options - WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid) + OPTION_ID, + QUESTION_ID, + OPTION_TEXT, + OPTION_ORDER + FROM TBL_QUESTION_OPTIONS + WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR} - UPDATE tb_question_options + UPDATE TBL_QUESTION_OPTIONS SET - option_text = #{optionText}, - option_order = #{optionOrder} - WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid) + OPTION_TEXT = #{optionText, jdbcType=VARCHAR}, + OPTION_ORDER = #{optionOrder, jdbcType=INTEGER} + WHERE OPTION_ID = #{optionId, jdbcType=VARCHAR} - - DELETE FROM tb_question_options - WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid) + + DELETE FROM TBL_QUESTION_OPTIONS + WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR} diff --git a/src/main/webapp/WEB-INF/jsp/sgis/app/proj/inputForm.jsp b/src/main/webapp/WEB-INF/jsp/sgis/app/proj/inputForm.jsp index 8b19728..f0d883c 100644 --- a/src/main/webapp/WEB-INF/jsp/sgis/app/proj/inputForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/sgis/app/proj/inputForm.jsp @@ -216,7 +216,6 @@ function selectComboList(class_name, data, selected_data){ } function go_save(){ - debugger; var upload = $("#fileUpload1").data("kendoUpload"); var upCnt = upload.getFiles().length diff --git a/src/main/webapp/WEB-INF/jsp/sgis/popup/cordinateSaupMap.jsp b/src/main/webapp/WEB-INF/jsp/sgis/popup/cordinateSaupMap.jsp index 2b65740..a0cd52d 100644 --- a/src/main/webapp/WEB-INF/jsp/sgis/popup/cordinateSaupMap.jsp +++ b/src/main/webapp/WEB-INF/jsp/sgis/popup/cordinateSaupMap.jsp @@ -219,7 +219,7 @@ function drawPolygon(){ function goSave(){ let businessCode = ''; - + debugger; $.ajax({ url: "", type : "post", diff --git a/target/classes/egovframework/com/cmm/AltibaseClobStringTypeHandler.class b/target/classes/egovframework/com/cmm/AltibaseClobStringTypeHandler.class index 41715ec..63f79c5 100644 Binary files a/target/classes/egovframework/com/cmm/AltibaseClobStringTypeHandler.class and b/target/classes/egovframework/com/cmm/AltibaseClobStringTypeHandler.class differ diff --git a/target/classes/egovframework/com/cmm/EgovComCrossSiteHndlr.class b/target/classes/egovframework/com/cmm/EgovComCrossSiteHndlr.class index c5feba2..a3462b0 100644 Binary files a/target/classes/egovframework/com/cmm/EgovComCrossSiteHndlr.class and b/target/classes/egovframework/com/cmm/EgovComCrossSiteHndlr.class differ diff --git a/target/classes/egovframework/com/cmm/EgovComExcepHndlr.class b/target/classes/egovframework/com/cmm/EgovComExcepHndlr.class index 4f1d8dd..0bb3ed2 100644 Binary files a/target/classes/egovframework/com/cmm/EgovComExcepHndlr.class and b/target/classes/egovframework/com/cmm/EgovComExcepHndlr.class differ diff --git a/target/classes/egovframework/com/cmm/EgovComOthersExcepHndlr.class b/target/classes/egovframework/com/cmm/EgovComOthersExcepHndlr.class index 4116d68..8e229f1 100644 Binary files a/target/classes/egovframework/com/cmm/EgovComOthersExcepHndlr.class and b/target/classes/egovframework/com/cmm/EgovComOthersExcepHndlr.class differ diff --git a/target/classes/egovframework/com/cmm/EgovComTraceHandler.class b/target/classes/egovframework/com/cmm/EgovComTraceHandler.class index 455e7c8..61cadba 100644 Binary files a/target/classes/egovframework/com/cmm/EgovComTraceHandler.class and b/target/classes/egovframework/com/cmm/EgovComTraceHandler.class differ diff --git a/target/classes/egovframework/com/cmm/EgovComponentChecker.class b/target/classes/egovframework/com/cmm/EgovComponentChecker.class index b599b98..a7903f3 100644 Binary files a/target/classes/egovframework/com/cmm/EgovComponentChecker.class and b/target/classes/egovframework/com/cmm/EgovComponentChecker.class differ diff --git a/target/classes/egovframework/com/cmm/EgovMessageSource.class b/target/classes/egovframework/com/cmm/EgovMessageSource.class index b32ac43..6e74f0d 100644 Binary files a/target/classes/egovframework/com/cmm/EgovMessageSource.class and b/target/classes/egovframework/com/cmm/EgovMessageSource.class differ diff --git a/target/classes/egovframework/com/cmm/ImagePaginationRenderer.class b/target/classes/egovframework/com/cmm/ImagePaginationRenderer.class index 3f7ae3d..8444e1a 100644 Binary files a/target/classes/egovframework/com/cmm/ImagePaginationRenderer.class and b/target/classes/egovframework/com/cmm/ImagePaginationRenderer.class differ diff --git a/target/classes/egovframework/com/cmm/annotation/IncludedInfo.class b/target/classes/egovframework/com/cmm/annotation/IncludedInfo.class index cd955b6..c47c7e6 100644 Binary files a/target/classes/egovframework/com/cmm/annotation/IncludedInfo.class and b/target/classes/egovframework/com/cmm/annotation/IncludedInfo.class differ diff --git a/target/classes/egovframework/com/cmm/annotation/Mapper1.class b/target/classes/egovframework/com/cmm/annotation/Mapper1.class index c85f8dd..b6f26c3 100644 Binary files a/target/classes/egovframework/com/cmm/annotation/Mapper1.class and b/target/classes/egovframework/com/cmm/annotation/Mapper1.class differ diff --git a/target/classes/egovframework/com/cmm/annotation/Mapper2.class b/target/classes/egovframework/com/cmm/annotation/Mapper2.class index 0e99ab6..d58ad6c 100644 Binary files a/target/classes/egovframework/com/cmm/annotation/Mapper2.class and b/target/classes/egovframework/com/cmm/annotation/Mapper2.class differ diff --git a/target/classes/egovframework/com/cmm/filter/HTMLTagFilter.class b/target/classes/egovframework/com/cmm/filter/HTMLTagFilter.class index db0d129..0a72ad0 100644 Binary files a/target/classes/egovframework/com/cmm/filter/HTMLTagFilter.class and b/target/classes/egovframework/com/cmm/filter/HTMLTagFilter.class differ diff --git a/target/classes/egovframework/com/cmm/filter/HTMLTagFilterRequestWrapper.class b/target/classes/egovframework/com/cmm/filter/HTMLTagFilterRequestWrapper.class index 41fa80a..a50cd72 100644 Binary files a/target/classes/egovframework/com/cmm/filter/HTMLTagFilterRequestWrapper.class and b/target/classes/egovframework/com/cmm/filter/HTMLTagFilterRequestWrapper.class differ diff --git a/target/classes/egovframework/com/cmm/interceptor/AuthenticInterceptor.class b/target/classes/egovframework/com/cmm/interceptor/AuthenticInterceptor.class index c577342..621569d 100644 Binary files a/target/classes/egovframework/com/cmm/interceptor/AuthenticInterceptor.class and b/target/classes/egovframework/com/cmm/interceptor/AuthenticInterceptor.class differ diff --git a/target/classes/egovframework/com/cmm/interceptor/LoginInterceptor.class b/target/classes/egovframework/com/cmm/interceptor/LoginInterceptor.class index 8c4f4b6..73fc7a7 100644 Binary files a/target/classes/egovframework/com/cmm/interceptor/LoginInterceptor.class and b/target/classes/egovframework/com/cmm/interceptor/LoginInterceptor.class differ diff --git a/target/classes/egovframework/com/cmm/interceptor/SessionExpiredException.class b/target/classes/egovframework/com/cmm/interceptor/SessionExpiredException.class index 777fd9e..b805e02 100644 Binary files a/target/classes/egovframework/com/cmm/interceptor/SessionExpiredException.class and b/target/classes/egovframework/com/cmm/interceptor/SessionExpiredException.class differ diff --git a/target/classes/egovframework/com/cmm/interceptor/noLoginInterceptor.class b/target/classes/egovframework/com/cmm/interceptor/noLoginInterceptor.class index 4695822..e5fc88c 100644 Binary files a/target/classes/egovframework/com/cmm/interceptor/noLoginInterceptor.class and b/target/classes/egovframework/com/cmm/interceptor/noLoginInterceptor.class differ diff --git a/target/classes/egovframework/com/cmm/properties/PropertiesConfig.class b/target/classes/egovframework/com/cmm/properties/PropertiesConfig.class index 94a7455..dcde294 100644 Binary files a/target/classes/egovframework/com/cmm/properties/PropertiesConfig.class and b/target/classes/egovframework/com/cmm/properties/PropertiesConfig.class differ diff --git a/target/classes/egovframework/com/cmm/service/CmmnDetailCode.class b/target/classes/egovframework/com/cmm/service/CmmnDetailCode.class index 19af709..c457023 100644 Binary files a/target/classes/egovframework/com/cmm/service/CmmnDetailCode.class and b/target/classes/egovframework/com/cmm/service/CmmnDetailCode.class differ diff --git a/target/classes/egovframework/com/cmm/service/ComDefaultCodeVO.class b/target/classes/egovframework/com/cmm/service/ComDefaultCodeVO.class index c3dc0f9..cb28691 100644 Binary files a/target/classes/egovframework/com/cmm/service/ComDefaultCodeVO.class and b/target/classes/egovframework/com/cmm/service/ComDefaultCodeVO.class differ diff --git a/target/classes/egovframework/com/cmm/service/ComDefaultVO.class b/target/classes/egovframework/com/cmm/service/ComDefaultVO.class index e7073c2..90f4f41 100644 Binary files a/target/classes/egovframework/com/cmm/service/ComDefaultVO.class and b/target/classes/egovframework/com/cmm/service/ComDefaultVO.class differ diff --git a/target/classes/egovframework/com/cmm/service/EgovProperties.class b/target/classes/egovframework/com/cmm/service/EgovProperties.class index b34630e..770ce7c 100644 Binary files a/target/classes/egovframework/com/cmm/service/EgovProperties.class and b/target/classes/egovframework/com/cmm/service/EgovProperties.class differ diff --git a/target/classes/egovframework/com/cmm/service/EgovUserDetailsService.class b/target/classes/egovframework/com/cmm/service/EgovUserDetailsService.class index 6f0219e..8e581cf 100644 Binary files a/target/classes/egovframework/com/cmm/service/EgovUserDetailsService.class and b/target/classes/egovframework/com/cmm/service/EgovUserDetailsService.class differ diff --git a/target/classes/egovframework/com/cmm/service/Globals.class b/target/classes/egovframework/com/cmm/service/Globals.class index 1743402..96d2e72 100644 Binary files a/target/classes/egovframework/com/cmm/service/Globals.class and b/target/classes/egovframework/com/cmm/service/Globals.class differ diff --git a/target/classes/egovframework/com/cmm/service/IncludedCompInfoVO.class b/target/classes/egovframework/com/cmm/service/IncludedCompInfoVO.class index aaf33da..7c7e74d 100644 Binary files a/target/classes/egovframework/com/cmm/service/IncludedCompInfoVO.class and b/target/classes/egovframework/com/cmm/service/IncludedCompInfoVO.class differ diff --git a/target/classes/egovframework/com/cmm/service/impl/DB1AbstractDAO.class b/target/classes/egovframework/com/cmm/service/impl/DB1AbstractDAO.class index 2c7173f..60b9588 100644 Binary files a/target/classes/egovframework/com/cmm/service/impl/DB1AbstractDAO.class and b/target/classes/egovframework/com/cmm/service/impl/DB1AbstractDAO.class differ diff --git a/target/classes/egovframework/com/cmm/service/impl/DB2AbstractDAO.class b/target/classes/egovframework/com/cmm/service/impl/DB2AbstractDAO.class index 29d0c70..a0036d2 100644 Binary files a/target/classes/egovframework/com/cmm/service/impl/DB2AbstractDAO.class and b/target/classes/egovframework/com/cmm/service/impl/DB2AbstractDAO.class differ diff --git a/target/classes/egovframework/com/cmm/service/impl/EgovComAbstractDAO.class b/target/classes/egovframework/com/cmm/service/impl/EgovComAbstractDAO.class index 20aea78..bffabe7 100644 Binary files a/target/classes/egovframework/com/cmm/service/impl/EgovComAbstractDAO.class and b/target/classes/egovframework/com/cmm/service/impl/EgovComAbstractDAO.class differ diff --git a/target/classes/egovframework/com/cmm/service/impl/EgovTestUserDetailsServiceImpl.class b/target/classes/egovframework/com/cmm/service/impl/EgovTestUserDetailsServiceImpl.class index 6574de8..3b23836 100644 Binary files a/target/classes/egovframework/com/cmm/service/impl/EgovTestUserDetailsServiceImpl.class and b/target/classes/egovframework/com/cmm/service/impl/EgovTestUserDetailsServiceImpl.class differ diff --git a/target/classes/egovframework/com/cmm/service/impl/EgovUserDetailsSessionServiceImpl.class b/target/classes/egovframework/com/cmm/service/impl/EgovUserDetailsSessionServiceImpl.class index c09e27c..35101fc 100644 Binary files a/target/classes/egovframework/com/cmm/service/impl/EgovUserDetailsSessionServiceImpl.class and b/target/classes/egovframework/com/cmm/service/impl/EgovUserDetailsSessionServiceImpl.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovBasicLogger.class b/target/classes/egovframework/com/cmm/util/EgovBasicLogger.class index 17f65cf..ae01e8a 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovBasicLogger.class and b/target/classes/egovframework/com/cmm/util/EgovBasicLogger.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovDateFormat.class b/target/classes/egovframework/com/cmm/util/EgovDateFormat.class index 9ea85e4..e717740 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovDateFormat.class and b/target/classes/egovframework/com/cmm/util/EgovDateFormat.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovDateUtil.class b/target/classes/egovframework/com/cmm/util/EgovDateUtil.class index a588cce..2994931 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovDateUtil.class and b/target/classes/egovframework/com/cmm/util/EgovDateUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovDoubleSubmitHelper.class b/target/classes/egovframework/com/cmm/util/EgovDoubleSubmitHelper.class index 19d5bb6..6304e41 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovDoubleSubmitHelper.class and b/target/classes/egovframework/com/cmm/util/EgovDoubleSubmitHelper.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil$CallbackHandler.class b/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil$CallbackHandler.class index 56eb66d..5cec2e1 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil$CallbackHandler.class and b/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil$CallbackHandler.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil.class b/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil.class index cdd4ed6..76b95b7 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil.class and b/target/classes/egovframework/com/cmm/util/EgovEhgtCalcUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovFileScrty.class b/target/classes/egovframework/com/cmm/util/EgovFileScrty.class index 38cafad..897f5d4 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovFileScrty.class and b/target/classes/egovframework/com/cmm/util/EgovFileScrty.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovFileUploadUtil.class b/target/classes/egovframework/com/cmm/util/EgovFileUploadUtil.class index f8922ba..2e852aa 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovFileUploadUtil.class and b/target/classes/egovframework/com/cmm/util/EgovFileUploadUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovFormBasedFileUtil.class b/target/classes/egovframework/com/cmm/util/EgovFormBasedFileUtil.class index f6dc812..e0c54fd 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovFormBasedFileUtil.class and b/target/classes/egovframework/com/cmm/util/EgovFormBasedFileUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovFormBasedFileVo.class b/target/classes/egovframework/com/cmm/util/EgovFormBasedFileVo.class index 5403900..b81630b 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovFormBasedFileVo.class and b/target/classes/egovframework/com/cmm/util/EgovFormBasedFileVo.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovFormBasedUUID.class b/target/classes/egovframework/com/cmm/util/EgovFormBasedUUID.class index 1e90131..38f7b81 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovFormBasedUUID.class and b/target/classes/egovframework/com/cmm/util/EgovFormBasedUUID.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovFormatCheckUtil.class b/target/classes/egovframework/com/cmm/util/EgovFormatCheckUtil.class index 0110a19..e9767e3 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovFormatCheckUtil.class and b/target/classes/egovframework/com/cmm/util/EgovFormatCheckUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovHttpRequestHelper.class b/target/classes/egovframework/com/cmm/util/EgovHttpRequestHelper.class index 6b54708..8d5e836 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovHttpRequestHelper.class and b/target/classes/egovframework/com/cmm/util/EgovHttpRequestHelper.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovMessageUtil.class b/target/classes/egovframework/com/cmm/util/EgovMessageUtil.class index 7792340..1cc5571 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovMessageUtil.class and b/target/classes/egovframework/com/cmm/util/EgovMessageUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovMybaitsUtil.class b/target/classes/egovframework/com/cmm/util/EgovMybaitsUtil.class index 9b76dc4..1d7ed9e 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovMybaitsUtil.class and b/target/classes/egovframework/com/cmm/util/EgovMybaitsUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovNumberCheckUtil.class b/target/classes/egovframework/com/cmm/util/EgovNumberCheckUtil.class index b3846c9..5514b18 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovNumberCheckUtil.class and b/target/classes/egovframework/com/cmm/util/EgovNumberCheckUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovNumberFormat.class b/target/classes/egovframework/com/cmm/util/EgovNumberFormat.class index b73ea12..2dc0d5e 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovNumberFormat.class and b/target/classes/egovframework/com/cmm/util/EgovNumberFormat.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovNumberUtil.class b/target/classes/egovframework/com/cmm/util/EgovNumberUtil.class index ce41a6a..de4978c 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovNumberUtil.class and b/target/classes/egovframework/com/cmm/util/EgovNumberUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovResourceCloseHelper.class b/target/classes/egovframework/com/cmm/util/EgovResourceCloseHelper.class index 2618780..992a56c 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovResourceCloseHelper.class and b/target/classes/egovframework/com/cmm/util/EgovResourceCloseHelper.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovSessionCookieUtil.class b/target/classes/egovframework/com/cmm/util/EgovSessionCookieUtil.class index d53f1e2..54b96d0 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovSessionCookieUtil.class and b/target/classes/egovframework/com/cmm/util/EgovSessionCookieUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovStringUtil.class b/target/classes/egovframework/com/cmm/util/EgovStringUtil.class index fdfaad9..dc3780a 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovStringUtil.class and b/target/classes/egovframework/com/cmm/util/EgovStringUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovUnitCalcUtil.class b/target/classes/egovframework/com/cmm/util/EgovUnitCalcUtil.class index 4e2b1bc..fa9abb7 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovUnitCalcUtil.class and b/target/classes/egovframework/com/cmm/util/EgovUnitCalcUtil.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovUrlRewriteFilter.class b/target/classes/egovframework/com/cmm/util/EgovUrlRewriteFilter.class index 124a43a..8e8551d 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovUrlRewriteFilter.class and b/target/classes/egovframework/com/cmm/util/EgovUrlRewriteFilter.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovUserDetailsHelper.class b/target/classes/egovframework/com/cmm/util/EgovUserDetailsHelper.class index 939421f..a6f68f3 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovUserDetailsHelper.class and b/target/classes/egovframework/com/cmm/util/EgovUserDetailsHelper.class differ diff --git a/target/classes/egovframework/com/cmm/util/EgovWebUtil.class b/target/classes/egovframework/com/cmm/util/EgovWebUtil.class index f360352..bde4d6c 100644 Binary files a/target/classes/egovframework/com/cmm/util/EgovWebUtil.class and b/target/classes/egovframework/com/cmm/util/EgovWebUtil.class differ diff --git a/target/classes/egovframework/com/cmm/web/EgovBindingInitializer.class b/target/classes/egovframework/com/cmm/web/EgovBindingInitializer.class index 26ff89e..3ac33fc 100644 Binary files a/target/classes/egovframework/com/cmm/web/EgovBindingInitializer.class and b/target/classes/egovframework/com/cmm/web/EgovBindingInitializer.class differ diff --git a/target/classes/egovframework/com/cmm/web/EgovComUtlController.class b/target/classes/egovframework/com/cmm/web/EgovComUtlController.class index c62232d..323407c 100644 Binary files a/target/classes/egovframework/com/cmm/web/EgovComUtlController.class and b/target/classes/egovframework/com/cmm/web/EgovComUtlController.class differ diff --git a/target/classes/egovframework/com/cmm/web/EgovMultipartResolver.class b/target/classes/egovframework/com/cmm/web/EgovMultipartResolver.class index 51ef52c..69eca07 100644 Binary files a/target/classes/egovframework/com/cmm/web/EgovMultipartResolver.class and b/target/classes/egovframework/com/cmm/web/EgovMultipartResolver.class differ diff --git a/target/classes/egovframework/mapper/sgis/app/AppMainMapper.xml b/target/classes/egovframework/mapper/sgis/app/AppMainMapper.xml index 107bdf8..2a6d92b 100644 --- a/target/classes/egovframework/mapper/sgis/app/AppMainMapper.xml +++ b/target/classes/egovframework/mapper/sgis/app/AppMainMapper.xml @@ -103,10 +103,10 @@ A.PROJECT_CODE , A.PROJECT_NAME , A.PROJECT_DESC - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1 ) as PROJECT_HARBOR_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1 ) as PROJECT_ORDERING_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1 ) as PROJECT_AFFILIATED_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1 ) as PROJECT_EPSG_NAME , TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE , TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE , (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.PROJECT_INPUT_ID) AS USER_NM @@ -141,7 +141,6 @@ @@ -265,10 +264,10 @@ A.PROJECT_CODE , A.PROJECT_NAME , A.PROJECT_DESC - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val ) as PROJECT_HARBOR_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val ) as PROJECT_ORDERING_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val ) as PROJECT_AFFILIATED_NAME - , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val ) as PROJECT_EPSG_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_harbor_code' AND A.PROJECT_HARBOR_CODE = B.code_val LIMIT 1) as PROJECT_HARBOR_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_ordering_code' AND A.PROJECt_ORDERING_CODE = B.code_val LIMIT 1) as PROJECT_ORDERING_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_affiliated_code' AND A.PROJECT_AFFILIATED_CODE = B.code_val LIMIT 1) as PROJECT_AFFILIATED_NAME + , (select B.code_txt from comtb_code02 B where B.cd_grp = 'project_epsg_code' AND A.PROJECT_EPSG_CODE = B.code_val LIMIT 1) as PROJECT_EPSG_NAME , A.PROJECT_HARBOR_CODE , A.PROJECT_ORDERING_CODE , A.PROJECT_AFFILIATED_CODE @@ -276,13 +275,13 @@ , A.PROJECT_AREA_FILE , TO_CHAR(A.PROJECT_START_DATE,'YYYY-MM-DD') AS PROJECT_START_DATE , TO_CHAR(A.PROJECT_END_DATE,'YYYY-MM-DD') AS PROJECT_END_DATE - , (select user_nm from comtb_user01 B where B.user_id = A.project_input_id) as USER_NM + , (select user_nm from comtb_user01 B where B.user_id = A.project_input_id LIMIT 1) as USER_NM , A.PROJECT_AREA_FILE , A.PROJECT_AREA_YN , ST_ASTEXT(ST_TRANSFORM(ST_SetSRID(A.PROJECT_AREA_GEOM, A.PROJECT_EPSG_CODE :: INTEGER),4326)) as PROJECT_AREA_GEOM - , (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_nm - , (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file) as file_strg_nm - , (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code) as saup_cnt + , (select file_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_nm + , (select file_strg_nm from comtb_file01 B where cast(B.file_no as varchar) = A.project_area_file LIMIT 1) as file_strg_nm + , (select count(*) from APPTB_SAUP01 C where A.project_code = C.project_code LIMIT 1) as saup_cnt FROM APPTB_PROJ01 A WHERE 1=1 ]]> @@ -579,11 +578,11 @@ SELECT A.PROJECT_CODE , B.PROJECT_NAME - , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME + , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME , A.BUSINESS_CODE , A.BUSINESS_NAME - , (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val ) as BUSINESS_PROCESS_NAME - , (select user_nm from comtb_user01 where user_id = A.business_input_id) as INPUT_NAME + , (select code_txt from comtb_code02 where cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = code_val LIMIT 1) as BUSINESS_PROCESS_NAME + , (select user_nm from comtb_user01 where user_id = A.business_input_id LIMIT 1) as INPUT_NAME , to_char(A.SYS_REG_DT::DATE, 'yyyy-mm-dd') as INPUT_DATE FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE WHERE 1=1 @@ -619,19 +618,19 @@ SELECT A.PROJECT_CODE , B.PROJECT_NAME - , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val ) as PROJECT_HARBOR_NAME + , (select code_txt from comtb_code02 where cd_grp = 'project_harbor_code' AND B.PROJECT_HARBOR_CODE = code_val LIMIT 1) as PROJECT_HARBOR_NAME , A.BUSINESS_NAME , A.BUSINESS_CODE , A.BUSINESS_PROCESS_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val ) as BUSINESS_PROCESS_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_process_code' AND A.BUSINESS_PROCESS_CODE = C.code_val LIMIT 1) as BUSINESS_PROCESS_NAME , A.BUSINESS_CLASS_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val ) as BUSINESS_CLASS_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_code' AND A.BUSINESS_CLASS_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_NAME , A.BUSINESS_CLASS_DETAIL_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val ) as BUSINESS_CLASS_DETAIL_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_class_detail_code' AND A.BUSINESS_CLASS_DETAIL_CODE = C.code_val LIMIT 1) as BUSINESS_CLASS_DETAIL_NAME , A.BUSINESS_FACILITIES_FORM_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val ) as BUSINESS_FACILITIES_FORM_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'business_facilities_form_code' AND A.BUSINESS_FACILITIES_FORM_CODE = C.code_val LIMIT 1) as BUSINESS_FACILITIES_FORM_NAME , A.PROJECT_ORDERING_CODE - , (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val ) as PROJECT_ORDERING_NAME + , (select C.code_txt from comtb_code02 C where C.cd_grp = 'project_ordering_code' AND A.PROJECT_ORDERING_CODE = C.code_val LIMIT 1) as PROJECT_ORDERING_NAME , TO_CHAR(A.BUSINESS_START_DATE,'YYYY-MM-DD') AS BUSINESS_START_DATE , TO_CHAR(A.BUSINESS_END_DATE,'YYYY-MM-DD') AS BUSINESS_END_DATE , A.BUSINESS_SECTION_EXTENSION @@ -652,7 +651,7 @@ , A.BUSINESS_REPORT_SOURCE , A.BUSINESS_REPORT_FILE , A.BUSINESS_CONSTRUCTION_FILE - , (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID) as USER_NM + , (select user_nm from comtb_user01 where user_id = A.BUSINESS_INPUT_ID LIMIT 1) as USER_NM , A.BUSINESS_ZIP_NO , A.BUSINESS_ADDRESS , A.BUSINESS_ADDRESS_DETAIL @@ -662,12 +661,12 @@ , A.BUSINESS_AREA_SD_CODE , A.BUSINESS_AREA_SGG_CODE , A.BUSINESS_AREA_EMD_CODE - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND A.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND A.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND A.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME , A.BUSINESS_AREA_FILE - , (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_NM - , (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE) AS FILE_STRG_NM + , (SELECT FILE_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_NM + , (SELECT FILE_STRG_NM FROM COMTB_FILE01 WHERE CAST(FILE_NO AS VARCHAR) = A.BUSINESS_AREA_FILE LIMIT 1) AS FILE_STRG_NM , A.BUSINESS_AREA_YN FROM APPTB_SAUP01 A LEFT OUTER JOIN APPTB_PROJ01 B ON A.PROJECT_CODE = B.PROJECT_CODE WHERE 1=1 @@ -689,15 +688,15 @@ B.PROJECT_CODE , B.BUSINESS_NAME , A.BUSINESS_CODE - , (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL ) AS BUSINESS_PROCESS_NAME + , (SELECT C.CODE_TXT FROM COMTB_CODE02 C WHERE C.CD_GRP = 'business_process_code' AND B.BUSINESS_PROCESS_CODE = C.CODE_VAL LIMIT 1) AS BUSINESS_PROCESS_NAME , A.HOLE_CODE , A.HOLE_NAME , A.HOLE_COORDINATE , A.HOLE_X , A.HOLE_Y - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL) SD_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL) SGG_NAME - , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL) EMD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sido_code' AND B.BUSINESS_AREA_SD_CODE = CODE_VAL LIMIT 1) SD_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'sgg_code' AND B.BUSINESS_AREA_SGG_CODE = CODE_VAL LIMIT 1) SGG_NAME + , (SELECT CODE_TXT FROM COMTB_CODE02 WHERE CD_GRP = 'emd_code' AND B.BUSINESS_AREA_EMD_CODE = CODE_VAL LIMIT 1) EMD_NAME , B.BUSINESS_ADDRESS_DETAIL , A.HOLE_BORING_NAME , A.HOLE_PROSPECTER_NAME @@ -712,7 +711,7 @@ , A.HOLE_BORING_MACHINE , A.HOLE_BORING_METHOD , A.HOLE_BORING_DIRECTION - , (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID) AS USER_NM + , (SELECT USER_NM FROM COMTB_USER01 B WHERE B.USER_ID = A.SYS_REG_ID LIMIT 1) AS USER_NM , TO_CHAR(A.SYS_REG_DT,'YYYY-MM-DD') AS SYS_REG_DT , A.HOLE_REMARK , ST_AsText(A.HOLE_POINT) AS HOLE_POINT @@ -744,7 +743,7 @@ + - SELECT - answer_id, - response_id, - question_id, - answer_text, - selected_option_id - FROM tb_answers - WHERE response_id = #{responseId, jdbcType=OTHER} + ANSWER_ID, + RESPONSE_ID, + QUESTION_ID, + ANSWER_TEXT, + SELECTED_OPTION_ID + FROM TBL_ANSWERS + WHERE RESPONSE_ID = #{_parameter, jdbcType=VARCHAR} - SELECT - answer_id, - response_id, - question_id, - answer_text, - selected_option_id - FROM tb_answers - WHERE question_id = #{questionId, jdbcType=OTHER} + ANSWER_ID, + RESPONSE_ID, + QUESTION_ID, + ANSWER_TEXT, + SELECTED_OPTION_ID + FROM TBL_ANSWERS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} - UPDATE tb_answers + UPDATE TBL_ANSWERS SET - answer_text = #{answerText}, - selected_option_id = #{selectedOptionId, jdbcType=OTHER} - WHERE answer_id = #{answerId, jdbcType=OTHER} + ANSWER_TEXT = #{answerText, jdbcType=CLOB}, + SELECTED_OPTION_ID = #{selectedOptionId, jdbcType=VARCHAR} + WHERE ANSWER_ID = #{answerId, jdbcType=VARCHAR} - - DELETE FROM tb_answers - WHERE answer_id = #{answerId, jdbcType=OTHER} + + DELETE FROM TBL_ANSWERS + WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR} - \ No newline at end of file + diff --git a/target/classes/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml b/target/classes/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml index d44eb5e..13fd17f 100644 --- a/target/classes/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml +++ b/target/classes/egovframework/mapper/sgis/surveysystem/AnswerSelectedOptionMapper.xml @@ -3,48 +3,48 @@ - - + + - INSERT INTO tb_answer_selected_options ( - answer_id, - option_id + INSERT INTO TBL_ANSWER_SELECTED_OPTIONS ( + ANSWER_ID, + OPTION_ID ) VALUES ( - #{answerId, jdbcType=OTHER}, - #{optionId, jdbcType=OTHER} + #{answerId, jdbcType=VARCHAR}, + #{optionId, jdbcType=VARCHAR} ) - INSERT INTO tb_answer_selected_options ( - answer_id, - option_id - ) VALUES - - ( - #{item.answerId, jdbcType=OTHER}, - #{item.optionId, jdbcType=OTHER} + INSERT INTO TBL_ANSWER_SELECTED_OPTIONS ( + ANSWER_ID, + OPTION_ID ) + + SELECT + #{item.answerId, jdbcType=VARCHAR}, + #{item.optionId, jdbcType=VARCHAR} + FROM dual - SELECT - answer_id, - option_id - FROM tb_answer_selected_options - WHERE answer_id = #{answerId, jdbcType=OTHER} + ANSWER_ID, + OPTION_ID + FROM TBL_ANSWER_SELECTED_OPTIONS + WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR} - - DELETE FROM tb_answer_selected_options - WHERE answer_id = #{answerId, jdbcType=OTHER} + + DELETE FROM TBL_ANSWER_SELECTED_OPTIONS + WHERE ANSWER_ID = #{_parameter, jdbcType=VARCHAR} - - DELETE FROM tb_answer_selected_options - WHERE answer_id = #{param1, jdbcType=OTHER} AND option_id = #{param2, jdbcType=OTHER} + + DELETE FROM TBL_ANSWER_SELECTED_OPTIONS + WHERE ANSWER_ID = #{param1, jdbcType=VARCHAR} AND OPTION_ID = #{param2, jdbcType=VARCHAR} - \ No newline at end of file + diff --git a/target/classes/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml b/target/classes/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml index 9b3dbb8..19ca5e1 100644 --- a/target/classes/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml +++ b/target/classes/egovframework/mapper/sgis/surveysystem/QuestionMapper.xml @@ -3,70 +3,70 @@ - - - - - - + + + + + + - INSERT INTO tb_questions ( - question_id, - survey_id, - question_text, - question_type, - question_order, - is_required + INSERT INTO TBL_QUESTIONS ( + QUESTION_ID, + SURVEY_ID, + QUESTION_TEXT, + QUESTION_TYPE, + QUESTION_ORDER, + IS_REQUIRED ) VALUES ( - CAST(#{questionId, jdbcType=OTHER} AS uuid), - CAST(#{surveyId, jdbcType=OTHER} AS uuid), - #{questionText}, - #{questionType}, - #{questionOrder}, - #{isRequired} + #{questionId, jdbcType=VARCHAR}, + #{surveyId, jdbcType=VARCHAR}, + #{questionText, jdbcType=CLOB}, + #{questionType, jdbcType=VARCHAR}, + #{questionOrder, jdbcType=INTEGER}, + #{isRequired, jdbcType=INTEGER} ) - SELECT - question_id, - survey_id, - question_text, - question_type, - question_order, - is_required - FROM tb_questions - WHERE survey_id = CAST(#{surveyId, jdbcType=OTHER} AS uuid) - ORDER BY question_order ASC + QUESTION_ID, + SURVEY_ID, + QUESTION_TEXT, + QUESTION_TYPE, + QUESTION_ORDER, + IS_REQUIRED + FROM TBL_QUESTIONS + WHERE SURVEY_ID = #{_parameter, jdbcType=VARCHAR} + ORDER BY QUESTION_ORDER ASC - SELECT - question_id, - survey_id, - question_text, - question_type, - question_order, - is_required - FROM tb_questions - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) + QUESTION_ID, + SURVEY_ID, + QUESTION_TEXT, + QUESTION_TYPE, + QUESTION_ORDER, + IS_REQUIRED + FROM TBL_QUESTIONS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} - UPDATE tb_questions + UPDATE TBL_QUESTIONS SET - question_text = #{questionText}, - question_type = #{questionType}, - question_order = #{questionOrder}, - is_required = #{isRequired} - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) + QUESTION_TEXT = #{questionText, jdbcType=CLOB}, + QUESTION_TYPE = #{questionType, jdbcType=VARCHAR}, + QUESTION_ORDER = #{questionOrder, jdbcType=INTEGER}, + IS_REQUIRED = #{isRequired, jdbcType=INTEGER} + WHERE QUESTION_ID = #{questionId, jdbcType=VARCHAR} - - DELETE FROM tb_questions - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) + + DELETE FROM TBL_QUESTIONS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} - \ No newline at end of file + diff --git a/target/classes/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml b/target/classes/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml index b8ad464..7c3d24d 100644 --- a/target/classes/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml +++ b/target/classes/egovframework/mapper/sgis/surveysystem/QuestionOptionMapper.xml @@ -3,58 +3,58 @@ - - - - + + + + - INSERT INTO tb_question_options ( - option_id, - question_id, - option_text, - option_order + INSERT INTO TBL_QUESTION_OPTIONS ( + OPTION_ID, + QUESTION_ID, + OPTION_TEXT, + OPTION_ORDER ) VALUES ( - CAST(#{optionId, jdbcType=OTHER} AS uuid), - CAST(#{questionId, jdbcType=OTHER} AS uuid), - #{optionText}, - #{optionOrder} + #{optionId, jdbcType=VARCHAR}, + #{questionId, jdbcType=VARCHAR}, + #{optionText, jdbcType=VARCHAR}, + #{optionOrder, jdbcType=INTEGER} ) - SELECT - option_id, - question_id, - option_text, - option_order - FROM tb_question_options - WHERE question_id = CAST(#{questionId, jdbcType=OTHER} AS uuid) - ORDER BY option_order ASC + OPTION_ID, + QUESTION_ID, + OPTION_TEXT, + OPTION_ORDER + FROM TBL_QUESTION_OPTIONS + WHERE QUESTION_ID = #{_parameter, jdbcType=VARCHAR} + ORDER BY OPTION_ORDER ASC - SELECT - option_id, - question_id, - option_text, - option_order - FROM tb_question_options - WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid) + OPTION_ID, + QUESTION_ID, + OPTION_TEXT, + OPTION_ORDER + FROM TBL_QUESTION_OPTIONS + WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR} - UPDATE tb_question_options + UPDATE TBL_QUESTION_OPTIONS SET - option_text = #{optionText}, - option_order = #{optionOrder} - WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid) + OPTION_TEXT = #{optionText, jdbcType=VARCHAR}, + OPTION_ORDER = #{optionOrder, jdbcType=INTEGER} + WHERE OPTION_ID = #{optionId, jdbcType=VARCHAR} - - DELETE FROM tb_question_options - WHERE option_id = CAST(#{optionId, jdbcType=OTHER} AS uuid) + + DELETE FROM TBL_QUESTION_OPTIONS + WHERE OPTION_ID = #{_parameter, jdbcType=VARCHAR} diff --git a/target/classes/sgis/adm/mapper/AdmMainMapper.class b/target/classes/sgis/adm/mapper/AdmMainMapper.class index b0ff3c8..40ad1ae 100644 Binary files a/target/classes/sgis/adm/mapper/AdmMainMapper.class and b/target/classes/sgis/adm/mapper/AdmMainMapper.class differ diff --git a/target/classes/sgis/adm/service/AdmMainService.class b/target/classes/sgis/adm/service/AdmMainService.class index 9714ff4..dad8d20 100644 Binary files a/target/classes/sgis/adm/service/AdmMainService.class and b/target/classes/sgis/adm/service/AdmMainService.class differ diff --git a/target/classes/sgis/adm/service/impl/AdmMainServiceImpl.class b/target/classes/sgis/adm/service/impl/AdmMainServiceImpl.class index 796685e..d680b45 100644 Binary files a/target/classes/sgis/adm/service/impl/AdmMainServiceImpl.class and b/target/classes/sgis/adm/service/impl/AdmMainServiceImpl.class differ diff --git a/target/classes/sgis/adm/web/AdmMainController.class b/target/classes/sgis/adm/web/AdmMainController.class index 139da67..b25a911 100644 Binary files a/target/classes/sgis/adm/web/AdmMainController.class and b/target/classes/sgis/adm/web/AdmMainController.class differ diff --git a/target/classes/sgis/app/mapper/AppBasicMapper.class b/target/classes/sgis/app/mapper/AppBasicMapper.class index da49fce..9904360 100644 Binary files a/target/classes/sgis/app/mapper/AppBasicMapper.class and b/target/classes/sgis/app/mapper/AppBasicMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppGpMapper.class b/target/classes/sgis/app/mapper/AppGpMapper.class index 85cdf36..3445561 100644 Binary files a/target/classes/sgis/app/mapper/AppGpMapper.class and b/target/classes/sgis/app/mapper/AppGpMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppInstrumentMapper.class b/target/classes/sgis/app/mapper/AppInstrumentMapper.class index 3cafcc1..d30b5e1 100644 Binary files a/target/classes/sgis/app/mapper/AppInstrumentMapper.class and b/target/classes/sgis/app/mapper/AppInstrumentMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppLineMapper.class b/target/classes/sgis/app/mapper/AppLineMapper.class index 98e751d..947dadf 100644 Binary files a/target/classes/sgis/app/mapper/AppLineMapper.class and b/target/classes/sgis/app/mapper/AppLineMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppMainMapper.class b/target/classes/sgis/app/mapper/AppMainMapper.class index dd998b6..d2507e8 100644 Binary files a/target/classes/sgis/app/mapper/AppMainMapper.class and b/target/classes/sgis/app/mapper/AppMainMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppRockMapper.class b/target/classes/sgis/app/mapper/AppRockMapper.class index fc13404..eb801fe 100644 Binary files a/target/classes/sgis/app/mapper/AppRockMapper.class and b/target/classes/sgis/app/mapper/AppRockMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppSandMapper.class b/target/classes/sgis/app/mapper/AppSandMapper.class index f525551..8b0b56a 100644 Binary files a/target/classes/sgis/app/mapper/AppSandMapper.class and b/target/classes/sgis/app/mapper/AppSandMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppSgImpPlanMapper.class b/target/classes/sgis/app/mapper/AppSgImpPlanMapper.class index 63e8e04..7873afd 100644 Binary files a/target/classes/sgis/app/mapper/AppSgImpPlanMapper.class and b/target/classes/sgis/app/mapper/AppSgImpPlanMapper.class differ diff --git a/target/classes/sgis/app/mapper/AppSoftGroundMapper.class b/target/classes/sgis/app/mapper/AppSoftGroundMapper.class index 48357a4..661c154 100644 Binary files a/target/classes/sgis/app/mapper/AppSoftGroundMapper.class and b/target/classes/sgis/app/mapper/AppSoftGroundMapper.class differ diff --git a/target/classes/sgis/app/service/AppBasicService.class b/target/classes/sgis/app/service/AppBasicService.class index e4d6c85..1881113 100644 Binary files a/target/classes/sgis/app/service/AppBasicService.class and b/target/classes/sgis/app/service/AppBasicService.class differ diff --git a/target/classes/sgis/app/service/AppGpService.class b/target/classes/sgis/app/service/AppGpService.class index d9df60a..afcadd4 100644 Binary files a/target/classes/sgis/app/service/AppGpService.class and b/target/classes/sgis/app/service/AppGpService.class differ diff --git a/target/classes/sgis/app/service/AppInstrumentService.class b/target/classes/sgis/app/service/AppInstrumentService.class index 41a61d4..0cb0a90 100644 Binary files a/target/classes/sgis/app/service/AppInstrumentService.class and b/target/classes/sgis/app/service/AppInstrumentService.class differ diff --git a/target/classes/sgis/app/service/AppLineService.class b/target/classes/sgis/app/service/AppLineService.class index 313773f..207792b 100644 Binary files a/target/classes/sgis/app/service/AppLineService.class and b/target/classes/sgis/app/service/AppLineService.class differ diff --git a/target/classes/sgis/app/service/AppMainService.class b/target/classes/sgis/app/service/AppMainService.class index b12250d..650836f 100644 Binary files a/target/classes/sgis/app/service/AppMainService.class and b/target/classes/sgis/app/service/AppMainService.class differ diff --git a/target/classes/sgis/app/service/AppRockService.class b/target/classes/sgis/app/service/AppRockService.class index fddaace..424f56d 100644 Binary files a/target/classes/sgis/app/service/AppRockService.class and b/target/classes/sgis/app/service/AppRockService.class differ diff --git a/target/classes/sgis/app/service/AppSandService.class b/target/classes/sgis/app/service/AppSandService.class index 83a257b..2c31bdf 100644 Binary files a/target/classes/sgis/app/service/AppSandService.class and b/target/classes/sgis/app/service/AppSandService.class differ diff --git a/target/classes/sgis/app/service/AppSgImpPlanService.class b/target/classes/sgis/app/service/AppSgImpPlanService.class index 539782b..7ff131a 100644 Binary files a/target/classes/sgis/app/service/AppSgImpPlanService.class and b/target/classes/sgis/app/service/AppSgImpPlanService.class differ diff --git a/target/classes/sgis/app/service/AppSoftGroundService.class b/target/classes/sgis/app/service/AppSoftGroundService.class index 39a845b..cbff931 100644 Binary files a/target/classes/sgis/app/service/AppSoftGroundService.class and b/target/classes/sgis/app/service/AppSoftGroundService.class differ diff --git a/target/classes/sgis/app/service/impl/AppBasicServiceImpl.class b/target/classes/sgis/app/service/impl/AppBasicServiceImpl.class index 7b219b3..5aedfca 100644 Binary files a/target/classes/sgis/app/service/impl/AppBasicServiceImpl.class and b/target/classes/sgis/app/service/impl/AppBasicServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppGpServiceImpl.class b/target/classes/sgis/app/service/impl/AppGpServiceImpl.class index c25b7a0..8cdf341 100644 Binary files a/target/classes/sgis/app/service/impl/AppGpServiceImpl.class and b/target/classes/sgis/app/service/impl/AppGpServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppInstrumentServiceImpl.class b/target/classes/sgis/app/service/impl/AppInstrumentServiceImpl.class index 2ef2fe1..f15974d 100644 Binary files a/target/classes/sgis/app/service/impl/AppInstrumentServiceImpl.class and b/target/classes/sgis/app/service/impl/AppInstrumentServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppLineServiceImpl.class b/target/classes/sgis/app/service/impl/AppLineServiceImpl.class index ee9d267..cd27b44 100644 Binary files a/target/classes/sgis/app/service/impl/AppLineServiceImpl.class and b/target/classes/sgis/app/service/impl/AppLineServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppMainServiceImpl.class b/target/classes/sgis/app/service/impl/AppMainServiceImpl.class index 23509e9..bb72a54 100644 Binary files a/target/classes/sgis/app/service/impl/AppMainServiceImpl.class and b/target/classes/sgis/app/service/impl/AppMainServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppRockServiceImpl.class b/target/classes/sgis/app/service/impl/AppRockServiceImpl.class index 7345af3..992237b 100644 Binary files a/target/classes/sgis/app/service/impl/AppRockServiceImpl.class and b/target/classes/sgis/app/service/impl/AppRockServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppSandServiceImpl.class b/target/classes/sgis/app/service/impl/AppSandServiceImpl.class index 726fca1..b15f12c 100644 Binary files a/target/classes/sgis/app/service/impl/AppSandServiceImpl.class and b/target/classes/sgis/app/service/impl/AppSandServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppSgImpPlanServiceImpl.class b/target/classes/sgis/app/service/impl/AppSgImpPlanServiceImpl.class index 06549ce..0ce86a2 100644 Binary files a/target/classes/sgis/app/service/impl/AppSgImpPlanServiceImpl.class and b/target/classes/sgis/app/service/impl/AppSgImpPlanServiceImpl.class differ diff --git a/target/classes/sgis/app/service/impl/AppSoftGroundServiceImpl.class b/target/classes/sgis/app/service/impl/AppSoftGroundServiceImpl.class index 1f4b574..de15ad0 100644 Binary files a/target/classes/sgis/app/service/impl/AppSoftGroundServiceImpl.class and b/target/classes/sgis/app/service/impl/AppSoftGroundServiceImpl.class differ diff --git a/target/classes/sgis/app/vo/AppBasicVO.class b/target/classes/sgis/app/vo/AppBasicVO.class index 2c5220d..7e040d9 100644 Binary files a/target/classes/sgis/app/vo/AppBasicVO.class and b/target/classes/sgis/app/vo/AppBasicVO.class differ diff --git a/target/classes/sgis/app/vo/AppFillVO.class b/target/classes/sgis/app/vo/AppFillVO.class index 26e75ef..9e88c32 100644 Binary files a/target/classes/sgis/app/vo/AppFillVO.class and b/target/classes/sgis/app/vo/AppFillVO.class differ diff --git a/target/classes/sgis/app/vo/AppHoleVO.class b/target/classes/sgis/app/vo/AppHoleVO.class index fc15090..46c98d4 100644 Binary files a/target/classes/sgis/app/vo/AppHoleVO.class and b/target/classes/sgis/app/vo/AppHoleVO.class differ diff --git a/target/classes/sgis/app/vo/AppInstrumentVO.class b/target/classes/sgis/app/vo/AppInstrumentVO.class index e411d2a..07f78e8 100644 Binary files a/target/classes/sgis/app/vo/AppInstrumentVO.class and b/target/classes/sgis/app/vo/AppInstrumentVO.class differ diff --git a/target/classes/sgis/app/vo/AppProjVO.class b/target/classes/sgis/app/vo/AppProjVO.class index 181f0f8..10510b7 100644 Binary files a/target/classes/sgis/app/vo/AppProjVO.class and b/target/classes/sgis/app/vo/AppProjVO.class differ diff --git a/target/classes/sgis/app/vo/AppSaupVO.class b/target/classes/sgis/app/vo/AppSaupVO.class index 3baac80..19cd81e 100644 Binary files a/target/classes/sgis/app/vo/AppSaupVO.class and b/target/classes/sgis/app/vo/AppSaupVO.class differ diff --git a/target/classes/sgis/app/vo/AppSgVO.class b/target/classes/sgis/app/vo/AppSgVO.class index f6ee9d8..563f791 100644 Binary files a/target/classes/sgis/app/vo/AppSgVO.class and b/target/classes/sgis/app/vo/AppSgVO.class differ diff --git a/target/classes/sgis/app/web/AppBasicController.class b/target/classes/sgis/app/web/AppBasicController.class index e194d35..54c7480 100644 Binary files a/target/classes/sgis/app/web/AppBasicController.class and b/target/classes/sgis/app/web/AppBasicController.class differ diff --git a/target/classes/sgis/app/web/AppGpController.class b/target/classes/sgis/app/web/AppGpController.class index 0b93040..9b9fa6d 100644 Binary files a/target/classes/sgis/app/web/AppGpController.class and b/target/classes/sgis/app/web/AppGpController.class differ diff --git a/target/classes/sgis/app/web/AppInstrumentController.class b/target/classes/sgis/app/web/AppInstrumentController.class index 681a4f3..3d606e9 100644 Binary files a/target/classes/sgis/app/web/AppInstrumentController.class and b/target/classes/sgis/app/web/AppInstrumentController.class differ diff --git a/target/classes/sgis/app/web/AppLineController.class b/target/classes/sgis/app/web/AppLineController.class index 543cf88..e66a504 100644 Binary files a/target/classes/sgis/app/web/AppLineController.class and b/target/classes/sgis/app/web/AppLineController.class differ diff --git a/target/classes/sgis/app/web/AppMainController.class b/target/classes/sgis/app/web/AppMainController.class index 2700252..489c671 100644 Binary files a/target/classes/sgis/app/web/AppMainController.class and b/target/classes/sgis/app/web/AppMainController.class differ diff --git a/target/classes/sgis/app/web/AppRockController.class b/target/classes/sgis/app/web/AppRockController.class index ae44951..ab9c690 100644 Binary files a/target/classes/sgis/app/web/AppRockController.class and b/target/classes/sgis/app/web/AppRockController.class differ diff --git a/target/classes/sgis/app/web/AppSGPlanController.class b/target/classes/sgis/app/web/AppSGPlanController.class index e11da74..3fa28e9 100644 Binary files a/target/classes/sgis/app/web/AppSGPlanController.class and b/target/classes/sgis/app/web/AppSGPlanController.class differ diff --git a/target/classes/sgis/app/web/AppSandController.class b/target/classes/sgis/app/web/AppSandController.class index 9d78506..f2beb2c 100644 Binary files a/target/classes/sgis/app/web/AppSandController.class and b/target/classes/sgis/app/web/AppSandController.class differ diff --git a/target/classes/sgis/app/web/AppSoftGroundController.class b/target/classes/sgis/app/web/AppSoftGroundController.class index dc6b849..deeeccc 100644 Binary files a/target/classes/sgis/app/web/AppSoftGroundController.class and b/target/classes/sgis/app/web/AppSoftGroundController.class differ diff --git a/target/classes/sgis/board/controller/BoardController.class b/target/classes/sgis/board/controller/BoardController.class index af61e4f..01a741c 100644 Binary files a/target/classes/sgis/board/controller/BoardController.class and b/target/classes/sgis/board/controller/BoardController.class differ diff --git a/target/classes/sgis/board/controller/BoardRestController.class b/target/classes/sgis/board/controller/BoardRestController.class index e3e0a51..6c0e388 100644 Binary files a/target/classes/sgis/board/controller/BoardRestController.class and b/target/classes/sgis/board/controller/BoardRestController.class differ diff --git a/target/classes/sgis/board/controller/MainController.class b/target/classes/sgis/board/controller/MainController.class index 93a0a35..0227309 100644 Binary files a/target/classes/sgis/board/controller/MainController.class and b/target/classes/sgis/board/controller/MainController.class differ diff --git a/target/classes/sgis/board/controller/MemberController.class b/target/classes/sgis/board/controller/MemberController.class index d2acc26..b0280f9 100644 Binary files a/target/classes/sgis/board/controller/MemberController.class and b/target/classes/sgis/board/controller/MemberController.class differ diff --git a/target/classes/sgis/board/controller/NoticeController.class b/target/classes/sgis/board/controller/NoticeController.class index 2efafb6..9ed875c 100644 Binary files a/target/classes/sgis/board/controller/NoticeController.class and b/target/classes/sgis/board/controller/NoticeController.class differ diff --git a/target/classes/sgis/board/controller/NoticeRestController.class b/target/classes/sgis/board/controller/NoticeRestController.class index 5c54fd0..968fc5f 100644 Binary files a/target/classes/sgis/board/controller/NoticeRestController.class and b/target/classes/sgis/board/controller/NoticeRestController.class differ diff --git a/target/classes/sgis/board/entity/AuthVO.class b/target/classes/sgis/board/entity/AuthVO.class index 1f8c69f..d3fa068 100644 Binary files a/target/classes/sgis/board/entity/AuthVO.class and b/target/classes/sgis/board/entity/AuthVO.class differ diff --git a/target/classes/sgis/board/entity/Board.class b/target/classes/sgis/board/entity/Board.class index 1f601f2..5b5ba2f 100644 Binary files a/target/classes/sgis/board/entity/Board.class and b/target/classes/sgis/board/entity/Board.class differ diff --git a/target/classes/sgis/board/entity/Member.class b/target/classes/sgis/board/entity/Member.class index 0f1b54e..8e8f428 100644 Binary files a/target/classes/sgis/board/entity/Member.class and b/target/classes/sgis/board/entity/Member.class differ diff --git a/target/classes/sgis/board/entity/MemberUser.class b/target/classes/sgis/board/entity/MemberUser.class index 884e6ad..f830915 100644 Binary files a/target/classes/sgis/board/entity/MemberUser.class and b/target/classes/sgis/board/entity/MemberUser.class differ diff --git a/target/classes/sgis/board/entity/Notice.class b/target/classes/sgis/board/entity/Notice.class index 86e5ea0..3b9b516 100644 Binary files a/target/classes/sgis/board/entity/Notice.class and b/target/classes/sgis/board/entity/Notice.class differ diff --git a/target/classes/sgis/board/entity/Post.class b/target/classes/sgis/board/entity/Post.class index 9139cce..6811d7b 100644 Binary files a/target/classes/sgis/board/entity/Post.class and b/target/classes/sgis/board/entity/Post.class differ diff --git a/target/classes/sgis/board/mapper/BoardMapper.class b/target/classes/sgis/board/mapper/BoardMapper.class index f11c75f..6646916 100644 Binary files a/target/classes/sgis/board/mapper/BoardMapper.class and b/target/classes/sgis/board/mapper/BoardMapper.class differ diff --git a/target/classes/sgis/board/mapper/MemberMapper.class b/target/classes/sgis/board/mapper/MemberMapper.class index 39b25d2..776ec75 100644 Binary files a/target/classes/sgis/board/mapper/MemberMapper.class and b/target/classes/sgis/board/mapper/MemberMapper.class differ diff --git a/target/classes/sgis/board/mapper/NoticeMapper.class b/target/classes/sgis/board/mapper/NoticeMapper.class index 28ac3d5..ec9bd4e 100644 Binary files a/target/classes/sgis/board/mapper/NoticeMapper.class and b/target/classes/sgis/board/mapper/NoticeMapper.class differ diff --git a/target/classes/sgis/board/mapper/PostMapper.class b/target/classes/sgis/board/mapper/PostMapper.class index 7037844..ffc8c31 100644 Binary files a/target/classes/sgis/board/mapper/PostMapper.class and b/target/classes/sgis/board/mapper/PostMapper.class differ diff --git a/target/classes/sgis/board/service/PostService.class b/target/classes/sgis/board/service/PostService.class index 8f16e8a..f073ae0 100644 Binary files a/target/classes/sgis/board/service/PostService.class and b/target/classes/sgis/board/service/PostService.class differ diff --git a/target/classes/sgis/board/service/impl/PostServiceImpl.class b/target/classes/sgis/board/service/impl/PostServiceImpl.class index 6132190..11221c7 100644 Binary files a/target/classes/sgis/board/service/impl/PostServiceImpl.class and b/target/classes/sgis/board/service/impl/PostServiceImpl.class differ diff --git a/target/classes/sgis/board/typehandler/OffsetDateTimeTypeHandler.class b/target/classes/sgis/board/typehandler/OffsetDateTimeTypeHandler.class index 821a5d5..a4d2be1 100644 Binary files a/target/classes/sgis/board/typehandler/OffsetDateTimeTypeHandler.class and b/target/classes/sgis/board/typehandler/OffsetDateTimeTypeHandler.class differ diff --git a/target/classes/sgis/board/typehandler/UUIDTypeHandler.class b/target/classes/sgis/board/typehandler/UUIDTypeHandler.class index 0aeb3e0..65636ca 100644 Binary files a/target/classes/sgis/board/typehandler/UUIDTypeHandler.class and b/target/classes/sgis/board/typehandler/UUIDTypeHandler.class differ diff --git a/target/classes/sgis/com/exception/ElatXMLParseException.class b/target/classes/sgis/com/exception/ElatXMLParseException.class index 6031241..6f8d3af 100644 Binary files a/target/classes/sgis/com/exception/ElatXMLParseException.class and b/target/classes/sgis/com/exception/ElatXMLParseException.class differ diff --git a/target/classes/sgis/com/exception/ParameterException.class b/target/classes/sgis/com/exception/ParameterException.class index 32e67df..ca8ac45 100644 Binary files a/target/classes/sgis/com/exception/ParameterException.class and b/target/classes/sgis/com/exception/ParameterException.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/BSpline.class b/target/classes/sgis/com/jsevy/jdxf/BSpline.class index bbfa2a0..6e9f90f 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/BSpline.class and b/target/classes/sgis/com/jsevy/jdxf/BSpline.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/BSplineBasisFunction.class b/target/classes/sgis/com/jsevy/jdxf/BSplineBasisFunction.class index 031b009..4340823 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/BSplineBasisFunction.class and b/target/classes/sgis/com/jsevy/jdxf/BSplineBasisFunction.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/BasisFunction.class b/target/classes/sgis/com/jsevy/jdxf/BasisFunction.class index 824f4cd..c7bf42d 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/BasisFunction.class and b/target/classes/sgis/com/jsevy/jdxf/BasisFunction.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFAppID.class b/target/classes/sgis/com/jsevy/jdxf/DXFAppID.class index 15d132e..8abea51 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFAppID.class and b/target/classes/sgis/com/jsevy/jdxf/DXFAppID.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFArc.class b/target/classes/sgis/com/jsevy/jdxf/DXFArc.class index 414c958..870cbac 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFArc.class and b/target/classes/sgis/com/jsevy/jdxf/DXFArc.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFBlock.class b/target/classes/sgis/com/jsevy/jdxf/DXFBlock.class index 29d39e8..77d8e53 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFBlock.class and b/target/classes/sgis/com/jsevy/jdxf/DXFBlock.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFBlockEnd.class b/target/classes/sgis/com/jsevy/jdxf/DXFBlockEnd.class index f45bf1c..ae5f5b8 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFBlockEnd.class and b/target/classes/sgis/com/jsevy/jdxf/DXFBlockEnd.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFBlockRecord.class b/target/classes/sgis/com/jsevy/jdxf/DXFBlockRecord.class index be848b5..67dacc1 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFBlockRecord.class and b/target/classes/sgis/com/jsevy/jdxf/DXFBlockRecord.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFCircle.class b/target/classes/sgis/com/jsevy/jdxf/DXFCircle.class index 2f119eb..a365e6f 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFCircle.class and b/target/classes/sgis/com/jsevy/jdxf/DXFCircle.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFColor.class b/target/classes/sgis/com/jsevy/jdxf/DXFColor.class index 553a171..b5a1bdd 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFColor.class and b/target/classes/sgis/com/jsevy/jdxf/DXFColor.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFContainer.class b/target/classes/sgis/com/jsevy/jdxf/DXFContainer.class index 4616938..10a2835 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFContainer.class and b/target/classes/sgis/com/jsevy/jdxf/DXFContainer.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseContainer.class b/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseContainer.class index eec9e56..6647368 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseContainer.class and b/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseContainer.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseObject.class b/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseObject.class index 39348f9..d19d19d 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseObject.class and b/target/classes/sgis/com/jsevy/jdxf/DXFDatabaseObject.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFDictionary.class b/target/classes/sgis/com/jsevy/jdxf/DXFDictionary.class index 388a5dd..bacb7e7 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFDictionary.class and b/target/classes/sgis/com/jsevy/jdxf/DXFDictionary.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFDimStyleTable.class b/target/classes/sgis/com/jsevy/jdxf/DXFDimStyleTable.class index c11ae21..96484aa 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFDimStyleTable.class and b/target/classes/sgis/com/jsevy/jdxf/DXFDimStyleTable.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFDocument.class b/target/classes/sgis/com/jsevy/jdxf/DXFDocument.class index d363c9a..349cd27 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFDocument.class and b/target/classes/sgis/com/jsevy/jdxf/DXFDocument.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFEllipse.class b/target/classes/sgis/com/jsevy/jdxf/DXFEllipse.class index 82be631..cd5dc3d 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFEllipse.class and b/target/classes/sgis/com/jsevy/jdxf/DXFEllipse.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFEntity.class b/target/classes/sgis/com/jsevy/jdxf/DXFEntity.class index 2ec500f..8903300 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFEntity.class and b/target/classes/sgis/com/jsevy/jdxf/DXFEntity.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFGraphics$PaintMode.class b/target/classes/sgis/com/jsevy/jdxf/DXFGraphics$PaintMode.class index bf8d0ce..7d03551 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFGraphics$PaintMode.class and b/target/classes/sgis/com/jsevy/jdxf/DXFGraphics$PaintMode.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFGraphics.class b/target/classes/sgis/com/jsevy/jdxf/DXFGraphics.class index 34f829b..5fab6e1 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFGraphics.class and b/target/classes/sgis/com/jsevy/jdxf/DXFGraphics.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFHatch.class b/target/classes/sgis/com/jsevy/jdxf/DXFHatch.class index 7e2962a..a079eed 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFHatch.class and b/target/classes/sgis/com/jsevy/jdxf/DXFHatch.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment$HeaderLine.class b/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment$HeaderLine.class index 110a777..35db9be 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment$HeaderLine.class and b/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment$HeaderLine.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment.class b/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment.class index 5a7f75e..2da66b4 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment.class and b/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegment.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegmentAutoCAD.class b/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegmentAutoCAD.class index 78fa7c3..971b004 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegmentAutoCAD.class and b/target/classes/sgis/com/jsevy/jdxf/DXFHeaderSegmentAutoCAD.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFImage.class b/target/classes/sgis/com/jsevy/jdxf/DXFImage.class index 5afb6fb..99b2929 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFImage.class and b/target/classes/sgis/com/jsevy/jdxf/DXFImage.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFLWPolyline.class b/target/classes/sgis/com/jsevy/jdxf/DXFLWPolyline.class index 8ced85d..3bc7e27 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFLWPolyline.class and b/target/classes/sgis/com/jsevy/jdxf/DXFLWPolyline.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFLayer.class b/target/classes/sgis/com/jsevy/jdxf/DXFLayer.class index 2d54e9d..33d7427 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFLayer.class and b/target/classes/sgis/com/jsevy/jdxf/DXFLayer.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFLine.class b/target/classes/sgis/com/jsevy/jdxf/DXFLine.class index 0ca488d..e55c173 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFLine.class and b/target/classes/sgis/com/jsevy/jdxf/DXFLine.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFLinetype.class b/target/classes/sgis/com/jsevy/jdxf/DXFLinetype.class index 7ebdfda..8f2e450 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFLinetype.class and b/target/classes/sgis/com/jsevy/jdxf/DXFLinetype.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFObject.class b/target/classes/sgis/com/jsevy/jdxf/DXFObject.class index b05c9b7..3cb6e47 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFObject.class and b/target/classes/sgis/com/jsevy/jdxf/DXFObject.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFPoint.class b/target/classes/sgis/com/jsevy/jdxf/DXFPoint.class index 9b644ec..f5564bf 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFPoint.class and b/target/classes/sgis/com/jsevy/jdxf/DXFPoint.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFSection.class b/target/classes/sgis/com/jsevy/jdxf/DXFSection.class index ec783f6..95477a0 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFSection.class and b/target/classes/sgis/com/jsevy/jdxf/DXFSection.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFSpline.class b/target/classes/sgis/com/jsevy/jdxf/DXFSpline.class index 4349912..6ef15d1 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFSpline.class and b/target/classes/sgis/com/jsevy/jdxf/DXFSpline.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFStyle.class b/target/classes/sgis/com/jsevy/jdxf/DXFStyle.class index c74406a..f0551c6 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFStyle.class and b/target/classes/sgis/com/jsevy/jdxf/DXFStyle.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFTable.class b/target/classes/sgis/com/jsevy/jdxf/DXFTable.class index f8d833d..6a43d90 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFTable.class and b/target/classes/sgis/com/jsevy/jdxf/DXFTable.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFTableRecord.class b/target/classes/sgis/com/jsevy/jdxf/DXFTableRecord.class index ffd4bee..0b64e66 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFTableRecord.class and b/target/classes/sgis/com/jsevy/jdxf/DXFTableRecord.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFText.class b/target/classes/sgis/com/jsevy/jdxf/DXFText.class index addb121..98574b5 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFText.class and b/target/classes/sgis/com/jsevy/jdxf/DXFText.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/DXFViewport.class b/target/classes/sgis/com/jsevy/jdxf/DXFViewport.class index b2e1095..4326850 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/DXFViewport.class and b/target/classes/sgis/com/jsevy/jdxf/DXFViewport.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/RealPoint.class b/target/classes/sgis/com/jsevy/jdxf/RealPoint.class index 5ceeefa..00d7e1a 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/RealPoint.class and b/target/classes/sgis/com/jsevy/jdxf/RealPoint.class differ diff --git a/target/classes/sgis/com/jsevy/jdxf/SplineControlPoint.class b/target/classes/sgis/com/jsevy/jdxf/SplineControlPoint.class index 7c0801c..817597e 100644 Binary files a/target/classes/sgis/com/jsevy/jdxf/SplineControlPoint.class and b/target/classes/sgis/com/jsevy/jdxf/SplineControlPoint.class differ diff --git a/target/classes/sgis/com/mapper/ComCodeMapper.class b/target/classes/sgis/com/mapper/ComCodeMapper.class index 99f66ea..7431925 100644 Binary files a/target/classes/sgis/com/mapper/ComCodeMapper.class and b/target/classes/sgis/com/mapper/ComCodeMapper.class differ diff --git a/target/classes/sgis/com/mapper/ComFileMapper.class b/target/classes/sgis/com/mapper/ComFileMapper.class index 1c11cb8..ee7c02e 100644 Binary files a/target/classes/sgis/com/mapper/ComFileMapper.class and b/target/classes/sgis/com/mapper/ComFileMapper.class differ diff --git a/target/classes/sgis/com/mapper/ComLogMapper.class b/target/classes/sgis/com/mapper/ComLogMapper.class index 59ba9fc..310c689 100644 Binary files a/target/classes/sgis/com/mapper/ComLogMapper.class and b/target/classes/sgis/com/mapper/ComLogMapper.class differ diff --git a/target/classes/sgis/com/mapper/ComUserMapper.class b/target/classes/sgis/com/mapper/ComUserMapper.class index a06c8bf..95b4b87 100644 Binary files a/target/classes/sgis/com/mapper/ComUserMapper.class and b/target/classes/sgis/com/mapper/ComUserMapper.class differ diff --git a/target/classes/sgis/com/mapper/TestMapper.class b/target/classes/sgis/com/mapper/TestMapper.class index e91c493..c46ad60 100644 Binary files a/target/classes/sgis/com/mapper/TestMapper.class and b/target/classes/sgis/com/mapper/TestMapper.class differ diff --git a/target/classes/sgis/com/mapper/UserAuthMapper.class b/target/classes/sgis/com/mapper/UserAuthMapper.class index 38a3f4d..2614540 100644 Binary files a/target/classes/sgis/com/mapper/UserAuthMapper.class and b/target/classes/sgis/com/mapper/UserAuthMapper.class differ diff --git a/target/classes/sgis/com/service/ApiService.class b/target/classes/sgis/com/service/ApiService.class index abfbfa1..974ae04 100644 Binary files a/target/classes/sgis/com/service/ApiService.class and b/target/classes/sgis/com/service/ApiService.class differ diff --git a/target/classes/sgis/com/service/BaseService.class b/target/classes/sgis/com/service/BaseService.class index 9f8565e..ea20c08 100644 Binary files a/target/classes/sgis/com/service/BaseService.class and b/target/classes/sgis/com/service/BaseService.class differ diff --git a/target/classes/sgis/com/service/ComCodeService.class b/target/classes/sgis/com/service/ComCodeService.class index 2254617..bcce82f 100644 Binary files a/target/classes/sgis/com/service/ComCodeService.class and b/target/classes/sgis/com/service/ComCodeService.class differ diff --git a/target/classes/sgis/com/service/ComLogService.class b/target/classes/sgis/com/service/ComLogService.class index 970a20a..460bc12 100644 Binary files a/target/classes/sgis/com/service/ComLogService.class and b/target/classes/sgis/com/service/ComLogService.class differ diff --git a/target/classes/sgis/com/service/ComUserService.class b/target/classes/sgis/com/service/ComUserService.class index 26e7595..e1a790a 100644 Binary files a/target/classes/sgis/com/service/ComUserService.class and b/target/classes/sgis/com/service/ComUserService.class differ diff --git a/target/classes/sgis/com/service/FileTransferService.class b/target/classes/sgis/com/service/FileTransferService.class index 075b985..cc68f15 100644 Binary files a/target/classes/sgis/com/service/FileTransferService.class and b/target/classes/sgis/com/service/FileTransferService.class differ diff --git a/target/classes/sgis/com/service/TestService.class b/target/classes/sgis/com/service/TestService.class index 7dd2c36..026e534 100644 Binary files a/target/classes/sgis/com/service/TestService.class and b/target/classes/sgis/com/service/TestService.class differ diff --git a/target/classes/sgis/com/service/impl/ApiServiceImpl.class b/target/classes/sgis/com/service/impl/ApiServiceImpl.class index a957294..4cfbd9a 100644 Binary files a/target/classes/sgis/com/service/impl/ApiServiceImpl.class and b/target/classes/sgis/com/service/impl/ApiServiceImpl.class differ diff --git a/target/classes/sgis/com/service/impl/ComCodeServiceImpl.class b/target/classes/sgis/com/service/impl/ComCodeServiceImpl.class index 1bf888a..5f5cb8b 100644 Binary files a/target/classes/sgis/com/service/impl/ComCodeServiceImpl.class and b/target/classes/sgis/com/service/impl/ComCodeServiceImpl.class differ diff --git a/target/classes/sgis/com/service/impl/ComLogServiceImpl.class b/target/classes/sgis/com/service/impl/ComLogServiceImpl.class index fe64135..bc3e45b 100644 Binary files a/target/classes/sgis/com/service/impl/ComLogServiceImpl.class and b/target/classes/sgis/com/service/impl/ComLogServiceImpl.class differ diff --git a/target/classes/sgis/com/service/impl/ComUserServiceImpl.class b/target/classes/sgis/com/service/impl/ComUserServiceImpl.class index 7b337e2..91abf60 100644 Binary files a/target/classes/sgis/com/service/impl/ComUserServiceImpl.class and b/target/classes/sgis/com/service/impl/ComUserServiceImpl.class differ diff --git a/target/classes/sgis/com/service/impl/FileTransferServiceImpl.class b/target/classes/sgis/com/service/impl/FileTransferServiceImpl.class index 6f5bf0e..4e57e96 100644 Binary files a/target/classes/sgis/com/service/impl/FileTransferServiceImpl.class and b/target/classes/sgis/com/service/impl/FileTransferServiceImpl.class differ diff --git a/target/classes/sgis/com/service/impl/TestServiceImpl.class b/target/classes/sgis/com/service/impl/TestServiceImpl.class index 6225c89..f1a15fa 100644 Binary files a/target/classes/sgis/com/service/impl/TestServiceImpl.class and b/target/classes/sgis/com/service/impl/TestServiceImpl.class differ diff --git a/target/classes/sgis/com/util/ApiCommand.class b/target/classes/sgis/com/util/ApiCommand.class index 8019b75..752a8d2 100644 Binary files a/target/classes/sgis/com/util/ApiCommand.class and b/target/classes/sgis/com/util/ApiCommand.class differ diff --git a/target/classes/sgis/com/util/CommonUtils.class b/target/classes/sgis/com/util/CommonUtils.class index 5831a59..cd9216c 100644 Binary files a/target/classes/sgis/com/util/CommonUtils.class and b/target/classes/sgis/com/util/CommonUtils.class differ diff --git a/target/classes/sgis/com/util/CompressUtil.class b/target/classes/sgis/com/util/CompressUtil.class index 75aad1d..443a4e3 100644 Binary files a/target/classes/sgis/com/util/CompressUtil.class and b/target/classes/sgis/com/util/CompressUtil.class differ diff --git a/target/classes/sgis/com/util/CryptoUtil.class b/target/classes/sgis/com/util/CryptoUtil.class index 687bcd3..7e8b434 100644 Binary files a/target/classes/sgis/com/util/CryptoUtil.class and b/target/classes/sgis/com/util/CryptoUtil.class differ diff --git a/target/classes/sgis/com/util/ExcelUtil.class b/target/classes/sgis/com/util/ExcelUtil.class index 3c2b3d2..2ee8abb 100644 Binary files a/target/classes/sgis/com/util/ExcelUtil.class and b/target/classes/sgis/com/util/ExcelUtil.class differ diff --git a/target/classes/sgis/com/util/JsonUtil.class b/target/classes/sgis/com/util/JsonUtil.class index f126c6b..3b901e6 100644 Binary files a/target/classes/sgis/com/util/JsonUtil.class and b/target/classes/sgis/com/util/JsonUtil.class differ diff --git a/target/classes/sgis/com/util/MyUtil.class b/target/classes/sgis/com/util/MyUtil.class index 7cc0e98..9028ebe 100644 Binary files a/target/classes/sgis/com/util/MyUtil.class and b/target/classes/sgis/com/util/MyUtil.class differ diff --git a/target/classes/sgis/com/util/SessionConfig.class b/target/classes/sgis/com/util/SessionConfig.class index e9a4f8c..579f50c 100644 Binary files a/target/classes/sgis/com/util/SessionConfig.class and b/target/classes/sgis/com/util/SessionConfig.class differ diff --git a/target/classes/sgis/com/util/SessionUtil.class b/target/classes/sgis/com/util/SessionUtil.class index b7bd82f..edd81f3 100644 Binary files a/target/classes/sgis/com/util/SessionUtil.class and b/target/classes/sgis/com/util/SessionUtil.class differ diff --git a/target/classes/sgis/com/util/StringUtil.class b/target/classes/sgis/com/util/StringUtil.class index db0872b..c44162a 100644 Binary files a/target/classes/sgis/com/util/StringUtil.class and b/target/classes/sgis/com/util/StringUtil.class differ diff --git a/target/classes/sgis/com/util/WebUtil$1.class b/target/classes/sgis/com/util/WebUtil$1.class index 12c8eb8..282f733 100644 Binary files a/target/classes/sgis/com/util/WebUtil$1.class and b/target/classes/sgis/com/util/WebUtil$1.class differ diff --git a/target/classes/sgis/com/util/WebUtil$miTM.class b/target/classes/sgis/com/util/WebUtil$miTM.class index ac1b919..fc510d7 100644 Binary files a/target/classes/sgis/com/util/WebUtil$miTM.class and b/target/classes/sgis/com/util/WebUtil$miTM.class differ diff --git a/target/classes/sgis/com/util/WebUtil.class b/target/classes/sgis/com/util/WebUtil.class index e26899c..36b51c1 100644 Binary files a/target/classes/sgis/com/util/WebUtil.class and b/target/classes/sgis/com/util/WebUtil.class differ diff --git a/target/classes/sgis/com/vo/ComCodeVO.class b/target/classes/sgis/com/vo/ComCodeVO.class index 488945c..ed1f1b9 100644 Binary files a/target/classes/sgis/com/vo/ComCodeVO.class and b/target/classes/sgis/com/vo/ComCodeVO.class differ diff --git a/target/classes/sgis/com/vo/ComConnectLogVO.class b/target/classes/sgis/com/vo/ComConnectLogVO.class index 53c7105..33dabea 100644 Binary files a/target/classes/sgis/com/vo/ComConnectLogVO.class and b/target/classes/sgis/com/vo/ComConnectLogVO.class differ diff --git a/target/classes/sgis/com/vo/ComFileVO.class b/target/classes/sgis/com/vo/ComFileVO.class index 7e15f50..01f2aec 100644 Binary files a/target/classes/sgis/com/vo/ComFileVO.class and b/target/classes/sgis/com/vo/ComFileVO.class differ diff --git a/target/classes/sgis/com/vo/ComUserVO.class b/target/classes/sgis/com/vo/ComUserVO.class index 9c236d1..d24b4a5 100644 Binary files a/target/classes/sgis/com/vo/ComUserVO.class and b/target/classes/sgis/com/vo/ComUserVO.class differ diff --git a/target/classes/sgis/com/vo/SessionVO.class b/target/classes/sgis/com/vo/SessionVO.class index 5f0a3c1..2c1639a 100644 Binary files a/target/classes/sgis/com/vo/SessionVO.class and b/target/classes/sgis/com/vo/SessionVO.class differ diff --git a/target/classes/sgis/com/vo/UserAuthVO.class b/target/classes/sgis/com/vo/UserAuthVO.class index 9d4bd2a..d2c7300 100644 Binary files a/target/classes/sgis/com/vo/UserAuthVO.class and b/target/classes/sgis/com/vo/UserAuthVO.class differ diff --git a/target/classes/sgis/com/web/ApiController.class b/target/classes/sgis/com/web/ApiController.class index 73b2773..fd71876 100644 Binary files a/target/classes/sgis/com/web/ApiController.class and b/target/classes/sgis/com/web/ApiController.class differ diff --git a/target/classes/sgis/com/web/BaseController.class b/target/classes/sgis/com/web/BaseController.class index a52e011..5f61152 100644 Binary files a/target/classes/sgis/com/web/BaseController.class and b/target/classes/sgis/com/web/BaseController.class differ diff --git a/target/classes/sgis/com/web/ComCodeController.class b/target/classes/sgis/com/web/ComCodeController.class index 3b8904b..6ef08e9 100644 Binary files a/target/classes/sgis/com/web/ComCodeController.class and b/target/classes/sgis/com/web/ComCodeController.class differ diff --git a/target/classes/sgis/com/web/DecompressZip.class b/target/classes/sgis/com/web/DecompressZip.class index 0919d9e..93f0ed9 100644 Binary files a/target/classes/sgis/com/web/DecompressZip.class and b/target/classes/sgis/com/web/DecompressZip.class differ diff --git a/target/classes/sgis/com/web/FileTransferController.class b/target/classes/sgis/com/web/FileTransferController.class index 35c5902..475621c 100644 Binary files a/target/classes/sgis/com/web/FileTransferController.class and b/target/classes/sgis/com/web/FileTransferController.class differ diff --git a/target/classes/sgis/com/web/LoginController.class b/target/classes/sgis/com/web/LoginController.class index 415cab0..9ba92e8 100644 Binary files a/target/classes/sgis/com/web/LoginController.class and b/target/classes/sgis/com/web/LoginController.class differ diff --git a/target/classes/sgis/com/web/TestController.class b/target/classes/sgis/com/web/TestController.class index 8740324..a9d41e9 100644 Binary files a/target/classes/sgis/com/web/TestController.class and b/target/classes/sgis/com/web/TestController.class differ diff --git a/target/classes/sgis/map/mapper/AppPredictMapper.class b/target/classes/sgis/map/mapper/AppPredictMapper.class index 99e1af4..e0af9af 100644 Binary files a/target/classes/sgis/map/mapper/AppPredictMapper.class and b/target/classes/sgis/map/mapper/AppPredictMapper.class differ diff --git a/target/classes/sgis/map/mapper/MapMainMapper.class b/target/classes/sgis/map/mapper/MapMainMapper.class index 1208907..e96916f 100644 Binary files a/target/classes/sgis/map/mapper/MapMainMapper.class and b/target/classes/sgis/map/mapper/MapMainMapper.class differ diff --git a/target/classes/sgis/map/service/AppPredictService.class b/target/classes/sgis/map/service/AppPredictService.class index 96dd1f2..b3c3dd3 100644 Binary files a/target/classes/sgis/map/service/AppPredictService.class and b/target/classes/sgis/map/service/AppPredictService.class differ diff --git a/target/classes/sgis/map/service/MapMainService.class b/target/classes/sgis/map/service/MapMainService.class index ad793aa..51a77fc 100644 Binary files a/target/classes/sgis/map/service/MapMainService.class and b/target/classes/sgis/map/service/MapMainService.class differ diff --git a/target/classes/sgis/map/service/impl/AppPredictServiceImpl.class b/target/classes/sgis/map/service/impl/AppPredictServiceImpl.class index 31a646f..952f7e0 100644 Binary files a/target/classes/sgis/map/service/impl/AppPredictServiceImpl.class and b/target/classes/sgis/map/service/impl/AppPredictServiceImpl.class differ diff --git a/target/classes/sgis/map/service/impl/MapMainServiceImpl.class b/target/classes/sgis/map/service/impl/MapMainServiceImpl.class index 6fe5bc2..a021a30 100644 Binary files a/target/classes/sgis/map/service/impl/MapMainServiceImpl.class and b/target/classes/sgis/map/service/impl/MapMainServiceImpl.class differ diff --git a/target/classes/sgis/map/vo/MapInfoVO.class b/target/classes/sgis/map/vo/MapInfoVO.class index 58e70d1..26ae952 100644 Binary files a/target/classes/sgis/map/vo/MapInfoVO.class and b/target/classes/sgis/map/vo/MapInfoVO.class differ diff --git a/target/classes/sgis/map/web/MapMainController.class b/target/classes/sgis/map/web/MapMainController.class index 4c84aa9..3f72341 100644 Binary files a/target/classes/sgis/map/web/MapMainController.class and b/target/classes/sgis/map/web/MapMainController.class differ diff --git a/target/classes/sgis/portal/web/PortalMainController.class b/target/classes/sgis/portal/web/PortalMainController.class index 2767761..7ae625d 100644 Binary files a/target/classes/sgis/portal/web/PortalMainController.class and b/target/classes/sgis/portal/web/PortalMainController.class differ diff --git a/target/classes/sgis/surveysystem/config/LocalDateTimeTypeHandler.class b/target/classes/sgis/surveysystem/config/LocalDateTimeTypeHandler.class index 474c970..23e1a9a 100644 Binary files a/target/classes/sgis/surveysystem/config/LocalDateTimeTypeHandler.class and b/target/classes/sgis/surveysystem/config/LocalDateTimeTypeHandler.class differ diff --git a/target/classes/sgis/surveysystem/config/UUIDTypeHandler.class b/target/classes/sgis/surveysystem/config/UUIDTypeHandler.class index 4f5a1fe..6b72f1a 100644 Binary files a/target/classes/sgis/surveysystem/config/UUIDTypeHandler.class and b/target/classes/sgis/surveysystem/config/UUIDTypeHandler.class differ diff --git a/target/classes/sgis/surveysystem/controller/AdminSurveyPageController.class b/target/classes/sgis/surveysystem/controller/AdminSurveyPageController.class index b6fda55..adc9886 100644 Binary files a/target/classes/sgis/surveysystem/controller/AdminSurveyPageController.class and b/target/classes/sgis/surveysystem/controller/AdminSurveyPageController.class differ diff --git a/target/classes/sgis/surveysystem/controller/QuestionController.class b/target/classes/sgis/surveysystem/controller/QuestionController.class index bee8743..b5cce64 100644 Binary files a/target/classes/sgis/surveysystem/controller/QuestionController.class and b/target/classes/sgis/surveysystem/controller/QuestionController.class differ diff --git a/target/classes/sgis/surveysystem/controller/QuestionOptionController.class b/target/classes/sgis/surveysystem/controller/QuestionOptionController.class index baf1a1a..1710e56 100644 Binary files a/target/classes/sgis/surveysystem/controller/QuestionOptionController.class and b/target/classes/sgis/surveysystem/controller/QuestionOptionController.class differ diff --git a/target/classes/sgis/surveysystem/controller/SurveyController.class b/target/classes/sgis/surveysystem/controller/SurveyController.class index 06d6151..015833b 100644 Binary files a/target/classes/sgis/surveysystem/controller/SurveyController.class and b/target/classes/sgis/surveysystem/controller/SurveyController.class differ diff --git a/target/classes/sgis/surveysystem/domain/Answer$AnswerBuilder.class b/target/classes/sgis/surveysystem/domain/Answer$AnswerBuilder.class index c044bfd..1cc2aae 100644 Binary files a/target/classes/sgis/surveysystem/domain/Answer$AnswerBuilder.class and b/target/classes/sgis/surveysystem/domain/Answer$AnswerBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/Answer.class b/target/classes/sgis/surveysystem/domain/Answer.class index 2f5bd39..3e0f1c8 100644 Binary files a/target/classes/sgis/surveysystem/domain/Answer.class and b/target/classes/sgis/surveysystem/domain/Answer.class differ diff --git a/target/classes/sgis/surveysystem/domain/AnswerSelectedOption$AnswerSelectedOptionBuilder.class b/target/classes/sgis/surveysystem/domain/AnswerSelectedOption$AnswerSelectedOptionBuilder.class index 5a4e6f8..0df2b5a 100644 Binary files a/target/classes/sgis/surveysystem/domain/AnswerSelectedOption$AnswerSelectedOptionBuilder.class and b/target/classes/sgis/surveysystem/domain/AnswerSelectedOption$AnswerSelectedOptionBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/AnswerSelectedOption.class b/target/classes/sgis/surveysystem/domain/AnswerSelectedOption.class index 4adcbfa..22c70e3 100644 Binary files a/target/classes/sgis/surveysystem/domain/AnswerSelectedOption.class and b/target/classes/sgis/surveysystem/domain/AnswerSelectedOption.class differ diff --git a/target/classes/sgis/surveysystem/domain/Question$QuestionBuilder.class b/target/classes/sgis/surveysystem/domain/Question$QuestionBuilder.class index 923697d..fdfca6b 100644 Binary files a/target/classes/sgis/surveysystem/domain/Question$QuestionBuilder.class and b/target/classes/sgis/surveysystem/domain/Question$QuestionBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/Question.class b/target/classes/sgis/surveysystem/domain/Question.class index 46b33df..cb08825 100644 Binary files a/target/classes/sgis/surveysystem/domain/Question.class and b/target/classes/sgis/surveysystem/domain/Question.class differ diff --git a/target/classes/sgis/surveysystem/domain/QuestionOption$QuestionOptionBuilder.class b/target/classes/sgis/surveysystem/domain/QuestionOption$QuestionOptionBuilder.class index 74cca88..80559b4 100644 Binary files a/target/classes/sgis/surveysystem/domain/QuestionOption$QuestionOptionBuilder.class and b/target/classes/sgis/surveysystem/domain/QuestionOption$QuestionOptionBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/QuestionOption.class b/target/classes/sgis/surveysystem/domain/QuestionOption.class index 2e12f93..298ce09 100644 Binary files a/target/classes/sgis/surveysystem/domain/QuestionOption.class and b/target/classes/sgis/surveysystem/domain/QuestionOption.class differ diff --git a/target/classes/sgis/surveysystem/domain/Respondent$RespondentBuilder.class b/target/classes/sgis/surveysystem/domain/Respondent$RespondentBuilder.class index 314721e..33afe86 100644 Binary files a/target/classes/sgis/surveysystem/domain/Respondent$RespondentBuilder.class and b/target/classes/sgis/surveysystem/domain/Respondent$RespondentBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/Respondent.class b/target/classes/sgis/surveysystem/domain/Respondent.class index 738b741..644b898 100644 Binary files a/target/classes/sgis/surveysystem/domain/Respondent.class and b/target/classes/sgis/surveysystem/domain/Respondent.class differ diff --git a/target/classes/sgis/surveysystem/domain/Survey$SurveyBuilder.class b/target/classes/sgis/surveysystem/domain/Survey$SurveyBuilder.class index 7c1476c..16c8f87 100644 Binary files a/target/classes/sgis/surveysystem/domain/Survey$SurveyBuilder.class and b/target/classes/sgis/surveysystem/domain/Survey$SurveyBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/Survey.class b/target/classes/sgis/surveysystem/domain/Survey.class index 7d78a70..6e9d7a7 100644 Binary files a/target/classes/sgis/surveysystem/domain/Survey.class and b/target/classes/sgis/surveysystem/domain/Survey.class differ diff --git a/target/classes/sgis/surveysystem/domain/SurveyResponse$SurveyResponseBuilder.class b/target/classes/sgis/surveysystem/domain/SurveyResponse$SurveyResponseBuilder.class index 2c832d7..874cab9 100644 Binary files a/target/classes/sgis/surveysystem/domain/SurveyResponse$SurveyResponseBuilder.class and b/target/classes/sgis/surveysystem/domain/SurveyResponse$SurveyResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/domain/SurveyResponse.class b/target/classes/sgis/surveysystem/domain/SurveyResponse.class index 991d9f5..9f4d9bf 100644 Binary files a/target/classes/sgis/surveysystem/domain/SurveyResponse.class and b/target/classes/sgis/surveysystem/domain/SurveyResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerCreateRequest.class b/target/classes/sgis/surveysystem/dto/AnswerCreateRequest.class index 00a2992..166cf3e 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerCreateRequest.class and b/target/classes/sgis/surveysystem/dto/AnswerCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerResponse$AnswerResponseBuilder.class b/target/classes/sgis/surveysystem/dto/AnswerResponse$AnswerResponseBuilder.class index 4fe5c47..999e3cc 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerResponse$AnswerResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/AnswerResponse$AnswerResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerResponse.class b/target/classes/sgis/surveysystem/dto/AnswerResponse.class index 32a137d..244561f 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerResponse.class and b/target/classes/sgis/surveysystem/dto/AnswerResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionCreateRequest.class b/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionCreateRequest.class index 3160e65..80875f2 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionCreateRequest.class and b/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse$AnswerSelectedOptionResponseBuilder.class b/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse$AnswerSelectedOptionResponseBuilder.class index 1b2af32..b9406f3 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse$AnswerSelectedOptionResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse$AnswerSelectedOptionResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse.class b/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse.class index 813c9b5..c128973 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse.class and b/target/classes/sgis/surveysystem/dto/AnswerSelectedOptionResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/AnswerUpdateRequest.class b/target/classes/sgis/surveysystem/dto/AnswerUpdateRequest.class index 712ec5e..ec2750d 100644 Binary files a/target/classes/sgis/surveysystem/dto/AnswerUpdateRequest.class and b/target/classes/sgis/surveysystem/dto/AnswerUpdateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionCreateRequest.class b/target/classes/sgis/surveysystem/dto/QuestionCreateRequest.class index b25e032..8f9a835 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionCreateRequest.class and b/target/classes/sgis/surveysystem/dto/QuestionCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionOptionCreateRequest.class b/target/classes/sgis/surveysystem/dto/QuestionOptionCreateRequest.class index 57399e3..6c28fc7 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionOptionCreateRequest.class and b/target/classes/sgis/surveysystem/dto/QuestionOptionCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionOptionResponse$QuestionOptionResponseBuilder.class b/target/classes/sgis/surveysystem/dto/QuestionOptionResponse$QuestionOptionResponseBuilder.class index a72b3f9..d84cf06 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionOptionResponse$QuestionOptionResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/QuestionOptionResponse$QuestionOptionResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionOptionResponse.class b/target/classes/sgis/surveysystem/dto/QuestionOptionResponse.class index 8003598..05404fc 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionOptionResponse.class and b/target/classes/sgis/surveysystem/dto/QuestionOptionResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionOptionUpdateRequest.class b/target/classes/sgis/surveysystem/dto/QuestionOptionUpdateRequest.class index b34a7b4..f504fc6 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionOptionUpdateRequest.class and b/target/classes/sgis/surveysystem/dto/QuestionOptionUpdateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionResponse$QuestionResponseBuilder.class b/target/classes/sgis/surveysystem/dto/QuestionResponse$QuestionResponseBuilder.class index 1a4ec23..c0f14d5 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionResponse$QuestionResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/QuestionResponse$QuestionResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionResponse.class b/target/classes/sgis/surveysystem/dto/QuestionResponse.class index 32dc8a8..e39b4b2 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionResponse.class and b/target/classes/sgis/surveysystem/dto/QuestionResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/QuestionUpdateRequest.class b/target/classes/sgis/surveysystem/dto/QuestionUpdateRequest.class index 61899a3..6f34d01 100644 Binary files a/target/classes/sgis/surveysystem/dto/QuestionUpdateRequest.class and b/target/classes/sgis/surveysystem/dto/QuestionUpdateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/RespondentCreateRequest.class b/target/classes/sgis/surveysystem/dto/RespondentCreateRequest.class index 1cb0728..74b85d3 100644 Binary files a/target/classes/sgis/surveysystem/dto/RespondentCreateRequest.class and b/target/classes/sgis/surveysystem/dto/RespondentCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/RespondentResponse$RespondentResponseBuilder.class b/target/classes/sgis/surveysystem/dto/RespondentResponse$RespondentResponseBuilder.class index bb55926..c00dffa 100644 Binary files a/target/classes/sgis/surveysystem/dto/RespondentResponse$RespondentResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/RespondentResponse$RespondentResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/RespondentResponse.class b/target/classes/sgis/surveysystem/dto/RespondentResponse.class index 2b30100..3971445 100644 Binary files a/target/classes/sgis/surveysystem/dto/RespondentResponse.class and b/target/classes/sgis/surveysystem/dto/RespondentResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/RespondentUpdateRequest.class b/target/classes/sgis/surveysystem/dto/RespondentUpdateRequest.class index aba562b..14d6d7f 100644 Binary files a/target/classes/sgis/surveysystem/dto/RespondentUpdateRequest.class and b/target/classes/sgis/surveysystem/dto/RespondentUpdateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyCreateRequest.class b/target/classes/sgis/surveysystem/dto/SurveyCreateRequest.class index 79b148d..7d912bd 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyCreateRequest.class and b/target/classes/sgis/surveysystem/dto/SurveyCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyResponse$SurveyResponseBuilder.class b/target/classes/sgis/surveysystem/dto/SurveyResponse$SurveyResponseBuilder.class index c090765..2fcfdde 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyResponse$SurveyResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/SurveyResponse$SurveyResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyResponse.class b/target/classes/sgis/surveysystem/dto/SurveyResponse.class index 3175d76..2c889f0 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyResponse.class and b/target/classes/sgis/surveysystem/dto/SurveyResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyResponseCreateRequest.class b/target/classes/sgis/surveysystem/dto/SurveyResponseCreateRequest.class index 8cc6025..28d42d8 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyResponseCreateRequest.class and b/target/classes/sgis/surveysystem/dto/SurveyResponseCreateRequest.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyResponseResponse$SurveyResponseResponseBuilder.class b/target/classes/sgis/surveysystem/dto/SurveyResponseResponse$SurveyResponseResponseBuilder.class index eea6236..72df2a3 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyResponseResponse$SurveyResponseResponseBuilder.class and b/target/classes/sgis/surveysystem/dto/SurveyResponseResponse$SurveyResponseResponseBuilder.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyResponseResponse.class b/target/classes/sgis/surveysystem/dto/SurveyResponseResponse.class index cb5501c..08e165d 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyResponseResponse.class and b/target/classes/sgis/surveysystem/dto/SurveyResponseResponse.class differ diff --git a/target/classes/sgis/surveysystem/dto/SurveyUpdateRequest.class b/target/classes/sgis/surveysystem/dto/SurveyUpdateRequest.class index d8430ae..b53bfab 100644 Binary files a/target/classes/sgis/surveysystem/dto/SurveyUpdateRequest.class and b/target/classes/sgis/surveysystem/dto/SurveyUpdateRequest.class differ diff --git a/target/classes/sgis/surveysystem/mapper/AnswerMapper.class b/target/classes/sgis/surveysystem/mapper/AnswerMapper.class index ebd7df2..2b1697b 100644 Binary files a/target/classes/sgis/surveysystem/mapper/AnswerMapper.class and b/target/classes/sgis/surveysystem/mapper/AnswerMapper.class differ diff --git a/target/classes/sgis/surveysystem/mapper/AnswerSelectedOptionMapper.class b/target/classes/sgis/surveysystem/mapper/AnswerSelectedOptionMapper.class index 4839674..b250eb8 100644 Binary files a/target/classes/sgis/surveysystem/mapper/AnswerSelectedOptionMapper.class and b/target/classes/sgis/surveysystem/mapper/AnswerSelectedOptionMapper.class differ diff --git a/target/classes/sgis/surveysystem/mapper/QuestionMapper.class b/target/classes/sgis/surveysystem/mapper/QuestionMapper.class index d0bf783..ab1170a 100644 Binary files a/target/classes/sgis/surveysystem/mapper/QuestionMapper.class and b/target/classes/sgis/surveysystem/mapper/QuestionMapper.class differ diff --git a/target/classes/sgis/surveysystem/mapper/QuestionOptionMapper.class b/target/classes/sgis/surveysystem/mapper/QuestionOptionMapper.class index c429e0a..ac66eb8 100644 Binary files a/target/classes/sgis/surveysystem/mapper/QuestionOptionMapper.class and b/target/classes/sgis/surveysystem/mapper/QuestionOptionMapper.class differ diff --git a/target/classes/sgis/surveysystem/mapper/RespondentMapper.class b/target/classes/sgis/surveysystem/mapper/RespondentMapper.class index 7f507e3..a275cfe 100644 Binary files a/target/classes/sgis/surveysystem/mapper/RespondentMapper.class and b/target/classes/sgis/surveysystem/mapper/RespondentMapper.class differ diff --git a/target/classes/sgis/surveysystem/mapper/SurveyMapper.class b/target/classes/sgis/surveysystem/mapper/SurveyMapper.class index 0d9180f..341248c 100644 Binary files a/target/classes/sgis/surveysystem/mapper/SurveyMapper.class and b/target/classes/sgis/surveysystem/mapper/SurveyMapper.class differ diff --git a/target/classes/sgis/surveysystem/mapper/SurveyResponseMapper.class b/target/classes/sgis/surveysystem/mapper/SurveyResponseMapper.class index 3a2a506..a2811d5 100644 Binary files a/target/classes/sgis/surveysystem/mapper/SurveyResponseMapper.class and b/target/classes/sgis/surveysystem/mapper/SurveyResponseMapper.class differ diff --git a/target/classes/sgis/surveysystem/service/AnswerSelectedOptionService.class b/target/classes/sgis/surveysystem/service/AnswerSelectedOptionService.class index 48fb585..cab7ad4 100644 Binary files a/target/classes/sgis/surveysystem/service/AnswerSelectedOptionService.class and b/target/classes/sgis/surveysystem/service/AnswerSelectedOptionService.class differ diff --git a/target/classes/sgis/surveysystem/service/AnswerService.class b/target/classes/sgis/surveysystem/service/AnswerService.class index 39f7ea7..7a3ee67 100644 Binary files a/target/classes/sgis/surveysystem/service/AnswerService.class and b/target/classes/sgis/surveysystem/service/AnswerService.class differ diff --git a/target/classes/sgis/surveysystem/service/QuestionOptionService.class b/target/classes/sgis/surveysystem/service/QuestionOptionService.class index 70a1148..3fd1fd1 100644 Binary files a/target/classes/sgis/surveysystem/service/QuestionOptionService.class and b/target/classes/sgis/surveysystem/service/QuestionOptionService.class differ diff --git a/target/classes/sgis/surveysystem/service/QuestionService.class b/target/classes/sgis/surveysystem/service/QuestionService.class index ac4e926..2325a2d 100644 Binary files a/target/classes/sgis/surveysystem/service/QuestionService.class and b/target/classes/sgis/surveysystem/service/QuestionService.class differ diff --git a/target/classes/sgis/surveysystem/service/RespondentService.class b/target/classes/sgis/surveysystem/service/RespondentService.class index ee49edd..3209f52 100644 Binary files a/target/classes/sgis/surveysystem/service/RespondentService.class and b/target/classes/sgis/surveysystem/service/RespondentService.class differ diff --git a/target/classes/sgis/surveysystem/service/SurveyResponseService.class b/target/classes/sgis/surveysystem/service/SurveyResponseService.class index 6a7d025..d166ceb 100644 Binary files a/target/classes/sgis/surveysystem/service/SurveyResponseService.class and b/target/classes/sgis/surveysystem/service/SurveyResponseService.class differ diff --git a/target/classes/sgis/surveysystem/service/SurveyService.class b/target/classes/sgis/surveysystem/service/SurveyService.class index 2997e49..bfa9ea7 100644 Binary files a/target/classes/sgis/surveysystem/service/SurveyService.class and b/target/classes/sgis/surveysystem/service/SurveyService.class differ