DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fixed git conflict

main
thkim 2024-05-02 14:34:18 +09:00
parent 860cf39d83 1c9f3405f9
commit 21ac88c0c1
422 changed files with 10415 additions and 4334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.classpath
View File

@ -9,14 +9,12 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@ -36,26 +34,22 @@
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/javaproj-1.0.6.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/javaproj-1.0.6.jar"/>
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/xdoclet-1.2.1.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/xdoclet-1.2.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.5"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.5"/>
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/ClipReport4.0-1.0.0.301.jar"/>
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/jxl.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations"> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/ClipReport4.0-Common.jar"/>
<attributes> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-api-14.5.jar"/>
<attribute name="optional" value="true"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-data-14.5.jar"/>
</attributes> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-main-14.5.jar"/>
</classpathentry> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-metadata-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/ClipReport4.0-1.0.0.301.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-opengis-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/ClipReport4.0-Common.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-referencing-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-api-14.5.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/gt-shapefile-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-data-14.5.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/OpenXLS.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-main-14.5.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/OrgService.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-metadata-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-opengis-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-referencing-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-shapefile-14.5.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/jxl.jar"/>
<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/OpenXLS.jar"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

7
.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.jsdt.core.javascriptValidator"/>
<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>

84
.gitignore vendored
View File

@ -1,55 +1,43 @@
/target /target
.metadata /src/main/webapp/**/**.jar
bin/ /src/main/webapp/**/**.class
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations" HELP.md
*.launch .gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
# PyDev specific (Python IDE for Eclipse) ### STS ###
*.pydevproject .apt_generated
.classpath
# CDT-specific (C/C++ Development Tooling)
.cproject
# CDT- autotools
.autotools
# Java annotation processor (APT)
.factorypath .factorypath
.project
# PDT-specific (PHP Development Tools) .settings
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans .springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/
# Code Recommenders ### IntelliJ IDEA ###
.recommenders/ .idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
# Annotation Processing
.apt_generated/
.apt_generated_test/
# Scala IDE specific (Scala & Java development for Eclipse) # Scala IDE specific (Scala & Java development for Eclipse)
.cache-main .cache-main
@ -61,7 +49,7 @@ local.properties
#.project #.project
.svn .svn
=======
# ---> Java # ---> Java
# Compiled class file # Compiled class file
*.class *.class
@ -88,6 +76,12 @@ local.properties
hs_err_pid* hs_err_pid*
replay_pid* replay_pid*
### VS Code ###
.vscode/
.vs/
# thkim # thkim
.classpath .classpath
.project .project

11
.project
View File

@ -57,15 +57,4 @@
<nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>com.soyatec.additional.Nature</nature> <nature>com.soyatec.additional.Nature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1706861866193</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>

2
.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8

8
.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7

10
.settings/org.eclipse.wst.common.component Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="geoinfo_eGov">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="context-root" value="geoinfo_eGov"/>
<property name="java-output-path" value="/geoinfo_eGov_work/target/classes"/>
</wb-module>
</project-modules>

7
.settings/org.eclipse.wst.common.project.facet.core.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.7"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>

2
.settings/org.eclipse.wst.validation.prefs Normal file
View File

@ -0,0 +1,2 @@
disabled=06target
eclipse.preferences.version=1

20
.springBeans Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[3.7.0.201506251244-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<autoconfigs>
<config>src/main/resources/egovframework/spring/context-properties.xml</config>
<config>src/main/resources/egovframework/spring/context-mybatis.xml</config>
<config>src/main/resources/egovframework/spring/context-common.xml</config>
<config>src/main/resources/egovframework/spring/context-datasource.xml</config>
<config>src/main/resources/egovframework/spring/context-transaction.xml</config>
</autoconfigs>
<configSets>
</configSets>
</beansProjectDescription>

28
README.md
View File

@ -1,28 +0,0 @@
# old-geoinfo-or-kr-user
### 국토지반정보 포털사이트 <https://www.geoinfo.or.kr/>의 기존 사이트 사용자단 소스코드.
---
### 디비엔텍 회사 내 서버에 구축되어 있다.
#### URL:
<https://old-geoinfo-or-kr.dbnt.co.kr/>

6
pom.xml
View File

@ -436,6 +436,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies> </dependencies>

4
src/main/java/geoinfo/com/WebConfirm.java
View File

@ -25,10 +25,10 @@ public class WebConfirm
WebUtil wUtil = new WebUtil(); WebUtil wUtil = new WebUtil();
String user = "geoinfo"; String user = "geoinfo";
String pw = "ictway1!!"; String pw = "geoinfo";
//String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl"; //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl";
/*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/ /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/
String url = "jdbc:oracle:thin:@192.168.10.18:3452:orcl"; String url = "jdbc:oracle:thin:@192.168.0.8:3452:orcl";
/* /*
* public WebConfirm() { this.connection = null; this.connectionPool = null; * public WebConfirm() { this.connection = null; this.connectionPool = null;
* this.query = null; this.resultSet = null; this.sql = ""; this.resultCnt = 0; * this.query = null; this.resultSet = null; this.sql = ""; this.resultCnt = 0;

13
src/main/java/geoinfo/main/join/JoinController.java
View File

@ -328,6 +328,19 @@ public ModelAndView join_post(MultipartRequest multi, Map<String, Object> map,Ht
params.put("companyName2", "0"); params.put("companyName2", "0");
} }
String userId = GeoinfoCommon.parseData(String.valueOf(params.get("userId")));
Pattern pSpecialChar = null;
Matcher match;
int nCharType = 0;
pSpecialChar = Pattern.compile("\\p{Punct}");
match = pSpecialChar.matcher(userId);
if(match.find()) nCharType++;
if(nCharType > 0) {
mv.addObject("msg","alert('아이디에 특수문자를 넣을 수 없습니다.');history.go(-1);");
return mv;
}
String oriPassword = GeoinfoCommon.parseData(String.valueOf(params.get("password"))); String oriPassword = GeoinfoCommon.parseData(String.valueOf(params.get("password")));
passwdCode = checkPw(oriPassword); passwdCode = checkPw(oriPassword);
if(passwdCode.equals("0")) { if(passwdCode.equals("0")) {

418
src/main/java/geoinfo/main/kict/KmcisController.java
View File

@ -1,23 +1,33 @@
package geoinfo.main.kict; package geoinfo.main.kict;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.regex.PatternSyntaxException;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jfree.util.Log; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
/*import egovframework.cmmn.web.SessionManager;*/ /*import egovframework.cmmn.web.SessionManager;*/
import egovframework.rte.fdl.property.EgovPropertyService; import egovframework.rte.fdl.property.EgovPropertyService;
import geoinfo.util.MobileCertificationUtil; import geoinfo.util.MobileCertificationUtil;
@ -30,6 +40,16 @@ public class KmcisController {
private static final Logger LOGGER = LoggerFactory.getLogger(KmcisController.class); private static final Logger LOGGER = LoggerFactory.getLogger(KmcisController.class);
/**
* 2024.02.15 LHJ 본인확인서비스(결과 전송 API 방식) 안전성 강화 조치
* 2023.11.01 LHJ PASS 모바일 인증 요청
*
* @param response
* @param request
* @return ModelAndView
* @throws Exception
*/
/** EgovPropertyService */
@RequestMapping(value = "/mobileCertRequest.do") @RequestMapping(value = "/mobileCertRequest.do")
public ModelAndView mobileCertRequest(HttpServletRequest req, ModelAndView mav) throws Exception { public ModelAndView mobileCertRequest(HttpServletRequest req, ModelAndView mav) throws Exception {
LOGGER.info("KmcisController : 휴대폰 인증 리퀘스트"); LOGGER.info("KmcisController : 휴대폰 인증 리퀘스트");
@ -48,14 +68,22 @@ public class KmcisController {
String cpId = propertiesService.getString("cert.cpId"); // 회원사ID String cpId = propertiesService.getString("cert.cpId"); // 회원사ID
String urlCode = propertiesService.getString("cert.urlCode"); // URL코드 String urlCode = propertiesService.getString("cert.urlCode"); // URL코드
String certMet = "M"; // 본인인증방법(M:휴대폰, C:신용카드, P:공인인증서) String certMet = "M"; // 본인인증방법(M:휴대폰, C:신용카드, P:공인인증서)
String tr_add = "N"; // IFrame사용여부
String plusInfo = ""; // 추가DATA정보
String extendVar = "0000000000000000"; // 확장변수
String tr_url = propertiesService.getString("cert.retUrl"); //인증후 호출 URL
/*
String name = ""; // 성명 String name = ""; // 성명
String phoneNo = ""; // 휴대폰번호 String phoneNo = ""; // 휴대폰번호
String phoneCorp = ""; // 이동통신사(SKT:SKT, KT:KT, LGT:LG U+, SKM:SKTmvno String phoneCorp = ""; // 이동통신사(SKT:SKT, KT:KT, LGT:LG U+, SKM:SKTmvno
String birthDay = ""; // 생년월일(YYYYMMDD) String birthDay = ""; // 생년월일(YYYYMMDD)
String gender = ""; // 성별(0:남, 1:여) String gender = ""; // 성별(0:남, 1:여)
String nation = ""; // 내외국인(0:내국인, 1:외국인) String nation = ""; // 내외국인(0:내국인, 1:외국인)
String plusInfo = ""; // 추가DATA정보 */
/*
LOGGER.info("KmcisController : 휴대폰 인증 리퀘스트 암호화 이전"); LOGGER.info("KmcisController : 휴대폰 인증 리퀘스트 암호화 이전");
tr_cert = MobileCertificationUtil.encryptCertData(cpId, urlCode, certNum, date, certMet, name, phoneNo, phoneCorp, birthDay, gender, nation, plusInfo); tr_cert = MobileCertificationUtil.encryptCertData(cpId, urlCode, certNum, date, certMet, name, phoneNo, phoneCorp, birthDay, gender, nation, plusInfo);
@ -67,19 +95,56 @@ public class KmcisController {
mav.addObject("tr_cert", tr_cert); mav.addObject("tr_cert", tr_cert);
mav.addObject("tr_url", retUrl); mav.addObject("tr_url", retUrl);
*/
//01. 한국모바일인증(주) 암호화 모듈 선언
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
//02. 1차 암호화 (tr_cert 데이터변수 조합 후 암호화)
String enc_tr_cert = "";
tr_cert = cpId +"/"+ urlCode +"/"+ certNum +"/"+ date +"/"+ certMet +"///////"+ plusInfo +"/"+ extendVar;
enc_tr_cert = seed.getEnc(tr_cert, "");
//03. 1차 암호화 데이터에 대한 위변조 검증값 생성 (HMAC)
String hmacMsg = "";
hmacMsg = seed.getMsg(enc_tr_cert);
//04. 2차 암호화 (1차 암호화 데이터, HMAC 데이터, extendVar 조합 후 암호화)
tr_cert = seed.getEnc(enc_tr_cert + "/" + hmacMsg + "/" + extendVar, "");
mav.addObject("tr_cert", tr_cert);
mav.addObject("tr_url", tr_url);
mav.addObject("tr_add", tr_add);
return mav; return mav;
} }
/**
* 2024.02.15 LHJ 본인확인서비스(결과 전송 API 방식) 안전성 강화 조치
* 2023.11.01 LHJ PASS 모바일 인증 응답
*
* @param response
* @param request
* @return ModelAndView
* @throws Exception
*/
@RequestMapping(value = "/mobileCertResult.do") @RequestMapping(value = "/mobileCertResult.do")
public ModelAndView mobileCertResult(HttpServletRequest request, ModelAndView mav, public ModelAndView mobileCertResult(HttpServletRequest request, ModelAndView mav,
RedirectAttributes rda) throws Exception { RedirectAttributes rda) throws Exception {
mav.setViewName("body/kmcis/kmcis_result"); mav.setViewName("body/kmcis/kmcis_result");
LOGGER.info("KmcisController : 휴대폰 인증 완료"); // 변수 -------------------------------------------------------------------------------------------------------------
String api_token = ""; // 토큰값(암호화)
String k_rec_cert = ""; // 결과수신 원본 DATA String message = ""; // JSON 전문
String k_certNum = ""; // 파라미터로 수신한 요청번호 String result_cd = ""; // JSON 결과코드
String result_msg = ""; // JSON 결과-상세
String strResult = ""; // JSON 결과
String apiRecCert = ""; // JSON 전송 데이터
String apiCertNum = ""; // JSON 전송 데이터
String rec_cert = ""; // 결과수신DATA
String k_certNum = ""; // 요청번호 파라미터
String certNum = ""; // 요청번호 String certNum = ""; // 요청번호
String date = ""; // 요청일시 String date = ""; // 요청일시
String CI = ""; // 연계정보(CI) String CI = ""; // 연계정보(CI)
@ -90,67 +155,241 @@ public class KmcisController {
String gender = ""; // 성별 String gender = ""; // 성별
String nation = ""; // 내국인 String nation = ""; // 내국인
String name = ""; // 성명 String name = ""; // 성명
String M_name = ""; // 미성년자 성명 String reserve1 = ""; // 예비필드
String M_birthDay = ""; // 미성년자 생년월일 String reserve2 = ""; // 예비필드
String M_Gender = ""; // 미성년자 성별 String reserve3 = ""; // 예비필드
String M_nation = ""; // 미성년자 내외국인 String reserve4 = ""; // 예비필드
String result = ""; // 결과값 String result = ""; // 결과값
String certMet = ""; // 인증방법 String certMet = ""; // 본인확인방법
String ip = ""; // ip주소 String ip = ""; // ip주소
String plusInfo = ""; String plusInfo = "";
try { String encPara = "";
k_rec_cert = request.getParameter("rec_cert").trim(); // 복호화 하기전 수신값 String encMsg1 = "";
k_certNum = request.getParameter("certNum").trim(); String encMsg2 = "";
String msgChk = "";
LOGGER.info("KmcisController : 휴대폰 인증 완료, rec_cert : " + k_rec_cert + " k_certNum : " + k_certNum); //01. 한국모바일인증(주) 암호화 모듈 선언
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
Map<String, String> certResult = MobileCertificationUtil.decryptCertData(k_rec_cert, k_certNum); try{
// Parameter 수신 --------------------------------------------------------------------
api_token = request.getParameter("apiToken");
LOGGER.info("KmcisController : 휴대폰 인증 완료 복호화 이후 // DI : " + certResult.get("DI") + " name : " + certResult.get("name")); LOGGER.info("KmcisController : 휴대폰 인증 완료, "+ api_token);
certNum = certResult.get("certNum"); // 파라미터 유효성 검증
date = certResult.get("date"); if(api_token.length() == 0 ){
CI = certResult.get("CI"); LOGGER.info("KmcisController : 토큰값 비정상");
phoneNo = certResult.get("phoneNo"); rda.addFlashAttribute("msg", "인증에 실패하였습니다.");
phoneCorp = certResult.get("phoneCorp"); mav.setViewName("redirect:topMenuSelect.do?url=join");
birthDay = certResult.get("birthDay"); return mav;
gender = certResult.get("gender");
nation = certResult.get("nation");
name = certResult.get("name");
result = certResult.get("result");
certMet = certResult.get("certMet");
ip = certResult.get("ip");
M_name = certResult.get("M_name");
M_birthDay = certResult.get("M_birthDay");
M_Gender = certResult.get("M_Gender");
M_nation = certResult.get("M_nation");
plusInfo = certResult.get("plusInfo");
DI = certResult.get("DI");
/** 수신내역 유효성 검증 **/
// 현재 서버시각 구하기
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss",Locale.KOREAN);
String strCurrentTime = formatter.format(new Date());
Date toDate = formatter.parse(strCurrentTime);
Date fromDate = formatter.parse(date);
long timediff = toDate.getTime()-fromDate.getTime();
if(timediff < -30*60*1000 || 30*60*100 < timediff ) {
throw new Exception("비정상적인 접근입니다. (요청시간경과)");
}else {
// 사용자 IP 구하기
String client_ip = request.getHeader("HTTP_X_FORWARDED_FOR");
if(client_ip != null) {
if(client_ip.indexOf(",") != -1) { client_ip = client_ip.substring(0,client_ip.indexOf(",")); }
} }
if(client_ip == null || client_ip.length() == 0) { client_ip = request.getRemoteAddr(); } //현재시각 세팅(YYYYMMDDHI24MISS)
if(!client_ip.equals(ip) ) { Calendar today = Calendar.getInstance();
//sMessage = "비정상적인 접근입니다. (IP불일치)"; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String api_date = sdf.format(today.getTime());
//api_token 복호화
api_token = seed.getDec(api_token, k_certNum);
// 파라미터 유효성 검증
if( api_token.length() == 0 ){
LOGGER.info("KmcisController : 토큰값 비정상(복호화 후)");
rda.addFlashAttribute("msg", "인증에 실패하였습니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join");
return mav;
} }
// 1. URL 설정
String serverURL = "https://www.kmcert.com/kmcis/api/kmcisToken_api.jsp";
// 2. 연결 생성
URL url = new URL(serverURL);
// 3. HttpURLConnection 객체 생성.
HttpURLConnection con = null;
OutputStream wr = null;
BufferedReader bufferedReader = null;
// 4. URL 연결 (웹페이지 URL 연결.)
con = (HttpURLConnection)url.openConnection();
con.setConnectTimeout(20000); // TimeOut 시간 (서버 접속시 연결 시간 - 20초)
con.setReadTimeout(20000); // TimeOut 시간 (Read시 연결 시간 - 20초)
con.setDoOutput(true); // OutputStream으로 POST 데이터를 넘겨주겠다는 옵션.
con.setRequestProperty("Content-Type", "application/json;charset=utf-8"); // 타입설정(application/json) 형식으로 전송 (Request Body 전달시 application/json로 서버에 전달.)
con.setRequestProperty("Accept", "application/json"); // 서버 Response Data를 JSON 형식의 타입으로 요청.
con.setRequestMethod("POST"); // 요청 방식 선택 (POST)
// 5. JSON 전문 구성
JSONObject jsonData = new JSONObject();
jsonData.put("apiToken", api_token);
jsonData.put("apiDate", api_date);
message = jsonData.toString();
// 6. 전송
// Request Body에 Data를 담기위해 OutputStream 객체를 생성.
wr = con.getOutputStream();
// Request Body에 Data 셋팅.(한글깨짐 방지를 위해 utf-8인코딩 처리
wr.write(message.getBytes("utf-8"));
wr.flush();
wr.close();
// 실제 서버로 Request 요청 하는 부분. (응답 코드를 받는다. 200 성공, 나머지 에러)
int responseCode = con.getResponseCode();
// 4. 결과 수신
if(responseCode == 200){
bufferedReader = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
}else{
bufferedReader = new BufferedReader(new InputStreamReader(con.getErrorStream(), "UTF-8"));
} }
if(bufferedReader != null){
StringBuilder stringBuilder = new StringBuilder();
String line = "";
while((line = bufferedReader.readLine()) != null){
stringBuilder.append(line);
}
bufferedReader.close();
String stringRet = stringBuilder.toString();
// 5. 넘어온 문자열을 JSON 객체로 변환
JSONParser jsonParser = new JSONParser();
//JSON데이터를 넣어 JSON Object 로 만들어 준다.
JSONObject jsonObj = (JSONObject)jsonParser.parse(stringRet);
// 6. JSON 객체에서 데이터 가져오기
if(jsonObj.get("result_cd") != null){
result_cd = jsonObj.get("result_cd").toString();
if(result_cd.equals("APR01")){
//통신성공
strResult = "Y";
rec_cert = jsonObj.get("apiRecCert").toString();
k_certNum = jsonObj.get("apiCertNum").toString();
}else if(result_cd.equals("APR02")){
//실패 - Token Expire
strResult = "N";
result_msg = "실패 - Token Expire";
}else if(result_cd.equals("APR03")){
//실패 - Token Not Found
strResult = "N";
result_msg = "실패 - Token Not Found";
}else if(result_cd.equals("APR04")){
//실패 - API 요청일시 길이 오류
strResult = "N";
result_msg = "실패 - API 요청일시 길이 오류";
}else if(result_cd.equals("APR05")){
//실패 - API 토큰 길이 오류
strResult = "N";
result_msg = "실패 - API 토큰 길이 오류";
}else if(result_cd.equals("APR06")){
//실패 - 결과전송 재요청(3회 제한)
strResult = "N";
result_msg = "실패 - 결과전송 재요청(3회 제한)";
}
}else{
//JSON 결과코드 에러
strResult = "F";
}
}else{ //timeout except 처리
strResult = "F";
}
// 파라미터 유효성 검증
if(!strResult.equals("Y")){
LOGGER.info("KmcisController : 결과값 비정상, 결과코드 : " + result_cd + ", 상세내용 : " + result_msg);
rda.addFlashAttribute("msg", "인증에 실패하였습니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join");
return mav;
}
/*
//02. 1차 복호화
rec_cert = seed.getDec(rec_cert, k_certNum);
//03. 1차 파싱
int inf1 = rec_cert.indexOf("/",0);
int inf2 = rec_cert.indexOf("/",inf1+1);
encPara = rec_cert.substring(0,inf1); //암호화된 통합 파라미터
encMsg1 = rec_cert.substring(inf1+1,inf2); //암호화된 통합 파라미터의 Hash값
//04. 위변조 검증
encMsg2 = seed.getMsg(encPara);
if(encMsg2.equals(encMsg1)){
msgChk="Y";
}
if(msgChk.equals("N")){
LOGGER.info("KmcisController : Hash값 위변조");
rda.addFlashAttribute("msg", "인증에 실패하였습니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join");
return mav;
}
//05. 2차 복호화
rec_cert = seed.getDec(encPara, k_certNum);
//06. 2차 파싱
int info1 = rec_cert.indexOf("/",0);
int info2 = rec_cert.indexOf("/",info1+1);
int info3 = rec_cert.indexOf("/",info2+1);
int info4 = rec_cert.indexOf("/",info3+1);
int info5 = rec_cert.indexOf("/",info4+1);
int info6 = rec_cert.indexOf("/",info5+1);
int info7 = rec_cert.indexOf("/",info6+1);
int info8 = rec_cert.indexOf("/",info7+1);
int info9 = rec_cert.indexOf("/",info8+1);
int info10 = rec_cert.indexOf("/",info9+1);
int info11 = rec_cert.indexOf("/",info10+1);
int info12 = rec_cert.indexOf("/",info11+1);
int info13 = rec_cert.indexOf("/",info12+1);
int info14 = rec_cert.indexOf("/",info13+1);
int info15 = rec_cert.indexOf("/",info14+1);
int info16 = rec_cert.indexOf("/",info15+1);
int info17 = rec_cert.indexOf("/",info16+1);
int info18 = rec_cert.indexOf("/",info17+1);
certNum = rec_cert.substring(0,info1);
date = rec_cert.substring(info1+1,info2);
CI = rec_cert.substring(info2+1,info3);
phoneNo = rec_cert.substring(info3+1,info4);
phoneCorp = rec_cert.substring(info4+1,info5);
birthDay = rec_cert.substring(info5+1,info6);
gender = rec_cert.substring(info6+1,info7);
nation = rec_cert.substring(info7+1,info8);
name = rec_cert.substring(info8+1,info9);
result = rec_cert.substring(info9+1,info10);
certMet = rec_cert.substring(info10+1,info11);
ip = rec_cert.substring(info11+1,info12);
reserve1 = rec_cert.substring(info12+1,info13);
reserve2 = rec_cert.substring(info13+1,info14);
reserve3 = rec_cert.substring(info14+1,info15);
reserve4 = rec_cert.substring(info15+1,info16);
plusInfo = rec_cert.substring(info16+1,info17);
DI = rec_cert.substring(info17+1,info18);
//07. CI, DI 복호화
CI = seed.getDec(CI, k_certNum);
DI = seed.getDec(DI, k_certNum);
LOGGER.info("KmcisController : 복호화 완료");
mav.addObject("certNum", certNum); mav.addObject("certNum", certNum);
mav.addObject("date", date); mav.addObject("date", date);
mav.addObject("CI", CI); mav.addObject("CI", CI);
@ -163,30 +402,87 @@ public class KmcisController {
mav.addObject("result", result); mav.addObject("result", result);
mav.addObject("certMet", certMet); mav.addObject("certMet", certMet);
mav.addObject("ip", ip); mav.addObject("ip", ip);
mav.addObject("M_name", M_name);
mav.addObject("M_birthDay", M_birthDay);
mav.addObject("M_Gender", M_Gender);
mav.addObject("M_nation", M_nation);
mav.addObject("plusInfo", plusInfo); mav.addObject("plusInfo", plusInfo);
mav.addObject("DI", DI); mav.addObject("DI", DI);
mav.addObject("recCert", k_rec_cert); mav.addObject("recCert", rec_cert);
} catch(IndexOutOfBoundsException ex){ */
mav.addObject("certNum", k_certNum);
mav.addObject("recCert", rec_cert);
}catch(StringIndexOutOfBoundsException ex){
LOGGER.error("[KMCIS] Receive Error -"+ ex); LOGGER.error("[KMCIS] Receive Error -"+ ex);
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근"); LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다."); rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join"); mav.setViewName("redirect:topMenuSelect.do?url=join");
} catch(NumberFormatException ex){ }catch(NullPointerException ex){
LOGGER.error("[KMCIS] Receive Error -"+ ex); LOGGER.error("[KMCIS] Receive Error -"+ ex);
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근"); LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다."); rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join"); mav.setViewName("redirect:topMenuSelect.do?url=join");
} catch(Exception ex){ }catch(NumberFormatException ex){
LOGGER.error("[KMCIS] Receive Error -"+ ex);
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join");
}catch(PatternSyntaxException ex){
LOGGER.error("[KMCIS] Receive Error -"+ ex);
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join");
}catch(IllegalStateException ex){
LOGGER.error("[KMCIS] Receive Error -"+ ex);
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join");
}catch(IndexOutOfBoundsException ex){
LOGGER.error("[KMCIS] Receive Error -"+ ex); LOGGER.error("[KMCIS] Receive Error -"+ ex);
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근"); LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다."); rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=join"); mav.setViewName("redirect:topMenuSelect.do?url=join");
} }
/** 기업회원 비밀번호 초기화 시 필요 */
String changePhone = "";
String changePhone1 = "";
String changePhone2 = "";
String changePhone3 = "";
try {
Map<String, String> certResult = MobileCertificationUtil.decryptCertData(rec_cert, k_certNum);
name = certResult.get("name");
phoneNo = certResult.get("phoneNo");
changePhone = phoneNo.substring(0, 3) + "-" + phoneNo.substring(3, 7) + "-" + phoneNo.substring(7);
changePhone1 = phoneNo.substring(0, 3);
changePhone2 = phoneNo.substring(3, 7);
changePhone3 = phoneNo.substring(7);
}
catch(IndexOutOfBoundsException ex){
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=joinsearch");
return mav;
}
catch(NumberFormatException ex){
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=joinsearch");
return mav;
}
catch(Exception ex){
LOGGER.info("KmcisController : 휴대폰 인증 완료 // 잘못된 접근");
rda.addFlashAttribute("msg", "잘못된 접근입니다.");
mav.setViewName("redirect:topMenuSelect.do?url=joinsearch");
return mav;
}
mav.addObject("name", name);
mav.addObject("changePhone", changePhone);
mav.addObject("changePhone1", changePhone1);
mav.addObject("changePhone2", changePhone2);
mav.addObject("changePhone3", changePhone3);
return mav; return mav;
} }
} }

312
src/main/java/geoinfo/main/login/LoginController.java
View File

@ -34,12 +34,9 @@ import javax.xml.bind.DatatypeConverter;
import org.apache.commons.collections.map.MultiValueMap; import org.apache.commons.collections.map.MultiValueMap;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jfree.util.Log; import org.jfree.util.Log;
import org.json.simple.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -86,12 +83,6 @@ public class LoginController {
@Resource(name="egovMessageSource") @Resource(name="egovMessageSource")
EgovMessageSource egovMessageSource; EgovMessageSource egovMessageSource;
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
private static boolean loginFlag = true; private static boolean loginFlag = true;
private static MultiValueMap users = new MultiValueMap(); private static MultiValueMap users = new MultiValueMap();
@ -101,7 +92,7 @@ public class LoginController {
return sessionList; return sessionList;
} }
// private static ConcurrentHashMap<String, HttpSession> users = new ConcurrentHashMap<>(); // private static ConcurrentHashMap<String, HttpSession> users = new ConcurrentHashMap<>();
// 통합사이트 아이디 변경 // 통합사이트 아이디 변경
@RequestMapping(value = "idChange.do") @RequestMapping(value = "idChange.do")
@ -238,11 +229,13 @@ public class LoginController {
String name = ""; String name = "";
String DI = ""; String DI = "";
String phoneNo = "";
try { try {
Map<String, String> certResult = MobileCertificationUtil.decryptCertData(hdnCertification, hdnCertNum); Map<String, String> certResult = MobileCertificationUtil.decryptCertData(hdnCertification, hdnCertNum);
name = certResult.get("name"); name = certResult.get("name");
DI = certResult.get("DI"); DI = certResult.get("DI");
phoneNo = certResult.get("phoneNo");
} }
catch(IndexOutOfBoundsException ex){ catch(IndexOutOfBoundsException ex){
rda.addFlashAttribute("msg", "잘못된 접근입니다."); rda.addFlashAttribute("msg", "잘못된 접근입니다.");
@ -588,9 +581,18 @@ public class LoginController {
// 로그인 // 로그인
@RequestMapping(value = "/login.do", method = RequestMethod.POST) @RequestMapping(value = "/login.do", method = RequestMethod.POST)
public ModelAndView login(HttpSession session, Map<String, Object> map, HttpServletRequest request, HttpServletResponse response, @RequestParam("location") String location, @RequestParam("login_param") String login_param, @RequestParam("id") String id, @RequestParam("cls") String cls, @RequestParam("pass") String pass) throws Exception { public ModelAndView login(
HttpSession session,
Map<String, Object> map,
HttpServletRequest request,
HttpServletResponse response,
@RequestParam("location") String location,
@RequestParam("login_param") String login_param,
@RequestParam("id") String id,
@RequestParam("pass") String pass) throws Exception {
ModelAndView mv = new ModelAndView("home/login"); ModelAndView mv = new ModelAndView("home/login");
String cls = "";
String msg = ""; String msg = "";
String url = ""; String url = "";
String sysdate = ""; String sysdate = "";
@ -611,10 +613,6 @@ public class LoginController {
try { try {
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
clientIp = request.getRemoteAddr(); clientIp = request.getRemoteAddr();
if(clientIp != "0:0:0:0:0:0:0:1") { if(clientIp != "0:0:0:0:0:0:0:1") {
@ -650,7 +648,6 @@ public class LoginController {
map.put("passwd", pass); map.put("passwd", pass);
map.put("passwd2", pass2); map.put("passwd2", pass2);
map.put("cls", cls);
boolean loginSuccess = false; boolean loginSuccess = false;
String dup_id; String dup_id;
@ -708,7 +705,6 @@ public class LoginController {
map.put("passwd", pass); map.put("passwd", pass);
map.put("passwd2", pass2); map.put("passwd2", pass2);
map.put("cls", cls);
selectWebMemberIn = loginService.selectWebMemberIn(map); selectWebMemberIn = loginService.selectWebMemberIn(map);
if(selectWebMemberIn == null) { if(selectWebMemberIn == null) {
@ -727,7 +723,6 @@ public class LoginController {
}else { }else {
// 관리자일 경우 // 관리자일 경우
map.put("userid", userid); map.put("userid", userid);
map.put("cls", "9");
selectWebMemberIn = loginService.selectWebMemberIn(map); selectWebMemberIn = loginService.selectWebMemberIn(map);
map.clear(); map.clear();
@ -750,11 +745,14 @@ public class LoginController {
cls = selectWebMemberIn.get("cls").toString(); cls = selectWebMemberIn.get("cls").toString();
if (!"".equals(request.getSession()) && !request.getSession().equals(null)) { if (!"".equals(request.getSession()) && !request.getSession().equals(null)) {
request.getSession().setAttribute("USERID", userid); session = request.getSession();
request.getSession().setAttribute("USERNAME", userName); session.setAttribute("USERID", userid);
request.getSession().setAttribute("MASTERCODE", masterCode); session.setAttribute("USERNAME", userName);
request.getSession().setAttribute("CLS", cls); session.setAttribute("MASTERCODE", masterCode);
request.getSession().setAttribute("GOVECODE", goveCode); session.setAttribute("CLS", cls);
session.setAttribute("GOVECODE", goveCode);
session.setMaxInactiveInterval(43200);
// 2017.10.13 dhlee 세션 ip , 환경 추가 // 2017.10.13 dhlee 세션 ip , 환경 추가
InetAddress ip = InetAddress.getLocalHost(); InetAddress ip = InetAddress.getLocalHost();
@ -772,8 +770,6 @@ public class LoginController {
map.put("userid", userid); map.put("userid", userid);
map.put("passwd", pass); map.put("passwd", pass);
map.put("passwd2", pass2); map.put("passwd2", pass2);
map.put("cls", cls);
map.put("cls2", "2");
selectWebMemberIn = loginService.selectWebMemberIn(map); selectWebMemberIn = loginService.selectWebMemberIn(map);
map.clear(); map.clear();
@ -795,11 +791,13 @@ public class LoginController {
cls = selectWebMemberIn.get("cls").toString(); cls = selectWebMemberIn.get("cls").toString();
goveCode = selectWebMemberIn.get("govement_code").toString(); goveCode = selectWebMemberIn.get("govement_code").toString();
request.getSession().setAttribute("USERID", userid); session = request.getSession();
request.getSession().setAttribute("USERNAME", userName); session.setAttribute("USERID", userid);
request.getSession().setAttribute("MASTERCODE", masterCode); session.setAttribute("USERNAME", userName);
request.getSession().setAttribute("CLS", cls); session.setAttribute("MASTERCODE", masterCode);
request.getSession().setAttribute("GOVECODE", goveCode); session.setAttribute("CLS", cls);
session.setAttribute("GOVECODE", goveCode);
session.setMaxInactiveInterval(43200);
// 2017.10.13 dhlee 세션 ip , 환경 추가 // 2017.10.13 dhlee 세션 ip , 환경 추가
InetAddress ip = InetAddress.getLocalHost(); InetAddress ip = InetAddress.getLocalHost();
@ -965,21 +963,16 @@ public class LoginController {
} }
} }
transactionManager.commit(status);
} catch(NumberFormatException e) { } catch(NumberFormatException e) {
transactionManager.rollback(status);
Log.debug("error", e); Log.debug("error", e);
affectRow = 0; affectRow = 0;
} catch(MalformedURLException e) { } catch(MalformedURLException e) {
transactionManager.rollback(status);
Log.debug("error", e); Log.debug("error", e);
affectRow = 0; affectRow = 0;
} catch(ParseException e) { } catch(ParseException e) {
transactionManager.rollback(status);
Log.debug("error", e); Log.debug("error", e);
affectRow = 0; affectRow = 0;
} catch(Exception e) { } catch(Exception e) {
transactionManager.rollback(status);
Log.debug("error", e); Log.debug("error", e);
affectRow = 0; affectRow = 0;
} }
@ -1030,7 +1023,7 @@ public class LoginController {
// 마이페이지 // 마이페이지
@RequestMapping(value = "/mypage.do") // @RequestMapping(value = "/mypage.do")
public ModelAndView mypage(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) throws Exception { public ModelAndView mypage(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mv = new ModelAndView("body/mypage/mypage"); ModelAndView mv = new ModelAndView("body/mypage/mypage");
@ -1335,9 +1328,17 @@ public class LoginController {
return mv; return mv;
} }
// 마이페이지 비밀번호 수정 //비밀번호 수정 인증 화면 이동
@RequestMapping(value = "/mypage_passch.do") @RequestMapping(value="/passch.do")
public ModelAndView mypage_passch(HttpServletRequest request, HttpServletResponse response) throws Exception { public ModelAndView passch(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) throws Exception{
ModelAndView mv = new ModelAndView("body/mypage/pre_passch");
return mv;
}
//20240311 LHJ 마이페이지 비밀번호 수정 휴대폰 인증 추가
@RequestMapping(value = "/passch_accept.do")
public ModelAndView passch_accept(HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mv = new ModelAndView("body/mypage/passch"); ModelAndView mv = new ModelAndView("body/mypage/passch");
if (request.getSession().getAttribute("USERID") == null) { if (request.getSession().getAttribute("USERID") == null) {
@ -1345,27 +1346,129 @@ public class LoginController {
return mv; return mv;
} }
String userId = String.valueOf(request.getSession().getAttribute("USERID")); return mv;
String cls = "";
Map<String, Object> map = new HashMap<String, Object>();
map.put("userid", userId);
map.put("fields", "PASSWD, CLS, VIRTUALNO");
map.put("where", "TRIM(USERID) = '" + userId + "'");
Map<String, Object> result = loginService.selectWebMemberIn1(map);
if (result != null) {
String temp = result.get("passwd").toString();
mv.addObject("userid", userId);
//mv.addObject("passwd", result.get("passwd"));
cls = String.valueOf(result.get("cls"));
if ("0".equals(cls)) {
} else {
mv.addObject("ipin", "");
} }
// 마이페이지 비밀번호 확인
@RequestMapping(value = "/post_passch.do")
public ModelAndView post_passch(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response, Map<String, Object> map) throws Exception {
ModelAndView mv = new ModelAndView("body/mypage/pass_change");
String passwdCode;
// 로그인 세션이 없을 때
if (request.getSession().getAttribute("USERID") == null) {
mv.setViewName("index.do?cntyn=0");
return mv;
}
String hdnCertNum = request.getParameter("hdnCertNum");
String hdnCertification = request.getParameter("hdnCertification");
String SessionuserId = request.getSession().getAttribute("USERID").toString();
String DI = "";
log.info("인증값 : hdnCertNum : " + hdnCertNum + " hdnCertification : " + hdnCertification);
try {
log.info("휴대폰 복호화 이전");
Map<String, String> certResult = MobileCertificationUtil.decryptCertData(hdnCertification, hdnCertNum);
DI = certResult.get("DI");
log.info("휴대폰 인증 복호화 이후");
log.info("복호화 값 name : " + certResult.get("name") + " DI : " + DI);
map.clear();
map.put("userId", SessionuserId);
map.put("DI", DI);
int checkWebMember = loginService.checkWebMemberIn(map);
if(checkWebMember == 0) {
log.info("LoginController 회원여부 확인");
mv.addObject("msg", "<script>alert('휴대폰 인증정보와 회원정보가 일치하지 않습니다.');history.go(-1);</script>");
return mv;
}
}
catch(IndexOutOfBoundsException ex){
log.info("비밀번호 수정 모바일인증 토큰 변조 감지");
mv.addObject("msg", "<script>alert('잘못된 접근입니다.');history.go(-1);</script>");
}
catch(NumberFormatException ex){
log.info("비밀번호 수정 모바일인증 토큰 변조 감지");
mv.addObject("msg", "<script>alert('잘못된 접근입니다.');history.go(-1);</script>");
}
catch(Exception ex){
log.info("비밀번호 수정 모바일인증 토큰 변조 감지");
mv.addObject("msg", "<script>alert('잘못된 접근입니다.');history.go(-1);</script>");
}
String passwordch = GeoinfoCommon.parseData(String.valueOf(params.get("passwordch")));
String passwordch2 = GeoinfoCommon.parseData(String.valueOf(params.get("passwordch2")));
if(!passwordch.equals(passwordch2)) {
mv.addObject("msg", "<script>alert('신규 비밀번호가 일치하지 않습니다.');history.go(-1);</script>");
return mv;
}
//신규 비밀번호가 기존 비밀번호와 같은지 확인
map.clear();
map.put("userid", SessionuserId);
map.put("passwd", passwordch);
map.put("passwd2", ScriptUtil.getSha256((String.valueOf(params.get("passwordch"))), "UTF-8").substring(0, 20));
Map<String, Object> result = loginService.selectWebMemberIn(map);
if(result != null) {
mv.addObject("msg", "<script>alert('기존 비밀번호와 같은 비밀번호로 변경할 수 없습니다.');history.go(-1);</script>");
return mv;
}
passwdCode = checkPw(passwordch);
if(passwdCode.equals("0")) {
passwordch = ScriptUtil.getSha256(passwordch, "UTF-8").substring(0, 20);
params.put("password", passwordch);
}else if(passwdCode.equals("1")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 없습니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("2")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 10자리 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("3")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 2개의 조합이지만, 10자리 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("4")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 3개의 조합이지만, 10자리 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("5")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 2개의 조합 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("6")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 3자리 이상 연속된 값이 포함되었습니다. (ex. abc,def,123)');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("7")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 키보드 조합으로 3자리 이상 연속된 값이 포함되었습니다. (ex. asd,qwe)');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("8")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 3자리 이상 같은 값이 포함되었습니다. (ex. aaa,222)');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("9")) {
mv.addObject("msg","<script>alert('문제가 발생했습니다.');history.go(-1);</script>");
return mv;
}
int affectedRows = 0;
map.clear();
map.put("table", "WEB_MEMBER_IN");
map.put("values", "PSWD_MONTH=SYSDATE, PASSWD='" + passwordch + "'");
map.put("where", "TRIM(USERID)='" + SessionuserId + "'");
affectedRows = loginService.userUpdate(map);
if (affectedRows > 0) {
request.getSession().setAttribute("pswd_month", "N");
mv.addObject("msg", "<script>alert('비밀번호 수정이 정상적으로 처리되었습니다.');parent.window.location.href='index.do?cntyn=0'</script>");
} else {
mv.addObject("msg", "<script>alert('문제가 발생했습니다.');parent.window.location.href='index.do?cntyn=0'</script>");
} }
return mv; return mv;
@ -1498,92 +1601,6 @@ public class LoginController {
} }
} }
// 마이페이지 비밀번호 확인
@RequestMapping(value = "/pass_change.do")
public ModelAndView pass_change(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response, Map<String, Object> map) throws Exception {
ModelAndView mv = new ModelAndView("body/mypage/pass_change");
String passwdCode;
// 로그인 세션이 없을 때
if (request.getSession().getAttribute("USERID") == null) {
mv.setViewName("index.do?cntyn=0");
return mv;
}
String userId = GeoinfoCommon.parseData(String.valueOf(params.get("userId")));
String oriPassword = GeoinfoCommon.parseData(String.valueOf(params.get("passwordpre")));
oriPassword = ScriptUtil.getSha256(oriPassword, "UTF-8").substring(0, 20);
map.put("userid", userId);
map.put("passwd", oriPassword);
map.put("passwd2", ScriptUtil.getSha256((String.valueOf(params.get("passwordpre"))), "UTF-8").substring(0, 20));
//현재비밀번호가 맞는지 확인
Map<String, Object> result = loginService.selectWebMemberIn(map);
String passwordch = GeoinfoCommon.parseData(String.valueOf(params.get("passwordch")));
String passwordch2 = GeoinfoCommon.parseData(String.valueOf(params.get("passwordch2")));
if(result == null) {
mv.addObject("msg", "<script>alert('현재 비밀번호가 일치하지 않습니다.');window.location.href='mypageCh.do?userid=" + userId + "'</script>");
return mv;
}
if(!passwordch.equals(passwordch2)) {
mv.addObject("msg", "<script>alert('신규 비밀번호가 일치하지 않습니다.');window.location.href='mypageCh.do'</script>");
return mv;
}
passwdCode = checkPw(passwordch);
if(passwdCode.equals("0")) {
passwordch = ScriptUtil.getSha256(passwordch, "UTF-8").substring(0, 20);
params.put("password", passwordch);
}else if(passwdCode.equals("1")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 없습니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("2")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 10자리 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("3")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 2개의 조합이지만, 10자리 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("4")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 3개의 조합이지만, 10자리 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("5")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 2개의 조합 미만입니다.');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("6")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 3자리 이상 연속된 값이 포함되었습니다. (ex. abc,def,123)');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("7")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 키보드 조합으로 3자리 이상 연속된 값이 포함되었습니다. (ex. asd,qwe)');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("8")) {
mv.addObject("msg","<script>alert('입력된 패스워드가 3자리 이상 같은 값이 포함되었습니다. (ex. aaa,222)');history.go(-1);</script>");
return mv;
}else if(passwdCode.equals("9")) {
mv.addObject("msg","<script>alert('에러입니다');history.go(-1);</script>");
return mv;
}
//String changePass = ScriptUtil.getSha256(passwordch, "UTF-8").substring(0, 20);
int affectedRows = 0;
map.clear();
map.put("table", "WEB_MEMBER_IN");
map.put("values", "PSWD_MONTH=SYSDATE, PASSWD='" + passwordch + "'");
map.put("where", "TRIM(USERID)='" + userId + "'");
affectedRows = loginService.userUpdate(map);
if (affectedRows > 0) {
request.getSession().setAttribute("pswd_month", "N");
mv.addObject("msg", "<script>alert('정상적으로 수정 되었습니다.');parent.window.location.href='index.do?cntyn=0'</script>");
} else {
mv.addObject("msg", "<script>alert('오류입니다.');parent.window.location.href='index.do?cntyn=0'</script>");
}
return mv;
}
/* /*
// 마이페이지 뷰 // 마이페이지 뷰
// 미사용 페이지 // 미사용 페이지
@ -2492,6 +2509,7 @@ public class LoginController {
@RequestMapping(value = "/searchCompanyNumber.do") @RequestMapping(value = "/searchCompanyNumber.do")
public String searchCompanyNumber(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception { public String searchCompanyNumber(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
List<EgovMap> result = loginService.selectSearchCompanyNumber(params); List<EgovMap> result = loginService.selectSearchCompanyNumber(params);
model.put("result", result); model.put("result", result);
@ -2649,6 +2667,4 @@ public class LoginController {
return null; return null;
} }
} }

2
src/main/java/geoinfo/main/login/service/LoginMapper.java
View File

@ -94,5 +94,5 @@ public interface LoginMapper {
EgovMap selectSearchIniUserId(Map<String, Object> params); EgovMap selectSearchIniUserId(Map<String, Object> params);
public int checkWebMemberIn(Map<String, Object> map) throws Exception;
} }

2
src/main/java/geoinfo/main/login/service/LoginService.java
View File

@ -53,4 +53,6 @@ public interface LoginService {
List<EgovMap> selectSearchCompanyNumber(Map<String, Object> params) throws Exception; List<EgovMap> selectSearchCompanyNumber(Map<String, Object> params) throws Exception;
EgovMap searchUserIdInformation(Map<String, Object> params) throws Exception; EgovMap searchUserIdInformation(Map<String, Object> params) throws Exception;
EgovMap selectSearchIniUserId(Map<String, Object> params) throws Exception; EgovMap selectSearchIniUserId(Map<String, Object> params) throws Exception;
int checkWebMemberIn(Map<String, Object> map) throws Exception;
} }

23
src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java
View File

@ -24,9 +24,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
@ -43,12 +40,6 @@ public class LoginServiceImpl implements LoginService{
@Resource(name="loginMapper") @Resource(name="loginMapper")
private LoginMapper loginMapper; private LoginMapper loginMapper;
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
@Override @Override
public Map<String, Object> selectWebDupMember(Map<String, Object> map) throws Exception { public Map<String, Object> selectWebDupMember(Map<String, Object> map) throws Exception {
return loginMapper.selectWebDupMember(map); return loginMapper.selectWebDupMember(map);
@ -337,10 +328,6 @@ public class LoginServiceImpl implements LoginService{
map.put("idx", request.getParameter("idx")); map.put("idx", request.getParameter("idx"));
if(request.getParameter("content") != null) map.put("content", request.getParameter("content")); // 추후삭제 if(request.getParameter("content") != null) map.put("content", request.getParameter("content")); // 추후삭제
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
try{ try{
// 활용사례 DB 등록 // 활용사례 DB 등록
int cnt = loginMapper.savePrcUseCase(map); int cnt = loginMapper.savePrcUseCase(map);
@ -354,21 +341,16 @@ public class LoginServiceImpl implements LoginService{
if(!prcUseSaveName.equals("")) FileUtil.writeUploadedFile(prcUseFile, prcUseSaveName, savePath); if(!prcUseSaveName.equals("")) FileUtil.writeUploadedFile(prcUseFile, prcUseSaveName, savePath);
if(!referSaveName.equals("")) FileUtil.writeUploadedFile(referFile, referSaveName, savePath); if(!referSaveName.equals("")) FileUtil.writeUploadedFile(referFile, referSaveName, savePath);
} }
transactionManager.commit(status);
} catch(FileNotFoundException e){ } catch(FileNotFoundException e){
transactionManager.rollback(status);
logger.debug("error", e); logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!"); throw new Exception("PrcUseCase Save Exception!!");
} catch(NumberFormatException e){ } catch(NumberFormatException e){
transactionManager.rollback(status);
logger.debug("error", e); logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!"); throw new Exception("PrcUseCase Save Exception!!");
} catch(IndexOutOfBoundsException e){ } catch(IndexOutOfBoundsException e){
transactionManager.rollback(status);
logger.debug("error", e); logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!"); throw new Exception("PrcUseCase Save Exception!!");
} catch(Exception e){ } catch(Exception e){
transactionManager.rollback(status);
logger.debug("error", e); logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!"); throw new Exception("PrcUseCase Save Exception!!");
} }
@ -508,4 +490,9 @@ public class LoginServiceImpl implements LoginService{
return loginMapper.getMember(userId); return loginMapper.getMember(userId);
} }
@Override
public int checkWebMemberIn(Map<String, Object> map) throws Exception {
return loginMapper.checkWebMemberIn(map);
}
} }

677
src/main/java/geoinfo/main/main/MainController.java
View File

@ -406,10 +406,49 @@ public class MainController
} }
else if (url.equals("mypage_passch")) else if (url.equals("mypage_passch"))
{ {
eGovUrl = "passch.do";
mv.setViewName("home/main.jsp?url=/body/mypage/pre_passch");
}
else if (url.equals("passch_accept"))
{
mv.setViewName("home/main.jsp?url=/body/mypage/pre_passch");
log.info("MainController 비밀번호 수정 페이지");
String hdnCertNum = request.getParameter("hdnCertNum");
String hdnCertification = request.getParameter("hdnCertification");
userId = request.getSession().getAttribute("USERID").toString(); userId = request.getSession().getAttribute("USERID").toString();
eGovUrl = "mypage_passch.do";
log.info("인증값 : hdnCertNum : " + hdnCertNum + " hdnCertification : " + hdnCertification);
try {
log.info("휴대폰 복호화 이전");
Map<String, String> certResult = MobileCertificationUtil.decryptCertData(hdnCertification, hdnCertNum);
log.info("휴대폰 인증 복호화 이후");
log.info("복호화 값 name : " + certResult.get("name") + " DI : " + certResult.get("DI"));
eGovUrl = "passch_accept.do";
mv.addObject("hdnCertNum", hdnCertNum);
mv.addObject("hdnCertification", hdnCertification);
mv.addObject("userid", userId);
mv.setViewName("home/main.jsp?url=/body/mypage/passch"); mv.setViewName("home/main.jsp?url=/body/mypage/passch");
} }
catch(IndexOutOfBoundsException ex){
log.info("비밀번호 수정 잘못된 접근");
mv.addObject("msg", "잘못된 접근입니다.");
eGovUrl = "passch.do";
}
catch(NumberFormatException ex){
log.info("비밀번호 수정 잘못된 접근");
mv.addObject("msg", "잘못된 접근입니다.");
eGovUrl = "passch.do";
}
catch(Exception ex){
log.info("비밀번호 수정 잘못된 접근");
mv.addObject("msg", "잘못된 접근입니다.");
eGovUrl = "passch.do";
}
}
else if (url.equals("mypage_cart")) else if (url.equals("mypage_cart"))
{ {
userId = request.getSession().getAttribute("USERID").toString(); userId = request.getSession().getAttribute("USERID").toString();
@ -957,21 +996,7 @@ public class MainController
// 2017.10.17 dhlee session ip 브라우져 검증 추가 // 2017.10.17 dhlee session ip 브라우져 검증 추가
String ip = InetAddress.getLocalHost().toString(); // IP String ip = InetAddress.getLocalHost().toString(); // IP
String agent = request.getHeader("User-Agent"); // 브라우져 String agent = request.getHeader("User-Agent"); // 브라우져
// String brower = "";
//
// if (agent != null) {
// if (agent.indexOf("Trident") > -1) {
// brower = "MSIE";
// } else if (agent.indexOf("Chrome") > -1) {
// brower = "Chrome";
// } else if (agent.indexOf("Opera") > -1) {
// brower = "Opera";
// } else if (agent.indexOf("iPhone") > -1 && agent.indexOf("Mobile") > -1) {
// brower = "iPhone";
// } else if (agent.indexOf("Android") > -1 && agent.indexOf("Mobile") > -1) {
// brower = "Android";
// }
// }
String id = request.getSession().getAttribute("USERID").toString(); String id = request.getSession().getAttribute("USERID").toString();
String s_ip = request.getSession().getAttribute("USERIP").toString(); String s_ip = request.getSession().getAttribute("USERIP").toString();
String s_agent = request.getSession().getAttribute("USERAGENT").toString(); String s_agent = request.getSession().getAttribute("USERAGENT").toString();
@ -1025,8 +1050,6 @@ public class MainController
month = now.get(Calendar.MONTH) + 1; month = now.get(Calendar.MONTH) + 1;
date = now.get(Calendar.DATE); date = now.get(Calendar.DATE);
// System.out.println(year+"년 "+month+"월 "+date+"일 "+ hour +
// "시 "+mm+"분 ");
dayofweek = now.get(Calendar.DAY_OF_WEEK); dayofweek = now.get(Calendar.DAY_OF_WEEK);
map.put("year", year); map.put("year", year);
@ -1066,634 +1089,16 @@ public class MainController
String visitors = mainService.selectVisitors(); // 방문자수 String visitors = mainService.selectVisitors(); // 방문자수
String registrant = mainService.selectRegistrant(); // 등록자수 String registrant = mainService.selectRegistrant(); // 등록자수
int total_cnt = mainService.selecrTotal_cnt(); // 총 시추공수
/*
* 20230216 사용하지 않는 부문으로 판단
* int cnt01 = 0;
int cnt02 = 0;
int cnt03 = 0;
int cnt04 = 0;
int cnt05 = 0;
int cnt06 = 0;
int cnt11 = 0;
int cnt12 = 0;
int cnt13 = 0;
int cnt14 = 0;
int cnt15 = 0;
int cnt16 = 0;
int cnt17 = 0;
int cnt18 = 0;
int cnt201 = 0;
int cnt202 = 0;
int cnt203 = 0;
int cnt204 = 0;
int cnt205 = 0;
int cnt206 = 0;
int cnt207 = 0;
int cnt208 = 0;
int cnt209 = 0;
int cnt210 = 0;
int cnt211 = 0;
int cnt212 = 0;
int cnt213 = 0;
int cnt214 = 0;
int cnt215 = 0;
int cnt216 = 0;
int cnt_not = 0;
String code_ex1 = "070,363"; // 국토해양부 서울청
String code_ex2 = "025,413"; // 국토해양부 부산청
String code_ex3 = "001,394"; // 국토해양부 대전청
String code_ex4 = "013,367"; // 국토해양부 익산청
String code_ex5 = "056,365"; // 국토해양부 원주청
// 11개 해양항만청
String code_ex6 = "801,802,803,804,805,806,807,808,809,810,811,556,401,416,399,353";
String code_ex11 = "004,051,362"; // 한국토지주택공사
String code_ex12 = "031"; // 한국도로공사
String code_ex13 = "134"; // 한국수자원공사
String code_ex14 = "400,703"; // 연안계획과
String code_ex15 = "131"; // 한국철도시설공단
String code_ex16 = "082"; // 한국수력원자력
String code_ex17 = "305"; // 한국공항공사
String code_ex18 = "702"; // 한국항만공사
String code_ex201 = "419"; // 서울특별시
String code_ex202 = "088"; // 부산광역시
String code_ex203 = "263"; // 대구광역시
String code_ex204 = "412"; // 인천광역시
String code_ex205 = "077"; // 광주광역시
String code_ex206 = "391"; // 대전광역시
String code_ex207 = "048"; // 울산광역시
String code_ex208 = "554"; // 경기도
String code_ex209 = "065"; // 강원도
String code_ex210 = "548"; // 충청남도
String code_ex211 = "902"; // 충청북도
String code_ex212 = "903"; // 경상남도
String code_ex213 = "904"; // 경상북도
String code_ex214 = "127"; // 전라남도
String code_ex215 = "905"; // 전라북도
String code_ex216 = "907"; // 제주도
*/
// //시추공수
// /////////////////////////////////////////////////////////////////////////////////
// 국토해양부 서울청
/*try
{
map.put("code", code_ex1);
int resultinfo = cnt01 = mainService.selectInformationInfo(map);
cnt01 = resultinfo;
mv.addObject("CNT1", resultinfo);
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 국토해양부 부산청
try
{
map.put("code", code_ex2);
int resultinfo = cnt02 = mainService.selectInformationInfo(map);
mv.addObject("CNT2", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 국토해양부 대전청
try
{
map.put("code", code_ex3);
int resultinfo = cnt03 = mainService.selectInformationInfo(map);
mv.addObject("CNT3", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 국토해양부 익산청
try
{
map.put("code", code_ex4);
int resultinfo = cnt04 = mainService.selectInformationInfo(map);
mv.addObject("CNT4", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 국토해양부 원주청
try
{
map.put("code", code_ex5);
int resultinfo = cnt05 = mainService.selectInformationInfo(map);
mv.addObject("CNT5", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 11개 해양항만청
try
{
map.put("code", code_ex6);
int resultinfo = cnt06 = mainService.selectInformationInfo(map);
mv.addObject("CNT6", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 합계
int sum1 = (cnt01) + (cnt02) + (cnt03) + (cnt04) + (cnt05) + (cnt06);
mv.addObject("SUM1", getFormattedMoney(Integer.toString(sum1)));
// 한국토지주택공사
try
{
map.put("code", code_ex11);
int resultinfo = cnt11 = mainService.selectInformationInfo(map);
mv.addObject("CNT11", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 한국도로공사
try
{
map.put("code", code_ex12);
int resultinfo = cnt12 = mainService.selectInformationInfo(map);
mv.addObject("CNT12", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 한국수자원공사
try
{
map.put("code", code_ex13);
int resultinfo = cnt13 = mainService.selectInformationInfo(map);
mv.addObject("CNT13", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 연안계획과
try
{
map.put("code", code_ex14);
int resultinfo = cnt14 = mainService.selectInformationInfo(map);
mv.addObject("CNT14", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 한국철도시설공단
try
{
map.put("code", code_ex15);
int resultinfo = cnt15 = mainService.selectInformationInfo(map);
mv.addObject("CNT15", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 한국수력원자력
try
{
map.put("code", code_ex16);
int resultinfo = cnt16 = mainService.selectInformationInfo(map);
mv.addObject("CNT16", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 한국공항공사
try
{
map.put("code", code_ex17);
int resultinfo = cnt17 = mainService.selectInformationInfo(map);
mv.addObject("CNT17", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 한국항만공사
try
{
map.put("code", code_ex18);
int resultinfo = cnt18 = mainService.selectInformationInfo(map);
mv.addObject("CNT18", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 합계
int sum2 = (cnt11) + (cnt12) + (cnt13) + (cnt14) + (cnt15) + (cnt16) + (cnt17) + (cnt18);
mv.addObject("SUM2", getFormattedMoney(Integer.toString(sum2)));
int sum3 = sum1 + sum2;
mv.addObject("SUM3", getFormattedMoney(Integer.toString(sum3)));
// 서울특별시
try
{
map.put("code", code_ex201);
int resultinfo = cnt201 = mainService.selectInformationInfo(map);
mv.addObject("CNT201", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 부산광역시
try
{
map.put("code", code_ex202);
int resultinfo = cnt202 = mainService.selectInformationInfo(map);
mv.addObject("CNT202", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 대구광역시
try
{
map.put("code", code_ex203);
int resultinfo = cnt203 = mainService.selectInformationInfo(map);
mv.addObject("CNT203", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 인천광역시
try
{
map.put("code", code_ex204);
int resultinfo = cnt204 = mainService.selectInformationInfo(map);
mv.addObject("CNT204", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 광주광역시
try
{
map.put("code", code_ex205);
int resultinfo = cnt205 = mainService.selectInformationInfo(map);
mv.addObject("CNT205", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 대전광역시
try
{
map.put("code", code_ex206);
int resultinfo = cnt206 = mainService.selectInformationInfo(map);
mv.addObject("CNT206", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 울산광역시
try
{
map.put("code", code_ex207);
int resultinfo = cnt207 = mainService.selectInformationInfo(map);
mv.addObject("CNT207", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 경기도
try
{
map.put("code", code_ex208);
int resultinfo = cnt208 = mainService.selectInformationInfo(map);
mv.addObject("CNT208", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 강원도
try
{
map.put("code", code_ex209);
int resultinfo = cnt209 = mainService.selectInformationInfo(map);
mv.addObject("CNT209", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 충청남도
try
{
map.put("code", code_ex210);
int resultinfo = cnt210 = mainService.selectInformationInfo(map);
mv.addObject("CNT210", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 충청북도
try
{
map.put("code", code_ex211);
int resultinfo = cnt211 = mainService.selectInformationInfo(map);
mv.addObject("CNT211", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 경상남도
try
{
map.put("code", code_ex212);
int resultinfo = cnt212 = mainService.selectInformationInfo(map);
mv.addObject("CNT212", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 경상북도
try
{
map.put("code", code_ex213);
int resultinfo = cnt213 = mainService.selectInformationInfo(map);
mv.addObject("CNT213", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 전라남도
try
{
map.put("code", code_ex214);
int resultinfo = cnt214 = mainService.selectInformationInfo(map);
mv.addObject("CNT214", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 전라북도
try
{
map.put("code", code_ex215);
int resultinfo = cnt215 = mainService.selectInformationInfo(map);
mv.addObject("CNT215", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 제주도
try
{
map.put("code", code_ex216);
int resultinfo = cnt216 = mainService.selectInformationInfo(map);
mv.addObject("CNT216", getFormattedMoney(resultinfo));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}
// 합계
int sum4 = (cnt201) + (cnt202) + (cnt203) + (cnt204) + (cnt205) + (cnt206) + (cnt207) + (cnt208) + (cnt209) + (cnt210) + (cnt211) + (cnt212) + (cnt213) + (cnt214) + (cnt215) + (cnt216);
mv.addObject("SUM4", getFormattedMoney(Integer.toString(sum4)));
// 미지정
try
{
String code = code_ex1 + "," + code_ex2 + "," + code_ex3 + "," + code_ex4 + "," + code_ex5 + "," + code_ex6 + "," + code_ex11 + "," + code_ex12 + "," + code_ex13 + "," + code_ex14 + "," + code_ex15 + "," + code_ex16 + ","
+ code_ex17 + "," + code_ex18 + "," + code_ex201 + "," + code_ex202 + "," + code_ex203 + "," + code_ex204 + "," + code_ex205 + "," + code_ex206 + "," + code_ex207 + "," + code_ex208 + "," + code_ex209 + "," + code_ex210
+ "," + code_ex211 + "," + code_ex212 + "," + code_ex213 + "," + code_ex214 + "," + code_ex215 + "," + code_ex216;
map.put("code", code);
int resultinfo = cnt_not = mainService.selectInformationInfoNon(map);
mv.addObject("CNTNOT", getFormattedMoney(resultinfo));
int cnt_not_temp = (cnt_not);
int sum5 = sum3 + sum4 + cnt_not_temp;
mv.addObject("SUM5", getFormattedMoney(Integer.toString(sum5)));
}
catch (NumberFormatException e) {
log.debug("error", e);
}
catch (IndexOutOfBoundsException e) {
log.debug("error", e);
}
catch (Exception e) {
log.debug("error", e);
}*/
mv.addObject("cls", cls); mv.addObject("cls", cls);
mv.addObject("mod_cnt", mod_cnt); mv.addObject("mod_cnt", mod_cnt);
mv.addObject("input_cnt", input_cnt); mv.addObject("input_cnt", input_cnt);
mv.addObject("visitors", visitors); mv.addObject("visitors", visitors);
mv.addObject("registrant", registrant); mv.addObject("registrant", registrant);
mv.addObject("total_cnt", total_cnt);
mv.addObject("year", year); mv.addObject("year", year);
mv.addObject("month", month); mv.addObject("month", month);
mv.addObject("date", date); mv.addObject("date", date);
// mv.addObject("sessionId", request.getSession().getId());
// mv.addObject("name", request.getSession().getAttribute("userId"));
if (flag) { if (flag) {
mv.addObject("dupLogin", flag); mv.addObject("dupLogin", flag);

46
src/main/java/geoinfo/map/left/MapLeftController.java
View File

@ -1384,7 +1384,25 @@ public class MapLeftController {
String use_contents = request.getParameter("use_contents"); String use_contents = request.getParameter("use_contents");
String use_example = request.getParameter("use_example"); String use_example = request.getParameter("use_example");
String idx = request.getParameter("idx"); String idx = request.getParameter("idx");
String[] fnamaeArray;
String fname="";
String path = "";
if(metadataID.indexOf(",") > -1){
fnamaeArray = metadataID.split(",");
}else {
fnamaeArray = new String[1];
fnamaeArray[0] = metadataID;
}
fname = fnamaeArray[0] + ".zip";
//웹 취약점 때문에 수정 23.02.15
//path = EgovProperties.getProperty("Geoinfo.FilePath");
path = EgovProperties.getProperty("Geoinfo.FilePath").trim();
path = path + "\\report\\service\\";
File file2 = new File(path + fname);
int filesize = (int)file2.length();
if (filesize > 0) {
//웹 취약점 때문에 수정 23.02.15 //웹 취약점 때문에 수정 23.02.15
//String savePath = EgovProperties.getProperty("Geoinfo.FilePath"); //String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
String savePath = EgovProperties.getProperty("Geoinfo.FilePath").trim(); String savePath = EgovProperties.getProperty("Geoinfo.FilePath").trim();
@ -1513,14 +1531,29 @@ public class MapLeftController {
if (affectedRows > 0) { if (affectedRows > 0) {
mv.addObject("msg", "<script>alert('정상적으로 등록이 완료되었습니다.');window.location.href='map/downloadPurpose.do?pcrode='"+metadataID+";</script>"); mv.addObject("msg", "<script>alert('정상적으로 등록이 완료되었습니다.');window.location.href='map/downloadPurpose.do?pcrode='"+metadataID+";</script>");
} else { } else {
mv.addObject("msg", "<script>alert('오류입니다.');window.location.href='map/popup/downloadPurpose.do?pcrode='"+metadataID+";</script>"); mv.addObject("msg", "<script>alert('파일다운이 실패하였습니다.');window.location.href='map/popup/downloadPurpose.do?pcrode='"+metadataID+";</script>");
return null;
} }
mv.addObject("fileName",fileName); mv.addObject("fileName",fileName);
// return mv; // return mv;
return "forward:/map/downloadZip.do"; return "forward:/map/downloadZip.do";
}else {
mv.addObject("msg", "<script>alert('파일다운이 실패하였습니다.');window.location.href='map/popup/downloadPurpose.do?pcrode='"+metadataID+";</script>");
/*mv.addObject("msg", "<script>alert('파일을 다운받을 수 없습니다');</script>");*/
response.setCharacterEncoding("euc-kr");
PrintWriter writer = response.getWriter();
writer.println("<script type='text/javascript'>");
writer.println("alert('해당 파일이 존재하지 않습니다.');");
writer.println("</script>");
writer.flush();
return "forward:/map/downloadZipFail.do";
}
} }
@RequestMapping(value = "/map/downloadLogSave2.do") @RequestMapping(value = "/map/downloadLogSave2.do")
@ -2031,6 +2064,15 @@ public class MapLeftController {
return null; return null;
} }
// downloadZip
@RequestMapping(value = "/map/downloadZipFail.do")
public ModelAndView downloadZipFail(ModelMap model, @RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) throws Exception {
ModelAndView mv = new ModelAndView("/map/popup/downloadZipFail");
return mv;
}
public String getProjectCode(int type, String hCode){ public String getProjectCode(int type, String hCode){
String code = ""; String code = "";
if( hCode != null ){ if( hCode != null ){

1274
src/main/java/geoinfo/regi/common/CommonController.java
View File

File diff suppressed because it is too large Load Diff

8
src/main/java/geoinfo/regi/common/service/CommonMapper.java
View File

@ -77,14 +77,22 @@ public interface CommonMapper {
EgovMap getRockJointshear(Map<String, Object> params) throws Exception; EgovMap getRockJointshear(Map<String, Object> params) throws Exception;
List<EgovMap> getRockJointshearList(Map<String, Object> params) throws Exception;
EgovMap getRockPointload(Map<String, Object> params) throws Exception; EgovMap getRockPointload(Map<String, Object> params) throws Exception;
List<EgovMap> getRockPointloadList(Map<String, Object> params) throws Exception;
EgovMap getRockTriaxial(Map<String, Object> params) throws Exception; EgovMap getRockTriaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxialList(Map<String, Object> params) throws Exception;
EgovMap getRockUniaxial(Map<String, Object> params) throws Exception; EgovMap getRockUniaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxialList(Map<String, Object> params) throws Exception; List<EgovMap> getRockUniaxialList(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxialListRuni(Map<String, Object> params) throws Exception;
EgovMap getCbrCompac(Map<String, Object> params) throws Exception; EgovMap getCbrCompac(Map<String, Object> params) throws Exception;
List<EgovMap> getClassification(Map<String, Object> params) throws Exception; List<EgovMap> getClassification(Map<String, Object> params) throws Exception;

8
src/main/java/geoinfo/regi/common/service/CommonService.java
View File

@ -74,14 +74,22 @@ public interface CommonService {
EgovMap getRockJointshear(Map<String, Object> params) throws Exception; EgovMap getRockJointshear(Map<String, Object> params) throws Exception;
List<EgovMap>getRockJointshearList(Map<String, Object> params) throws Exception;
EgovMap getRockPointload(Map<String, Object> params) throws Exception; EgovMap getRockPointload(Map<String, Object> params) throws Exception;
List<EgovMap>getRockPointloadList(Map<String, Object> params) throws Exception;
EgovMap getRockTriaxial(Map<String, Object> params) throws Exception; EgovMap getRockTriaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxialList(Map<String, Object> params) throws Exception;
EgovMap getRockUniaxial(Map<String, Object> params) throws Exception; EgovMap getRockUniaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxialList(Map<String, Object> params) throws Exception; List<EgovMap> getRockUniaxialList(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxialListRuni(Map<String, Object> params) throws Exception;
EgovMap getCbrCompac(Map<String, Object> params) throws Exception; EgovMap getCbrCompac(Map<String, Object> params) throws Exception;
List<EgovMap> getClassification(Map<String, Object> params) throws Exception; List<EgovMap> getClassification(Map<String, Object> params) throws Exception;

20
src/main/java/geoinfo/regi/common/service/impl/CommonServiceImpl.java
View File

@ -182,16 +182,31 @@ public class CommonServiceImpl implements CommonService {
return commonMapper.getRockJointshear(params); return commonMapper.getRockJointshear(params);
} }
@Override
public List<EgovMap> getRockJointshearList(Map<String, Object> params) throws Exception {
return commonMapper.getRockJointshearList(params);
}
@Override @Override
public EgovMap getRockPointload(Map<String, Object> params) throws Exception { public EgovMap getRockPointload(Map<String, Object> params) throws Exception {
return commonMapper.getRockPointload(params); return commonMapper.getRockPointload(params);
} }
@Override
public List<EgovMap> getRockPointloadList(Map<String, Object> params) throws Exception {
return commonMapper.getRockPointloadList(params);
}
@Override @Override
public EgovMap getRockTriaxial(Map<String, Object> params) throws Exception { public EgovMap getRockTriaxial(Map<String, Object> params) throws Exception {
return commonMapper.getRockTriaxial(params); return commonMapper.getRockTriaxial(params);
} }
@Override
public List<EgovMap> getRockTriaxialList(Map<String, Object> params) throws Exception {
return commonMapper.getRockTriaxialList(params);
}
@Override @Override
public EgovMap getRockUniaxial(Map<String, Object> params) throws Exception { public EgovMap getRockUniaxial(Map<String, Object> params) throws Exception {
return commonMapper.getRockUniaxial(params); return commonMapper.getRockUniaxial(params);
@ -202,6 +217,11 @@ public class CommonServiceImpl implements CommonService {
return commonMapper.getRockUniaxialList(params); return commonMapper.getRockUniaxialList(params);
} }
@Override
public List<EgovMap> getRockUniaxialListRuni(Map<String, Object> params) throws Exception {
return commonMapper.getRockUniaxialListRuni(params);
}
@Override @Override
public EgovMap getCbrCompac(Map<String, Object> params) throws Exception { public EgovMap getCbrCompac(Map<String, Object> params) throws Exception {
return commonMapper.getCbrCompac(params); return commonMapper.getCbrCompac(params);

99
src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java
View File

@ -171,6 +171,99 @@ public class ManageExcelUploadProc01Controller {
return rUrl; return rUrl;
} }
/**
* 엑셀 정보 업로드 STEP01 호출
* 입력결과보고서, 프로젝트정보, 지형지질정보 엑셀자료를 업로드하여 등록한다.
*/
@SuppressWarnings("unchecked")
@RequestMapping(value = "/excel_delete_holeCode.do")
public String deleteHoleCode(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
strUtil sUtil = new strUtil();
String rUrl = "/web/input/excel_step00";
try {
String holeCode = sUtil.checkNull(parseData.parseData((String)params.get("HOLE_CODE"))); // 프로젝트코드
String tableTemp[] = {"TEMP_HEADER", "TEMP_HEADER_CORE", "TEMP_REFERENCE", "TEMP_LAYER_INFO","TEMP_SPT", "TEMP_RQD", "TEMP_DSF",
"TEMP_FIELD_PRESSUREMETER", "TEMP_SLICKENSIDE_INFO", "TEMP_Q", "TEMP_RMR", "TEMP_FIELD_WATERPRESSURE",
"TEMP_WP_TEST", "TEMP_FIELD_PERMEABILITY", "TEMP_FIELDPER_SUB", "TEMP_FIELD_CONE_PENETRATION",
"TEMP_CONE_PENETRATION_IMAGES", "TEMP_SAMPLE_INFO", "TEMP_CLASSIFICATION", "TEMP_CONSOLIDATION_USUAL",
"TEMP_CONSOLIDATION", "TEMP_CBR_COMPAC", "TEMP_UNCONFINED_USUAL", "TEMP_TRIAXIAL_USUAL", "TEMP_TRIAXIAL_CU",
"TEMP_TRIAXIAL_UU", "TEMP_RESONANT_USUAL", "TEMP_RESONANT", "TEMP_REPEATED_TRIAXIAL_USUAL",
"TEMP_REPEATED_TRIAXIAL", "TEMP_ROCK_POINTLOAD", "TEMP_ROCK_JOINTSHEAR", "TEMP_ROCK_UNIAXIAL",
"TEMP_ROCK_TRIAXIAL", "TEMP_ROCK_RESONANT_USUAL", "TEMP_ROCK_RESONANT", "TEMP_ROCK_REPEATED_TRIAXIAL_U",
"TEMP_ROCK_REPEATED_TRIAXIAL","TEMP_BOREHOLE_WAVE", "TEMP_BOREHOLE_WAVE_PS", "TEMP_DOWNHOLE",
"TEMP_DOWNHOLE_PS", "TEMP_DENSITY", "TEMP_DENSITY_SUB"};
params.put("HOLE_CODE", holeCode);
for(int i = 0; i<tableTemp.length;i++){
params.put("tableName", tableTemp[i]);
projectListService.deleteHoleCode(params);
}
} catch (Exception e) {
//에러발생시 파일 원위치 시킨다.
}
String reportType = sUtil.checkNull(parseData.parseData((String)params.get("REPORT_TYPE"))); // 보고서 형태
String projectCode = sUtil.checkNull(parseData.parseData((String)params.get("PROJECT_CODE"))); // 프로젝트코드
String stepValue = sUtil.checkNull(parseData.parseData((String)params.get("STEP"))); // 스텝코드
boolean blDelete = fileDelete(request, "");
logger.debug("2일전 temp폴더 파일삭제로직 수행:" + blDelete);
HashMap<String, String> mapMetaInfo = new HashMap<String, String>();
if("".equals(projectCode)){
mapMetaInfo.put("PROJECT_CODE", projectCode);
mapMetaInfo.put("PROJECT_NAME", "");
mapMetaInfo.put("REPORT_TYPE", reportType);
stepValue = "11";
}else{
//params.put("PROJECT_CODE", projectCode);
params.put("projectCode",projectCode);
//단계값이 없으면 sql값으로 정함
if(null == stepValue || "".equals(stepValue)){
HashMap<String, Object> map = manageList2019Service.getStepCount(params);
stepValue = map.get("STEP_VALUE").toString();
}
System.out.println("### projectCode : " + projectCode);
mapMetaInfo = (HashMap<String, String>) commonService.getMetaInfo(params).get(0);
//프로젝트 정보
EgovMap projectInfo = infoService.getProjectInfo(params);
model.addAttribute("project", projectInfo);
}
mapMetaInfo.put("STEP", stepValue);
if("31".equals(stepValue)){
params.put("projectCode",projectCode);
List<EgovMap> map = selectClass2019Service.selectProjectTreeList(params);
List<EgovMap> map2 = selectClass2019Service.selectTest1(params);
EgovMap map3 = selectClass2019Service.selectTest2(params);
String resistivityCount = String.valueOf(map3.get("resistivityCount"));
String refractionCount = String.valueOf(map3.get("refractionCount"));
if(resistivityCount.equals("0") && refractionCount.equals("0")) {
params.put("dbCnt","0");
}else {
params.put("dbCnt","1");
}
EgovMap map4 = selectClass2019Service.selectTest4(params);
map2.add(map4);
/* List<EgovMap> abcd = null;
map.addAll(10, abcd);*/
int mapSize = map.size();
map.addAll(mapSize-2, map2);
model.addAttribute("treeList", map);
}
model.addAttribute("mapMetaInfo", mapMetaInfo);
return rUrl;
}
/** /**
* 자료저장 * 자료저장
* @param params * @param params
@ -623,7 +716,7 @@ public class ManageExcelUploadProc01Controller {
resultMsg += String.format(fmtError, "핸드폰번호"); resultMsg += String.format(fmtError, "핸드폰번호");
} }
if(_sichuDate.length() != 8 || !DateUtil.isDate(_sichuDate,"yyyyMMdd")){ if(_sichuDate.length() != 8 || !DateUtil.isDate(_sichuDate,"yyyyMMdd")){
resultMsg += String.format(fmtDefault, "시추날짜의 날짜형식이 어긋납니다."); resultMsg += String.format(fmtDefault, "시추날짜의 날짜형식(yyyyMMDD)이 어긋납니다.");
} }
if(_saupName.equals("")){ if(_saupName.equals("")){
resultMsg += String.format(fmtBlank, "사업명이"); resultMsg += String.format(fmtBlank, "사업명이");
@ -660,7 +753,7 @@ public class ManageExcelUploadProc01Controller {
if(HOLE_SPOT_SD.equals(selMap.get("PARENT_CODE_VALUE"))){ if(HOLE_SPOT_SD.equals(selMap.get("PARENT_CODE_VALUE"))){
HOLE_SPOT_SGG = selMap.get("CODE_VALUE"); HOLE_SPOT_SGG = selMap.get("CODE_VALUE");
}else if(!HOLE_SPOT_SD.equals(selMap.get("PARENT_CODE_VALUE"))){ }else if(!HOLE_SPOT_SD.equals(selMap.get("PARENT_CODE_VALUE"))){
resultMsg = String.format(fmtDefault, "시도 와 시군구의 선택이 잘못되었습니다."); resultMsg += String.format(fmtDefault, "시도 와 시군구의 선택이 잘못되었습니다.");
} }
} }
} }
@ -785,7 +878,7 @@ public class ManageExcelUploadProc01Controller {
String fmtBlank = "%s 필수입력 항목입니다.|"; String fmtBlank = "%s 필수입력 항목입니다.|";
String fmtError = "%s 형식의 오류입니다.|"; String fmtError = "%s 형식의 오류입니다.|";
String fmtDate = "%s의 날짜형식이 어긋납니다.|"; String fmtDate = "%s의 날짜형식(YYMMDD)이 어긋납니다.|";
String fmtFloat = "%s 실수만 입력이 가능합니다.|"; String fmtFloat = "%s 실수만 입력이 가능합니다.|";
String fmtDefault = "%s|"; String fmtDefault = "%s|";

1833
src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
View File

File diff suppressed because it is too large Load Diff

19
src/main/java/geoinfo/regi/manageList/ManageListController.java
View File

@ -12,19 +12,11 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import comm.web.WebConfirm; import comm.web.WebConfirm;
@ -51,12 +43,6 @@ public class ManageListController {
@Resource(name = "infoService") @Resource(name = "infoService")
private InfoService infoService; private InfoService infoService;
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
// 지반정보등록 (관리자) - 검수등록대기 목록 // 지반정보등록 (관리자) - 검수등록대기 목록
@RequestMapping(value = "/manageList.do") @RequestMapping(value = "/manageList.do")
public String manageRegi(@RequestParam HashMap<String, Object> params, public String manageRegi(@RequestParam HashMap<String, Object> params,
@ -276,10 +262,7 @@ public class ManageListController {
strUtil sUtil = new strUtil(); strUtil sUtil = new strUtil();
int ok = 0; int ok = 0;
try { try {
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
map.put("PROJECT_CODE", PROJECT_CODE); map.put("PROJECT_CODE", PROJECT_CODE);
map.put("MODEIFY_USER", MODEIFY_USER); map.put("MODEIFY_USER", MODEIFY_USER);
@ -292,10 +275,8 @@ public class ManageListController {
ok = 1; ok = 1;
} }
model.addAttribute("ok", ok); model.addAttribute("ok", ok);
transactionManager.commit(status);
}catch (Exception e) { }catch (Exception e) {
transactionManager.rollback(status);
} }
return "/web/manage/modeify_update"; return "/web/manage/modeify_update";

1
src/main/java/geoinfo/regi/projectList/service/ProjectListMapper.java
View File

@ -14,6 +14,7 @@ public interface ProjectListMapper {
public int insertProject(HashMap<String, Object> params) throws Exception; public int insertProject(HashMap<String, Object> params) throws Exception;
public int updateMeta(HashMap<String, Object> params) throws Exception; public int updateMeta(HashMap<String, Object> params) throws Exception;
public int deleteProject(HashMap<String, Object> params) throws Exception; public int deleteProject(HashMap<String, Object> params) throws Exception;
public int deleteHoleCode(HashMap<String, Object> params) throws Exception;
public int deleteWebData(HashMap<String, Object> params) throws Exception; public int deleteWebData(HashMap<String, Object> params) throws Exception;
public HashMap getProjectCd(HashMap<String,Object> params) throws Exception; public HashMap getProjectCd(HashMap<String,Object> params) throws Exception;

2
src/main/java/geoinfo/regi/projectList/service/ProjectListService.java
View File

@ -13,6 +13,8 @@ public interface ProjectListService {
public int updateMeta(HashMap<String, Object> params) throws Exception; public int updateMeta(HashMap<String, Object> params) throws Exception;
public HashMap getProjectCd(HashMap<String,Object> params) throws Exception; public HashMap getProjectCd(HashMap<String,Object> params) throws Exception;
public int deleteProject(HashMap<String, Object> params) throws Exception; public int deleteProject(HashMap<String, Object> params) throws Exception;
public int deleteHoleCode(HashMap<String, Object> params) throws Exception;
public int deleteWebData(HashMap<String, Object> params) throws Exception; public int deleteWebData(HashMap<String, Object> params) throws Exception;
public HashMap getInfo(HashMap<String, Object> params); public HashMap getInfo(HashMap<String, Object> params);
public ArrayList getProjectMetaInfo(HashMap<String, Object> params); public ArrayList getProjectMetaInfo(HashMap<String, Object> params);

4
src/main/java/geoinfo/regi/projectList/service/impl/ProjectListServiceImpl.java
View File

@ -38,6 +38,10 @@ public class ProjectListServiceImpl implements ProjectListService {
return projectListMapper.deleteProject(params); return projectListMapper.deleteProject(params);
} }
@Override @Override
public int deleteHoleCode(HashMap<String, Object> params) throws Exception {
return projectListMapper.deleteHoleCode(params);
}
@Override
public int deleteWebData(HashMap<String, Object> params) throws Exception { public int deleteWebData(HashMap<String, Object> params) throws Exception {
return projectListMapper.deleteWebData(params); return projectListMapper.deleteWebData(params);
} }

5
src/main/java/geoinfo/regi/rock/RockController.java
View File

@ -20,10 +20,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.jfree.util.Log; import org.jfree.util.Log;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -2432,6 +2428,7 @@ public class RockController {
params.put("PROJECT_CODE", oPROJECT_CODE); params.put("PROJECT_CODE", oPROJECT_CODE);
params.put("HOLE_CODE", oHOLE_CODE); params.put("HOLE_CODE", oHOLE_CODE);
params.put("REPORT_TYPE", oREPORT_TYPE); params.put("REPORT_TYPE", oREPORT_TYPE);
params.put("RUNI_CODE", oRUNI_CODE);
EgovMap mapFile = null; EgovMap mapFile = null;
List<?> arrayRockColumn = null; List<?> arrayRockColumn = null;

651
src/main/java/geoinfo/regi/selectClassInfo/SelectClassController20231213.java
View File

@ -1,651 +0,0 @@
/*package geoinfo.regi.selectClassInfo;
import egovframework.com.cmm.service.EgovProperties;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import geoinfo.com.GeoinfoCommon;
import geoinfo.com.MultiLoginPreventor;
import geoinfo.regi.selectClassInfo.service.SelectClassService;
import ictway.comm.util.strUtil;
import ictway.comm.web.GlobalsWeb;
import ictway.comm.web.WebUtil;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.FilenameUtils;
import org.jfree.util.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@Controller
public class SelectClassController20231213 {
private final static Logger logger = LoggerFactory.getLogger(SelectClassController20231213.class);
@Resource(name = "selectClassService")
private SelectClassService selectClassService;
// 시험항목 선택
@RequestMapping(value = "/selectClass/selectClassInfo")
public String selectClassInfo(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
// request
String oREPORT_TYPE = GeoinfoCommon.parseData(String.valueOf(params.get("REPORT_TYPE"))); // 보고서형태
String oPROJECT_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("PROJECT_CODE"))); // 프로젝트코드
String oHOLE_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("HOLE_CODE"))); // 시추공코드
String isBaseSet = GeoinfoCommon.parseData(String.valueOf(params.get("isBaseSet"))); // 초기데이터 설정 여부
boolean isFirstInput = false;
// 시험정보 조회
params.put("isFirstInput", isFirstInput);
params.put("projectCode", oPROJECT_CODE);
params.put("holeCode", oHOLE_CODE);
params.put("reportType", oREPORT_TYPE);
EgovMap result = selectClassService.selectTempSelectClassInfo(params);
model.put("result", result);
model.put("params", params);
return "/web/input/selectClass/selectClassInfo";
}
@RequestMapping(value = "/selectClass/selectClassInfoBaseset")
public String selectClassInfoBaseset(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
String oREPORT_TYPE = GeoinfoCommon.parseData(String.valueOf(params.get("REPORT_TYPE"))); // 보고서 형태
String oPROJECT_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("PROJECT_CODE"))); // 프로젝트코드
String oHOLE_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("HOLE_CODE"))); // 시추공코드
if("".equals(oPROJECT_CODE) || "".equals(oHOLE_CODE)) {
System.out.println("selectClassInfoBaseset ERROR");
throw new Exception("selectClassInfoBaseset Exception Error");
}
params.put("projectCode", oPROJECT_CODE);
params.put("holeCode", oHOLE_CODE);
EgovMap item = selectClassService.selectMaxHoleCode(params);
String maxHoleCode = "";
if (item != null) {
maxHoleCode = String.valueOf(item.get("maxHoleCode"));
}
params.put("userId", request.getSession().getAttribute("USERID"));
params.put("maxHoleCode", maxHoleCode);
// 시험정보 복사
selectClassService.deleteTempSelectClassInfo(params);
// INSERT
selectClassService.insertTempSelectClassInfo(params);
// 기준계 복사
// MAX_HOLE_CODE -> HOLE_CODE
// Delete
selectClassService.deleteTempReference(params);
// Insert
selectClassService.insertTempReference(params);
// 시험정보 조회
EgovMap items = selectClassService.selectTempSelectClassInfo(params);
model.put("state", "success");
model.put("mapClass", items);
return "jsonView";
}
@RequestMapping(value = "/selectClass/selectClassInfoDb")
public String selectClassInfoDb(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
WebUtil wUtil = new WebUtil();
strUtil sUtil = new strUtil();
// request
String oREPORT_TYPE = sUtil.checkNull(String.valueOf(params.get("REPORT_TYPE")));
String oPROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE"))); // 프로젝트코드
String oHOLE_CODE = sUtil.checkNull(String.valueOf(params.get("HOLE_CODE"))); // 시추공코드
String oSTAN_SPT = sUtil.checkNull(String.valueOf(params.get("STAN_SPT")));
String oSTAN_SLICKENSIDE = sUtil.checkNull(String.valueOf(params.get("STAN_SLICKENSIDE")));
String oSTAN_TCRRQD = sUtil.checkNull(String.valueOf(params.get("STAN_TCRRQD")));
String oSTAN_DSF = sUtil.checkNull(String.valueOf(params.get("STAN_DSF")));
String oSTAN_RMR = sUtil.checkNull(String.valueOf(params.get("STAN_RMR")));
String oSTAN_Q = sUtil.checkNull(String.valueOf(params.get("STAN_Q")));
String oFIELD_WATERPRESSURE = sUtil.checkNull(String.valueOf(params.get("FIELD_WATERPRESSURE")));
String oFIELD_PERMEABLITY = sUtil.checkNull(String.valueOf(params.get("FIELD_PERMEABLITY")));
String oFIELD_PRESSUREMETER = sUtil.checkNull(String.valueOf(params.get("FIELD_PRESSUREMETER")));
String oFIELD_CONE_PENETRATION = sUtil.checkNull(String.valueOf(params.get("FIELD_CONE_PENETRATION")));
String oSAND_CLASSIFICATION = sUtil.checkNull(String.valueOf(params.get("SAND_CLASSIFICATION")));
String oSAND_CBR = sUtil.checkNull(String.valueOf(params.get("SAND_CBR")));
String oSAND_CONSOLIDATION = sUtil.checkNull(String.valueOf(params.get("SAND_CONSOLIDATION")));
String oSAND_UNCONFINED_USUAL = sUtil.checkNull(String.valueOf(params.get("SAND_UNCONFINED_USUAL")));
String oSAND_TRIAXIAL = sUtil.checkNull(String.valueOf(params.get("SAND_TRIAXIAL")));
String oSAND_RESONANT = sUtil.checkNull(String.valueOf(params.get("SAND_RESONANT")));
String oSAND_REPEATED_TRIAXIAL = sUtil.checkNull(String.valueOf(params.get("SAND_REPEATED_TRIAXIAL")));
String oROCK_UNIAXIAL = sUtil.checkNull(String.valueOf(params.get("ROCK_UNIAXIAL")));
String oROCK_TRIAXIAL = sUtil.checkNull(String.valueOf(params.get("ROCK_TRIAXIAL")));
String oROCK_POINTLOAD = sUtil.checkNull(String.valueOf(params.get("ROCK_POINTLOAD")));
String oROCK_JOINTSHEAR = sUtil.checkNull(String.valueOf(params.get("ROCK_JOINTSHEAR")));
String oROCK_RESONANT = sUtil.checkNull(String.valueOf(params.get("ROCK_RESONANT")));
String oROCK_REPEATED_TRIAXIAL = sUtil.checkNull(String.valueOf(params.get("ROCK_REPEATED_TRIAXIAL")));
// 물리검층 추가
String oBOREHOLE_WAVE = sUtil.checkNull(String.valueOf(params.get("BOREHOLE_WAVE")));
String oDOWNHOLE = sUtil.checkNull(String.valueOf(params.get("DOWNHOLE")));
String oDENSITY = sUtil.checkNull(String.valueOf(params.get("DENSITY")));
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
if("".equals(oPROJECT_CODE) || "".equals(oHOLE_CODE)) {
System.out.println("selectClassInfoDb ERROR");
throw new Exception("selectClassInfoDb Exception Error");
}
// 체크 안되어 있는 시험정보에 대해서는 기준계 삭제 해야 하므로 값 받아옴.
String oItemChkFalseArr = sUtil.checkNull(String.valueOf(params.get("itemChkFalseArr")));
// return url
String rUrl = sUtil.checkNull(String.valueOf(params.get("rUrl")));
if ("".equals(rUrl)) {
rUrl = "/selectClass/selectClassInfo.do?REPORT_TYPE=CH&PROJECT_CODE=" + oPROJECT_CODE + "&HOLE_CODE=" + oHOLE_CODE;
}
model.put("rUrl", rUrl);
if (!"".equals(oPROJECT_CODE) && !"".equals(oHOLE_CODE)) {
params.put("projectCode", oPROJECT_CODE);
params.put("holeCode", oHOLE_CODE);
params.put("stanSpt", oSTAN_SPT);
params.put("stanSlickenside", oSTAN_SLICKENSIDE);
params.put("stanTcrrqd", oSTAN_TCRRQD);
params.put("stanDsf", oSTAN_DSF);
params.put("stanRmr", oSTAN_RMR);
params.put("stanQ", oSTAN_Q);
params.put("fieldWaterpressure", oFIELD_WATERPRESSURE);
params.put("fieldPermeability", oFIELD_PERMEABLITY);
params.put("fieldPressuremeter", oFIELD_PRESSUREMETER);
params.put("fieldConePenetration", oFIELD_CONE_PENETRATION);
params.put("sandClassification", oSAND_CLASSIFICATION);
params.put("sandCbr", oSAND_CBR);
params.put("sandConsolidation", oSAND_CONSOLIDATION);
params.put("sandUnconfinedUsual", oSAND_UNCONFINED_USUAL);
params.put("sandTriaxial", oSAND_TRIAXIAL);
params.put("sandResonant", oSAND_RESONANT);
params.put("sandRepeatedTriaxial", oSAND_REPEATED_TRIAXIAL);
params.put("rockUniaxial", oROCK_UNIAXIAL);
params.put("rockTriaxial", oROCK_TRIAXIAL);
params.put("rockPointload", oROCK_POINTLOAD);
params.put("rockJointshear", oROCK_JOINTSHEAR);
params.put("rockResonant", oROCK_RESONANT);
params.put("rockRepeatedTriaxial", oROCK_REPEATED_TRIAXIAL);
params.put("boreholeWave", oBOREHOLE_WAVE);
params.put("downhole", oDOWNHOLE);
params.put("density", oDENSITY);
params.put("userId", request.getSession().getAttribute("USERID"));
//select
EgovMap classInfo = selectClassService.selectTempSelectClassInfo(params);
String updateSet = "";
if(classInfo != null) {
String talbeStanSpt = (String)classInfo.get("stanSpt");
String talbeStanSlickenside = (String)classInfo.get("stanSlickenside");
String talbeStanTcrrqd = (String)classInfo.get("stanTcrrqd");
String talbeStanDsf = (String)classInfo.get("stanDsf");
String talbeStanRmr = (String)classInfo.get("stanRmr");
String talbeStanQ = (String)classInfo.get("stanQ");
String talbeFieldWaterpressure = (String)classInfo.get("fieldWaterpressure");
String talbeFieldPermeability = (String)classInfo.get("fieldPermeablity");
String talbeFieldPressuremeter = (String)classInfo.get("fieldPressuremeter");
String talbeFieldConePenetration = (String)classInfo.get("fieldConePenetration");
String talbeSandClassification = (String)classInfo.get("sandClassification");
String talbeSandCbr = (String)classInfo.get("sandCbr");
String talbeSandConsolidation = (String)classInfo.get("sandConsolidation");
String talbeSandUnconfinedUsual = (String)classInfo.get("sandUnconfinedUsual");
String talbeSandTriaxial = (String)classInfo.get("sandTriaxial");
String talbeSandResonant = (String)classInfo.get("sandResonant");
String talbeSandRepeatedTriaxial = (String)classInfo.get("sandRepeatedTriaxial");
String talbeRockUniaxial = (String)classInfo.get("rockUniaxial");
String talbeRockTriaxial = (String)classInfo.get("rockTriaxial");
String talbeRockPointload= (String)classInfo.get("rockPointload");
String talbeRockJointshear= (String)classInfo.get("rockJointshear");
String talbeRockResonant= (String)classInfo.get("rockResonant");
String talbeRockRepeatedTriaxial= (String)classInfo.get("rockRepeatedTriaxial");
String talbeBoreholeWave= (String)classInfo.get("boreholeWave");
String tableDownhole= (String)classInfo.get("downhole");
String tableDensity= (String)classInfo.get("density");
updateSet = oSTAN_SPT.equals(talbeStanSpt) ? updateSet : updateSet + "STAN_SPT ="+ "'"+oSTAN_SPT+"'"+",";
updateSet = oSTAN_SLICKENSIDE.equals(talbeStanSlickenside) ? updateSet : updateSet + "STAN_SLICKENSIDE ="+ "'"+oSTAN_SLICKENSIDE+"'"+",";
updateSet = oSTAN_TCRRQD.equals(talbeStanTcrrqd) ? updateSet : updateSet + "STAN_TCRRQD ="+ "'"+oSTAN_TCRRQD+"'"+",";
updateSet = oSTAN_DSF.equals(talbeStanDsf) ? updateSet : updateSet + "STAN_DSF ="+ "'"+oSTAN_DSF+"'"+",";
updateSet = oSTAN_RMR.equals(talbeStanRmr) ? updateSet : updateSet + "STAN_RMR ="+ "'"+oSTAN_RMR+"'"+",";
updateSet = oSTAN_Q.equals(talbeStanQ) ? updateSet : updateSet + "STAN_Q ="+ "'"+oSTAN_Q+"'"+",";
updateSet = oFIELD_WATERPRESSURE.equals(talbeFieldWaterpressure) ? updateSet : updateSet + "FIELD_WATERPRESSURE ="+ "'"+oFIELD_WATERPRESSURE+"'"+",";
updateSet = oFIELD_PERMEABLITY.equals(talbeFieldPermeability) ? updateSet : updateSet + "FIELD_PERMEABLITY ="+ "'"+oFIELD_PERMEABLITY+"'"+",";
updateSet = oFIELD_PRESSUREMETER.equals(talbeFieldPressuremeter) ? updateSet : updateSet + "FIELD_PRESSUREMETER ="+ "'"+oFIELD_PRESSUREMETER+"'"+",";
updateSet = oFIELD_CONE_PENETRATION.equals(talbeFieldConePenetration) ? updateSet : updateSet + "FIELD_CONE_PENETRATION ="+ "'"+oFIELD_CONE_PENETRATION+"'"+",";
updateSet = oSAND_CLASSIFICATION.equals(talbeSandClassification) ? updateSet : updateSet + "SAND_CLASSIFICATION ="+ "'"+oSAND_CLASSIFICATION+"'"+",";
updateSet = oSAND_CBR.equals(talbeSandCbr) ? updateSet : updateSet + "SAND_CBR ="+ "'"+oSAND_CBR+"'"+",";
updateSet = oSAND_CONSOLIDATION.equals(talbeSandConsolidation) ? updateSet : updateSet + "SAND_CONSOLIDATION ="+ "'"+oSAND_CONSOLIDATION+"'"+",";
updateSet = oSAND_UNCONFINED_USUAL.equals(talbeSandUnconfinedUsual) ? updateSet : updateSet + "SAND_UNCONFINED_USUAL ="+ "'"+oSAND_UNCONFINED_USUAL+"'"+",";
updateSet = oSAND_TRIAXIAL.equals(talbeSandTriaxial) ? updateSet : updateSet + "SAND_TRIAXIAL ="+ "'"+oSAND_TRIAXIAL+"'"+",";
updateSet = oSAND_RESONANT.equals(talbeSandResonant) ? updateSet : updateSet + "SAND_RESONANT ="+ "'"+oSAND_RESONANT+"'"+",";
updateSet = oSAND_REPEATED_TRIAXIAL.equals(talbeSandRepeatedTriaxial) ? updateSet : updateSet + "SAND_REPEATED_TRIAXIAL ="+ "'"+oSAND_REPEATED_TRIAXIAL+"'"+",";
updateSet = oROCK_UNIAXIAL.equals(talbeRockUniaxial) ? updateSet : updateSet + "ROCK_UNIAXIAL ="+ "'"+oROCK_UNIAXIAL+"'"+",";
updateSet = oROCK_TRIAXIAL.equals(talbeRockTriaxial) ? updateSet : updateSet + "ROCK_TRIAXIAL ="+ "'"+oROCK_TRIAXIAL+"'"+",";
updateSet = oROCK_POINTLOAD.equals(talbeRockPointload) ? updateSet : updateSet + "ROCK_POINTLOAD ="+ "'"+oROCK_POINTLOAD+"'"+",";
updateSet = oROCK_JOINTSHEAR.equals(talbeRockJointshear) ? updateSet : updateSet + "ROCK_JOINTSHEAR ="+ "'"+oROCK_JOINTSHEAR+"'"+",";
updateSet = oROCK_RESONANT.equals(talbeRockResonant) ? updateSet : updateSet + "ROCK_RESONANT ="+ "'"+oROCK_RESONANT+"'"+",";
updateSet = oROCK_REPEATED_TRIAXIAL.equals(talbeRockRepeatedTriaxial) ? updateSet : updateSet + "ROCK_REPEATED_TRIAXIAL ="+ "'"+oROCK_REPEATED_TRIAXIAL+"'"+",";
updateSet = oBOREHOLE_WAVE.equals(talbeBoreholeWave) ? updateSet : updateSet + "BOREHOLE_WAVE ="+ "'"+oBOREHOLE_WAVE+"'"+",";
updateSet = oDOWNHOLE.equals(tableDownhole) ? updateSet : updateSet + "DOWNHOLE ="+ "'"+oDOWNHOLE+"'"+",";
updateSet = oDENSITY.equals(tableDensity) ? updateSet : updateSet + "DENSITY ="+ "'"+oDENSITY+"'"+",";
}
if(classInfo != null) {
if(!updateSet.equals("")) {
updateSet = updateSet.substring(0, updateSet.length() - 1);
params.put("updateSet", updateSet);
selectClassService.updateSelectclass(params);
}
}else {
selectClassService.insertTempSelectClassInfoDb(params);
}
//update
// DELETE
selectClassService.deleteTempSelectClassInfo(params);
// INSERT
}
// ---------------------------------------------------------------------
// 기준계 삭제처리 Start.)
String[] itemArr = oItemChkFalseArr.split(",");
int itemArrLen = itemArr.length;
if(oItemChkFalseArr.equals(""))
itemArrLen = 0;
String deletePath = request.getSession().getServletContext().getRealPath("/");
String deletePath2 = EgovProperties.getProperty("Geoinfo.WebFilePath");
deletePath = deletePath +deletePath2;
if (itemArrLen > 0) {
for (int i = 0; i < itemArrLen; i++) {
params.put("testInfoCode", itemArr[i]);
selectClassService.deleteTempReference(params);
// 체크 해제시, 기존에 입력된 시험 정보 데이터 및 파일 삭제
if ("STAN_SPT".equals(itemArr[i])) {
params.put("tableName", "TEMP_SPT");
selectClassService.deleteByProjectCodeHoleCode(params);
}
if ("STAN_SLICKENSIDE".equals(itemArr[i])) {
params.put("tableName", "TEMP_SLICKENSIDE_INFO");
selectClassService.deleteByProjectCodeHoleCode(params);
}
if ("STAN_TCRRQD".equals(itemArr[i])) {
params.put("tableName", "TEMP_RQD");
selectClassService.deleteByProjectCodeHoleCode(params);
}
if ("STAN_DSF".equals(itemArr[i])) {
params.put("tableName", "TEMP_DSF");
selectClassService.deleteByProjectCodeHoleCode(params);
}
if ("STAN_RMR".equals(itemArr[i])) {
params.put("tableName", "TEMP_RMR");
selectClassService.deleteByProjectCodeHoleCode(params);
}
if ("STAN_Q".equals(itemArr[i])) {
params.put("tableName", "TEMP_Q");
selectClassService.deleteByProjectCodeHoleCode(params);
}
if ("FIELD_WATERPRESSURE".equals(itemArr[i])) {
params.put("tableName", "TEMP_FIELD_WATERPRESSURE");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_WP_TEST");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "WATERPRESSURE";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("FIELD_PERMEABLITY".equals(itemArr[i])) {
params.put("tableName", "TEMP_FIELD_PERMEABILITY");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_FIELDPER_SUB");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "PERMEABILITY";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("FIELD_PRESSUREMETER".equals(itemArr[i])) {
params.put("tableName", "TEMP_FIELD_PRESSUREMETER");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "PRESSUREMETER";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("FIELD_CONE_PENETRATION".equals(itemArr[i])) {
params.put("tableName", "TEMP_FIELD_CONE_PENETRATION");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_CONE_PENETRATION_IMAGES");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "CONE";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_CLASSIFICATION".equals(itemArr[i])) {
params.put("tableName", "TEMP_CLASSIFICATION");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_CLASSIFICATION";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_CBR".equals(itemArr[i])) {
params.put("tableName", "TEMP_CBR_COMPAC");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_CBR";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_CONSOLIDATION".equals(itemArr[i])) {
params.put("tableName", "TEMP_CONSOLIDATION_USUAL");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_CONSOLIDATION");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_CONSOLIDATION";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_UNCONFINED_USUAL".equals(itemArr[i])) {
params.put("tableName", "TEMP_UNCONFINED_USUAL");
selectClassService.deleteByProjectCodeHoleCode(params);
oPROJECT_CODE = oPROJECT_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
oHOLE_CODE = oHOLE_CODE.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "").replaceAll ("&","");
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_UNCONFINED";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_TRIAXIAL".equals(itemArr[i])) {
params.put("tableName", "TEMP_TRIAXIAL_USUAL");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_TRIAXIAL_CU");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_TRIAXIAL_UU");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_TRIAXIAL";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_RESONANT".equals(itemArr[i])) {
params.put("tableName", "TEMP_RESONANT_USUAL");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_RESONANT");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_RESONANT";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("SAND_REPEATED_TRIAXIAL".equals(itemArr[i])) {
params.put("tableName", "TEMP_REPEATED_TRIAXIAL_USUAL");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_REPEATED_TRIAXIAL");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "SAND_REPEATED";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("ROCK_UNIAXIAL".equals(itemArr[i])) {
params.put("tableName", "TEMP_ROCK_UNIAXIAL");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "ROCK_UNIAXIAL";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("ROCK_TRIAXIAL".equals(itemArr[i])) {
params.put("tableName", "TEMP_ROCK_TRIAXIAL");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "ROCK_TRIAXIAL";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("ROCK_POINTLOAD".equals(itemArr[i])) {
params.put("tableName", "TEMP_ROCK_POINTLOAD");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "ROCK_POINTLOAD";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("ROCK_JOINTSHEAR".equals(itemArr[i])) {
params.put("tableName", "TEMP_ROCK_JOINTSHEAR");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "ROCK_JOINTSHEAR";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("ROCK_RESONANT".equals(itemArr[i])) {
params.put("tableName", "TEMP_ROCK_RESONANT_USUAL");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_ROCK_RESONANT");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "ROCK_RESONANT";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("ROCK_REPEATED_TRIAXIAL".equals(itemArr[i])) {
params.put("tableName", "TEMP_ROCK_REPEATED_TRIAXIAL_U");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_ROCK_REPEATED_TRIAXIAL");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "ROCK_REPEATED";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("BOREHOLE_WAVE".equals(itemArr[i])) {
// DATA 삭제
params.put("tableName", "TEMP_BOREHOLE_WAVE");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_BOREHOLE_WAVE_PS");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "BOREHOLE_WAVE";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("DOWNHOLE".equals(itemArr[i])) {
// DATA 삭제
params.put("tableName", "TEMP_DOWNHOLE");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_DOWNHOLE_PS");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "DOWNHOLE";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
if ("DENSITY".equals(itemArr[i])) {
// DATA 삭제
params.put("tableName", "TEMP_DENSITY");
selectClassService.deleteByProjectCodeHoleCode(params);
params.put("tableName", "TEMP_DENSITY_SUB");
selectClassService.deleteByProjectCodeHoleCode(params);
// file삭제
deletePath += "CH" + "/" + oPROJECT_CODE + "/" + oHOLE_CODE + "/" + "DENSITY";
File delfile = new File(deletePath);
wUtil.deleteFolder(delfile);
}
}
}
params.put("msg", "저장 성공");
model.put("params", params);
return "/web/input/selectClass/selectClassInfoDb";
}
@RequestMapping(value = "/selectClass/referenceCode")
public String referenceCode(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
String oTEST_INFO_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("TEST_INFO_CODE")));
String oPROJECT_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("PROJECT_CODE"))); // 프로젝트코드
String oHOLE_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("HOLE_CODE"))); // 시추공코드
params.put("projectCode", oPROJECT_CODE);
params.put("holeCode", oHOLE_CODE);
params.put("testInfoCode", oTEST_INFO_CODE);
List<EgovMap> arrayClass = selectClassService.selectTempReference(params);
List<EgovMap> arrayRes = selectClassService.selectTempReferenceCode(params);
model.put("arrClass", arrayClass);
model.put("arrRes", arrayRes);
model.put("params", params);
return "/web/common/referenceCode";
}
@RequestMapping(value = "/selectClass/referenceCodeDb")
public String referenceCodeDb(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
// request
String oPROC = GeoinfoCommon.parseData(String.valueOf(params.get("PROC")));
String oPROJECT_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("PROJECT_CODE")));
String oHOLE_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("HOLE_CODE")));
String oTEST_INFO_CODE = GeoinfoCommon.parseData(String.valueOf(params.get("TEST_INFO_CODE")));
String oITEM_INFO_Arr = GeoinfoCommon.parseData(String.valueOf(params.get("ITEM_INFO_Arr")));
String oGRID_ROOT = GeoinfoCommon.parseData(String.valueOf(params.get("GRID_ROOT")));
String oTYPEOFTEST = GeoinfoCommon.parseData(String.valueOf(params.get("TYPEOFTEST")));
params.put("projectCode", oPROJECT_CODE);
params.put("holeCode", oHOLE_CODE);
params.put("testInfoCode", oTEST_INFO_CODE);
System.out.println("------------------------------------------------------------------------------- 기준계 조회 및 등록 Start >>>>>>>>>> " + oPROC);
try {
if ("C".equals(oPROC)) { // 시험정보에 따른 항목 저장
String[] itemArr = oITEM_INFO_Arr.split("\\|");
int itemArrLen = itemArr.length;
// System.out.println("itemArr.length >>>>>>>>>>> " +
// itemArrLen);
if (itemArrLen > 0) {
for (int i = 0; i < itemArrLen; i++) {
String[] itemStr = itemArr[i].split(",");
System.out.println(i + " >>>> " + itemStr[0] + "," + itemStr[1] + "," + itemStr[2]);
String oITEM_INFO_CODE = itemStr[0];
String oREFERENCE_GUBUN = itemStr[1];
String oREFERENCE_CODE = itemStr[2];
params.put("itemInfoCode", oITEM_INFO_CODE);
params.put("referenceGubun", oREFERENCE_GUBUN);
params.put("referenceCode", oREFERENCE_CODE);
params.put("userId", request.getSession().getAttribute("USERID"));
selectClassService.mergeTempReference(params);
}
}
} else if ("RS".equals(oPROC)) { // 시험정보에 따른 정보 조회 - (행추가 || 열추가)
// 기존 등록된 기준계 조회
List<EgovMap> arrClass = selectClassService.selectReference(params);
model.put("arrClass", arrClass);
}
} catch (MalformedURLException e) {
logger.debug("error", e);
} catch (NumberFormatException e) {
logger.debug("error", e);
} catch (ParseException e) {
logger.debug("error", e);
} catch (IOException e) {
logger.debug("error", e);
} catch (Exception e) {
logger.debug("error", e);
}
return "/web/common/referenceCodeDb";
}
}
*/

36
src/main/java/geoinfo/regi/status/service/RegiPageMapper.java
View File

@ -107,51 +107,87 @@ public interface RegiPageMapper {
List<EgovMap> getCone(Map<String, Object> params) throws Exception; List<EgovMap> getCone(Map<String, Object> params) throws Exception;
List<EgovMap> getCone2(Map<String, Object> params) throws Exception;
List<EgovMap> getPermeability(Map<String, Object> params) throws Exception; List<EgovMap> getPermeability(Map<String, Object> params) throws Exception;
List<EgovMap> getPermeability2(Map<String, Object> params) throws Exception;
List<EgovMap> getPermeabilityCount(Map<String, Object> params) throws Exception; List<EgovMap> getPermeabilityCount(Map<String, Object> params) throws Exception;
List<EgovMap> getPressuremeter(Map<String, Object> params) throws Exception; List<EgovMap> getPressuremeter(Map<String, Object> params) throws Exception;
EgovMap getWaterpressure(Map<String, Object> params) throws Exception; EgovMap getWaterpressure(Map<String, Object> params) throws Exception;
EgovMap getWaterpressure2(Map<String, Object> params) throws Exception;
List<EgovMap> getRefractionSurvey(Map<String, Object> params) throws Exception; List<EgovMap> getRefractionSurvey(Map<String, Object> params) throws Exception;
EgovMap getRockRepeatedTriaxual(Map<String, Object> params) throws Exception; EgovMap getRockRepeatedTriaxual(Map<String, Object> params) throws Exception;
EgovMap getRockRepeatedTriaxual2(Map<String, Object> params) throws Exception;
List<EgovMap> getRepeatedTriaxual(Map<String, Object> params) throws Exception; List<EgovMap> getRepeatedTriaxual(Map<String, Object> params) throws Exception;
List<EgovMap> getRepeatedTriaxual2(Map<String, Object> params) throws Exception;
EgovMap getResistivitySurvey(Map<String, Object> params) throws Exception; EgovMap getResistivitySurvey(Map<String, Object> params) throws Exception;
EgovMap getResonantUsual(Map<String, Object> params) throws Exception; EgovMap getResonantUsual(Map<String, Object> params) throws Exception;
EgovMap getResonantUsual2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockResonantUsual(Map<String, Object> params) throws Exception; List<EgovMap> getRockResonantUsual(Map<String, Object> params) throws Exception;
List<EgovMap> getRockResonantUsual2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockJointshear(Map<String, Object> params) throws Exception; List<EgovMap> getRockJointshear(Map<String, Object> params) throws Exception;
List<EgovMap> getRockJointshear2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockPointload(Map<String, Object> params) throws Exception; List<EgovMap> getRockPointload(Map<String, Object> params) throws Exception;
List<EgovMap> getRockPointload2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxial(Map<String, Object> params) throws Exception; List<EgovMap> getRockTriaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxial2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxialUnit(Map<String, Object> params) throws Exception; List<EgovMap> getRockTriaxialUnit(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxialUnit2(Map<String, Object> params) throws Exception;
List<EgovMap> getRegiUnit(Map<String, Object> params) throws Exception; List<EgovMap> getRegiUnit(Map<String, Object> params) throws Exception;
List<EgovMap> getRegiUnitOrder(Map<String, Object> params) throws Exception; List<EgovMap> getRegiUnitOrder(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxial(Map<String, Object> params) throws Exception; List<EgovMap> getRockUniaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxial2(Map<String, Object> params) throws Exception;
List<EgovMap> getCbrCompac(Map<String, Object> params) throws Exception; List<EgovMap> getCbrCompac(Map<String, Object> params) throws Exception;
List<EgovMap> getCbrCompac2(Map<String, Object> params) throws Exception;
List<EgovMap> getClassification(Map<String, Object> params) throws Exception; List<EgovMap> getClassification(Map<String, Object> params) throws Exception;
List<EgovMap> getClassification2(Map<String, Object> params) throws Exception;
List<EgovMap> getConsolidation(Map<String, Object> params) throws Exception; List<EgovMap> getConsolidation(Map<String, Object> params) throws Exception;
List<EgovMap> getConsolidation2(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialCu(Map<String, Object> params) throws Exception; List<EgovMap> getTriaxialCu(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialCu2(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialUu(Map<String, Object> params) throws Exception; List<EgovMap> getTriaxialUu(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialUu2(Map<String, Object> params) throws Exception;
List<EgovMap> getUnconfinedUsual(Map<String, Object> params) throws Exception; List<EgovMap> getUnconfinedUsual(Map<String, Object> params) throws Exception;
List<EgovMap> getUnconfinedUsual2(Map<String, Object> params) throws Exception;
EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception; EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception;
} }

36
src/main/java/geoinfo/regi/status/service/RegiPageService.java
View File

@ -108,52 +108,88 @@ public interface RegiPageService {
List<EgovMap> getCone(Map<String, Object> params) throws Exception; List<EgovMap> getCone(Map<String, Object> params) throws Exception;
List<EgovMap> getCone2(Map<String, Object> params) throws Exception;
List<EgovMap> getPermeability(Map<String, Object> params) throws Exception; List<EgovMap> getPermeability(Map<String, Object> params) throws Exception;
List<EgovMap> getPermeability2(Map<String, Object> params) throws Exception;
List<EgovMap> getPermeabilityCount(Map<String, Object> params) throws Exception; List<EgovMap> getPermeabilityCount(Map<String, Object> params) throws Exception;
List<EgovMap> getPressuremeter(Map<String, Object> params) throws Exception; List<EgovMap> getPressuremeter(Map<String, Object> params) throws Exception;
EgovMap getWaterpressure(Map<String, Object> params) throws Exception; EgovMap getWaterpressure(Map<String, Object> params) throws Exception;
EgovMap getWaterpressure2(Map<String, Object> params) throws Exception;
List<EgovMap> getRefractionSurvey(Map<String, Object> params) throws Exception; List<EgovMap> getRefractionSurvey(Map<String, Object> params) throws Exception;
EgovMap getRockRepeatedTriaxual(Map<String, Object> params) throws Exception; EgovMap getRockRepeatedTriaxual(Map<String, Object> params) throws Exception;
EgovMap getRockRepeatedTriaxual2(Map<String, Object> params) throws Exception;
List<EgovMap> getRepeatedTriaxual(Map<String, Object> params) throws Exception; List<EgovMap> getRepeatedTriaxual(Map<String, Object> params) throws Exception;
List<EgovMap> getRepeatedTriaxual2(Map<String, Object> params) throws Exception;
EgovMap getResistivitySurvey(Map<String, Object> params) throws Exception; EgovMap getResistivitySurvey(Map<String, Object> params) throws Exception;
EgovMap getResonantUsual(Map<String, Object> params) throws Exception; EgovMap getResonantUsual(Map<String, Object> params) throws Exception;
EgovMap getResonantUsual2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockResonantUsual(Map<String, Object> params) throws Exception; List<EgovMap> getRockResonantUsual(Map<String, Object> params) throws Exception;
List<EgovMap> getRockResonantUsual2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockJointshear(Map<String, Object> params) throws Exception; List<EgovMap> getRockJointshear(Map<String, Object> params) throws Exception;
List<EgovMap> getRockJointshear2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockPointload(Map<String, Object> params) throws Exception; List<EgovMap> getRockPointload(Map<String, Object> params) throws Exception;
List<EgovMap> getRockPointload2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxial(Map<String, Object> params) throws Exception; List<EgovMap> getRockTriaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxial2(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxialUnit(Map<String, Object> params) throws Exception; List<EgovMap> getRockTriaxialUnit(Map<String, Object> params) throws Exception;
List<EgovMap> getRockTriaxialUnit2(Map<String, Object> params) throws Exception;
List<EgovMap> getRegiUnit(Map<String, Object> params) throws Exception; List<EgovMap> getRegiUnit(Map<String, Object> params) throws Exception;
List<EgovMap> getRegiUnitOrder(Map<String, Object> params) throws Exception; List<EgovMap> getRegiUnitOrder(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxial(Map<String, Object> params) throws Exception; List<EgovMap> getRockUniaxial(Map<String, Object> params) throws Exception;
List<EgovMap> getRockUniaxial2(Map<String, Object> params) throws Exception;
List<EgovMap> getCbrCompac(Map<String, Object> params) throws Exception; List<EgovMap> getCbrCompac(Map<String, Object> params) throws Exception;
List<EgovMap> getCbrCompac2(Map<String, Object> params) throws Exception;
List<EgovMap> getClassification(Map<String, Object> params) throws Exception; List<EgovMap> getClassification(Map<String, Object> params) throws Exception;
List<EgovMap> getClassification2(Map<String, Object> params) throws Exception;
List<EgovMap> getConsolidation(Map<String, Object> params) throws Exception; List<EgovMap> getConsolidation(Map<String, Object> params) throws Exception;
List<EgovMap> getConsolidation2(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialCu(Map<String, Object> params) throws Exception; List<EgovMap> getTriaxialCu(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialCu2(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialUu(Map<String, Object> params) throws Exception; List<EgovMap> getTriaxialUu(Map<String, Object> params) throws Exception;
List<EgovMap> getTriaxialUu2(Map<String, Object> params) throws Exception;
List<EgovMap> getUnconfinedUsual(Map<String, Object> params) throws Exception; List<EgovMap> getUnconfinedUsual(Map<String, Object> params) throws Exception;
List<EgovMap> getUnconfinedUsual2(Map<String, Object> params) throws Exception;
EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception; EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception;
} }

91
src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java
View File

@ -264,11 +264,21 @@ public class RegiPageServiceImpl implements RegiPageService {
return regiPageMapper.getCone(params); return regiPageMapper.getCone(params);
} }
@Override
public List<EgovMap> getCone2(Map<String, Object> params) throws Exception {
return regiPageMapper.getCone2(params);
}
@Override @Override
public List<EgovMap> getPermeability(Map<String, Object> params) throws Exception { public List<EgovMap> getPermeability(Map<String, Object> params) throws Exception {
return regiPageMapper.getPermeability(params); return regiPageMapper.getPermeability(params);
} }
@Override
public List<EgovMap> getPermeability2(Map<String, Object> params) throws Exception {
return regiPageMapper.getPermeability2(params);
}
@Override @Override
public List<EgovMap> getPermeabilityCount(Map<String, Object> params) throws Exception { public List<EgovMap> getPermeabilityCount(Map<String, Object> params) throws Exception {
return regiPageMapper.getPermeabilityCount(params); return regiPageMapper.getPermeabilityCount(params);
@ -284,6 +294,11 @@ public class RegiPageServiceImpl implements RegiPageService {
return regiPageMapper.getWaterpressure(params); return regiPageMapper.getWaterpressure(params);
} }
@Override
public EgovMap getWaterpressure2(Map<String, Object> params) throws Exception {
return regiPageMapper.getWaterpressure2(params);
}
@Override @Override
public List<EgovMap> getRefractionSurvey(Map<String, Object> params) throws Exception { public List<EgovMap> getRefractionSurvey(Map<String, Object> params) throws Exception {
return regiPageMapper.getRefractionSurvey(params); return regiPageMapper.getRefractionSurvey(params);
@ -294,11 +309,21 @@ public class RegiPageServiceImpl implements RegiPageService {
return regiPageMapper.getRockRepeatedTriaxual(params); return regiPageMapper.getRockRepeatedTriaxual(params);
} }
@Override
public EgovMap getRockRepeatedTriaxual2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockRepeatedTriaxual2(params);
}
@Override @Override
public List<EgovMap> getRepeatedTriaxual(Map<String, Object> params) throws Exception { public List<EgovMap> getRepeatedTriaxual(Map<String, Object> params) throws Exception {
return regiPageMapper.getRepeatedTriaxual(params); return regiPageMapper.getRepeatedTriaxual(params);
} }
@Override
public List<EgovMap> getRepeatedTriaxual2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRepeatedTriaxual2(params);
}
@Override @Override
public EgovMap getResistivitySurvey(Map<String, Object> params) throws Exception { public EgovMap getResistivitySurvey(Map<String, Object> params) throws Exception {
return regiPageMapper.getResistivitySurvey(params); return regiPageMapper.getResistivitySurvey(params);
@ -309,31 +334,62 @@ public class RegiPageServiceImpl implements RegiPageService {
return regiPageMapper.getResonantUsual(params); return regiPageMapper.getResonantUsual(params);
} }
@Override
public EgovMap getResonantUsual2(Map<String, Object> params) throws Exception {
return regiPageMapper.getResonantUsual2(params);
}
@Override @Override
public List<EgovMap> getRockResonantUsual(Map<String, Object> params) throws Exception { public List<EgovMap> getRockResonantUsual(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockResonantUsual(params); return regiPageMapper.getRockResonantUsual(params);
} }
@Override
public List<EgovMap> getRockResonantUsual2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockResonantUsual2(params);
}
@Override @Override
public List<EgovMap> getRockJointshear(Map<String, Object> params) throws Exception { public List<EgovMap> getRockJointshear(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockJointshear(params); return regiPageMapper.getRockJointshear(params);
} }
@Override
public List<EgovMap> getRockJointshear2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockJointshear2(params);
}
@Override @Override
public List<EgovMap> getRockPointload(Map<String, Object> params) throws Exception { public List<EgovMap> getRockPointload(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockPointload(params); return regiPageMapper.getRockPointload(params);
} }
@Override
public List<EgovMap> getRockPointload2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockPointload2(params);
}
@Override @Override
public List<EgovMap> getRockTriaxial(Map<String, Object> params) throws Exception { public List<EgovMap> getRockTriaxial(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockTriaxial(params); return regiPageMapper.getRockTriaxial(params);
} }
@Override
public List<EgovMap> getRockTriaxial2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockTriaxial2(params);
}
@Override @Override
public List<EgovMap> getRockTriaxialUnit(Map<String, Object> params) throws Exception { public List<EgovMap> getRockTriaxialUnit(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockTriaxialUnit(params); return regiPageMapper.getRockTriaxialUnit(params);
} }
@Override
public List<EgovMap> getRockTriaxialUnit2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockTriaxialUnit2(params);
}
@Override @Override
public List<EgovMap> getRegiUnitOrder(Map<String, Object> params) throws Exception { public List<EgovMap> getRegiUnitOrder(Map<String, Object> params) throws Exception {
return regiPageMapper.getRegiUnitOrder(params); return regiPageMapper.getRegiUnitOrder(params);
@ -350,36 +406,71 @@ public class RegiPageServiceImpl implements RegiPageService {
return regiPageMapper.getRockUniaxial(params); return regiPageMapper.getRockUniaxial(params);
} }
@Override
public List<EgovMap> getRockUniaxial2(Map<String, Object> params) throws Exception {
return regiPageMapper.getRockUniaxial2(params);
}
@Override @Override
public List<EgovMap> getCbrCompac(Map<String, Object> params) throws Exception { public List<EgovMap> getCbrCompac(Map<String, Object> params) throws Exception {
return regiPageMapper.getCbrCompac(params); return regiPageMapper.getCbrCompac(params);
} }
@Override
public List<EgovMap> getCbrCompac2(Map<String, Object> params) throws Exception {
return regiPageMapper.getCbrCompac2(params);
}
@Override @Override
public List<EgovMap> getClassification(Map<String, Object> params) throws Exception { public List<EgovMap> getClassification(Map<String, Object> params) throws Exception {
return regiPageMapper.getClassification(params); return regiPageMapper.getClassification(params);
} }
@Override
public List<EgovMap> getClassification2(Map<String, Object> params) throws Exception {
return regiPageMapper.getClassification2(params);
}
@Override @Override
public List<EgovMap> getConsolidation(Map<String, Object> params) throws Exception { public List<EgovMap> getConsolidation(Map<String, Object> params) throws Exception {
return regiPageMapper.getConsolidation(params); return regiPageMapper.getConsolidation(params);
} }
@Override
public List<EgovMap> getConsolidation2(Map<String, Object> params) throws Exception {
return regiPageMapper.getConsolidation2(params);
}
@Override @Override
public List<EgovMap> getTriaxialCu(Map<String, Object> params) throws Exception { public List<EgovMap> getTriaxialCu(Map<String, Object> params) throws Exception {
return regiPageMapper.getTriaxialCu(params); return regiPageMapper.getTriaxialCu(params);
} }
@Override
public List<EgovMap> getTriaxialCu2(Map<String, Object> params) throws Exception {
return regiPageMapper.getTriaxialCu2(params);
}
@Override @Override
public List<EgovMap> getTriaxialUu(Map<String, Object> params) throws Exception { public List<EgovMap> getTriaxialUu(Map<String, Object> params) throws Exception {
return regiPageMapper.getTriaxialUu(params); return regiPageMapper.getTriaxialUu(params);
} }
@Override
public List<EgovMap> getTriaxialUu2(Map<String, Object> params) throws Exception {
return regiPageMapper.getTriaxialUu2(params);
}
@Override @Override
public List<EgovMap> getUnconfinedUsual(Map<String, Object> params) throws Exception { public List<EgovMap> getUnconfinedUsual(Map<String, Object> params) throws Exception {
return regiPageMapper.getUnconfinedUsual(params); return regiPageMapper.getUnconfinedUsual(params);
} }
@Override
public List<EgovMap> getUnconfinedUsual2(Map<String, Object> params) throws Exception {
return regiPageMapper.getUnconfinedUsual2(params);
}
@Override @Override
public EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception { public EgovMap selectModeifyCallReason(HashMap<String, Object> params) throws Exception {
return regiPageMapper.selectModeifyCallReason(params); return regiPageMapper.selectModeifyCallReason(params);

8
src/main/java/geoinfo/regi/util/exportGeotechnicalPointShp.java
View File

@ -10,8 +10,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.geotools.data.DefaultTransaction;
import org.geotools.data.Transaction;
import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.data.shapefile.ShapefileDataStoreFactory; import org.geotools.data.shapefile.ShapefileDataStoreFactory;
import org.geotools.data.simple.SimpleFeatureSource; import org.geotools.data.simple.SimpleFeatureSource;
@ -245,26 +243,20 @@ public class exportGeotechnicalPointShp {
ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params); ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params);
dataStore.createSchema(MULTIPOINT); dataStore.createSchema(MULTIPOINT);
Transaction transaction = new DefaultTransaction("create");
String typeName = dataStore.getTypeNames()[0]; String typeName = dataStore.getTypeNames()[0];
SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName); SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName);
if (featureSource instanceof SimpleFeatureStore) { if (featureSource instanceof SimpleFeatureStore) {
SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource; SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource;
featureStore.setTransaction(transaction);
try { try {
featureStore.addFeatures(collection); featureStore.addFeatures(collection);
transaction.commit();
} catch (IOException problem) { } catch (IOException problem) {
transaction.rollback();
Log.debug("error", problem); Log.debug("error", problem);
} catch (Exception problem) { } catch (Exception problem) {
transaction.rollback();
Log.debug("error", problem); Log.debug("error", problem);
} finally { } finally {
transaction.close();
} }
} }

8
src/main/java/geoinfo/regi/util/exportGeotechnicalPointShp2.java
View File

@ -10,8 +10,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.geotools.data.DefaultTransaction;
import org.geotools.data.Transaction;
import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.data.shapefile.ShapefileDataStoreFactory; import org.geotools.data.shapefile.ShapefileDataStoreFactory;
import org.geotools.data.simple.SimpleFeatureSource; import org.geotools.data.simple.SimpleFeatureSource;
@ -249,26 +247,20 @@ public class exportGeotechnicalPointShp2 {
ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params); ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params);
dataStore.createSchema(POINT); dataStore.createSchema(POINT);
Transaction transaction = new DefaultTransaction("create");
String typeName = dataStore.getTypeNames()[0]; String typeName = dataStore.getTypeNames()[0];
SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName); SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName);
if (featureSource instanceof SimpleFeatureStore) { if (featureSource instanceof SimpleFeatureStore) {
SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource; SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource;
featureStore.setTransaction(transaction);
try { try {
featureStore.addFeatures(collection); featureStore.addFeatures(collection);
transaction.commit();
} catch (IOException problem) { } catch (IOException problem) {
transaction.rollback();
Log.debug("error", problem); Log.debug("error", problem);
} catch (Exception problem) { } catch (Exception problem) {
transaction.rollback();
Log.debug("error", problem); Log.debug("error", problem);
} finally { } finally {
transaction.close();
} }
} }

8
src/main/java/geoinfo/regi/util/exportGeotechnicalShp.java
View File

@ -10,8 +10,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.geotools.data.DefaultTransaction;
import org.geotools.data.Transaction;
import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.data.shapefile.ShapefileDataStoreFactory; import org.geotools.data.shapefile.ShapefileDataStoreFactory;
import org.geotools.data.simple.SimpleFeatureSource; import org.geotools.data.simple.SimpleFeatureSource;
@ -192,26 +190,20 @@ public class exportGeotechnicalShp {
ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params); ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params);
dataStore.createSchema(MULTIPOINT); dataStore.createSchema(MULTIPOINT);
Transaction transaction = new DefaultTransaction("create");
String typeName = dataStore.getTypeNames()[0]; String typeName = dataStore.getTypeNames()[0];
SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName); SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName);
if (featureSource instanceof SimpleFeatureStore) { if (featureSource instanceof SimpleFeatureStore) {
SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource; SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource;
featureStore.setTransaction(transaction);
try { try {
featureStore.addFeatures(collection); featureStore.addFeatures(collection);
transaction.commit();
} catch (IOException problem) { } catch (IOException problem) {
transaction.rollback();
Log.debug("error", problem); Log.debug("error", problem);
} catch (Exception problem) { } catch (Exception problem) {
transaction.rollback();
Log.debug("error", problem); Log.debug("error", problem);
} finally { } finally {
transaction.close();
} }
} }

14
src/main/java/geoinfo/regi/util/exportShp.java
View File

@ -10,8 +10,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.geotools.data.DefaultTransaction;
import org.geotools.data.Transaction;
import org.geotools.data.shapefile.ShapefileDataStore; import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.data.shapefile.ShapefileDataStoreFactory; import org.geotools.data.shapefile.ShapefileDataStoreFactory;
import org.geotools.data.simple.SimpleFeatureSource; import org.geotools.data.simple.SimpleFeatureSource;
@ -123,28 +121,20 @@ public class exportShp {
ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params); ShapefileDataStore dataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params);
dataStore.createSchema(LINESTRING); dataStore.createSchema(LINESTRING);
Transaction transaction = new DefaultTransaction("create");
String typeName = dataStore.getTypeNames()[0]; String typeName = dataStore.getTypeNames()[0];
SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName); SimpleFeatureSource featureSource = dataStore.getFeatureSource(typeName);
if (featureSource instanceof SimpleFeatureStore) { if (featureSource instanceof SimpleFeatureStore) {
SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource; SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource;
featureStore.setTransaction(transaction);
try { try {
featureStore.addFeatures(collection); featureStore.addFeatures(collection);
transaction.commit();
} catch (NumberFormatException problem) { } catch (NumberFormatException problem) {
transaction.rollback();
} catch (MalformedURLException problem) { } catch (MalformedURLException problem) {
transaction.rollback();
} catch (IOException problem) { } catch (IOException problem) {
transaction.rollback();
} catch (Exception problem) { } catch (Exception problem) {
transaction.rollback();
} finally { } finally {
transaction.close();
} }
} }
@ -156,16 +146,12 @@ public class exportShp {
} }
} catch (NumberFormatException problem) { } catch (NumberFormatException problem) {
Log.debug("error", problem); Log.debug("error", problem);
transaction.rollback();
} catch (MalformedURLException problem) { } catch (MalformedURLException problem) {
Log.debug("error", problem); Log.debug("error", problem);
transaction.rollback();
} catch (IOException problem) { } catch (IOException problem) {
Log.debug("error", problem); Log.debug("error", problem);
transaction.rollback();
} catch (Exception e) { } catch (Exception e) {
Log.debug("error", e); Log.debug("error", e);
transaction.rollback();
} catch (Throwable e) { } catch (Throwable e) {
Log.debug(e.getMessage()); Log.debug(e.getMessage());
} }

47
src/main/java/geoinfo/util/MobileCertificationUtil.java
View File

@ -145,11 +145,10 @@ public class MobileCertificationUtil {
public static Map<String, String> decryptCertData(String in_recCert, String in_certNum) throws Exception{ public static Map<String, String> decryptCertData(String in_recCert, String in_certNum) throws Exception{
Map<String, String> resultMap = new HashMap<>(); Map<String, String> resultMap = new HashMap<>();
//01. 암호화 모듈 (jar) Loading //01. 한국모바일인증(주) 암호화 모듈 선언
com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager(); com.icert.comm.secu.IcertSecuManager seed = new com.icert.comm.secu.IcertSecuManager();
//02. 1차 복호화 //02. 1차 복호화
//수신된 certNum를 이용하여 복호화
String rec_cert = seed.getDec(in_recCert, in_certNum); String rec_cert = seed.getDec(in_recCert, in_certNum);
//03. 1차 파싱 //03. 1차 파싱
@ -157,10 +156,10 @@ public class MobileCertificationUtil {
int inf2 = rec_cert.indexOf("/",inf1+1); int inf2 = rec_cert.indexOf("/",inf1+1);
String encPara = rec_cert.substring(0,inf1); //암호화된 통합 파라미터 String encPara = rec_cert.substring(0,inf1); //암호화된 통합 파라미터
String encMsg1 = rec_cert.substring(inf1+1,inf2); //암호화된 통합 파라미터의 Hash값, 위,변조여부1 String encMsg1 = rec_cert.substring(inf1+1,inf2); //암호화된 통합 파라미터의 Hash값
//04. 위변조 검증 //04. 위변조 검증
String encMsg2 = seed.getMsg(encPara); //위,변조여부2 String encMsg2 = seed.getMsg(encPara);
String msgChk = "N"; String msgChk = "N";
if(encMsg2.equals(encMsg1)){ if(encMsg2.equals(encMsg1)){
@ -194,24 +193,24 @@ public class MobileCertificationUtil {
int info17 = rec_cert.indexOf("/",info16+1); int info17 = rec_cert.indexOf("/",info16+1);
int info18 = rec_cert.indexOf("/",info17+1); int info18 = rec_cert.indexOf("/",info17+1);
String certNum = rec_cert.substring(0,info1); //요청번호 String certNum = rec_cert.substring(0,info1);
String date = rec_cert.substring(info1+1,info2); //요청일시 String date = rec_cert.substring(info1+1,info2);
String CI = rec_cert.substring(info2+1,info3); //연계정보(CI) String CI = rec_cert.substring(info2+1,info3);
String phoneNo = rec_cert.substring(info3+1,info4); //휴대폰번호 String phoneNo = rec_cert.substring(info3+1,info4);
String phoneCorp = rec_cert.substring(info4+1,info5); //이동통신사 String phoneCorp = rec_cert.substring(info4+1,info5);
String birthDay = rec_cert.substring(info5+1,info6); //생년월일 String birthDay = rec_cert.substring(info5+1,info6);
String gender = rec_cert.substring(info6+1,info7); //성별 String gender = rec_cert.substring(info6+1,info7);
String nation = rec_cert.substring(info7+1,info8); //내외국인 String nation = rec_cert.substring(info7+1,info8);
String name = rec_cert.substring(info8+1,info9); //성명 String name = rec_cert.substring(info8+1,info9);
String result = rec_cert.substring(info9+1,info10); //결과값 String result = rec_cert.substring(info9+1,info10);
String certMet = rec_cert.substring(info10+1,info11); //인증방법 String certMet = rec_cert.substring(info10+1,info11);
String ip = rec_cert.substring(info11+1,info12); //ip주소 String ip = rec_cert.substring(info11+1,info12);
String M_name = rec_cert.substring(info12+1,info13); //미성년자 성명 String reserve1 = rec_cert.substring(info12+1,info13);
String M_birthDay = rec_cert.substring(info13+1,info14); //미성년자 생년월일 String reserve2 = rec_cert.substring(info13+1,info14);
String M_Gender = rec_cert.substring(info14+1,info15); //미성년자 성별 String reserve3 = rec_cert.substring(info14+1,info15);
String M_nation = rec_cert.substring(info15+1,info16); //미성년자 내외국인 String reserve4 = rec_cert.substring(info15+1,info16);
String plusInfo = rec_cert.substring(info16+1,info17); //추가DATA정보 String plusInfo = rec_cert.substring(info16+1,info17);
String DI = rec_cert.substring(info17+1,info18); //중복가입확인정보(DI) String DI = rec_cert.substring(info17+1,info18);
//07. CI, DI 복호화 //07. CI, DI 복호화
CI = seed.getDec(CI, in_certNum); CI = seed.getDec(CI, in_certNum);
@ -229,10 +228,6 @@ public class MobileCertificationUtil {
resultMap.put("result", result); resultMap.put("result", result);
resultMap.put("certMet", certMet); resultMap.put("certMet", certMet);
resultMap.put("ip", ip); resultMap.put("ip", ip);
resultMap.put("M_name", M_name);
resultMap.put("M_birthDay", M_birthDay);
resultMap.put("M_Gender", M_Gender);
resultMap.put("M_nation", M_nation);
resultMap.put("plusInfo", plusInfo); resultMap.put("plusInfo", plusInfo);
resultMap.put("DI", DI); resultMap.put("DI", DI);

4
src/main/resources/egovframework/egovProps/geoinfo.properties
View File

@ -45,8 +45,8 @@ Globals.PAGELIST = 10
Globals.FileCreatePathZip = c:\\test2\\ Globals.FileCreatePathZip = c:\\test2\\
# Active X # Active X
# \uc9c0\ub3c4\uc11c\ubc84 # \uc9c0\ub3c4\uc11c\ubc84
#Globals.OcxHostUrl = http://218.232.234.166/Server/ Globals.OcxHostUrl = http://218.232.234.166/Server/
Globals.OcxHostUrl = http://172.12.192.44/Server/ #Globals.OcxHostUrl = http://172.12.192.44/Server/
Globals.OcxMapFileVer = 2,0,0,3 Globals.OcxMapFileVer = 2,0,0,3
Globals.OcxMapClassID = CC13D8F5-F406-4833-855D-F44DA7875776 Globals.OcxMapClassID = CC13D8F5-F406-4833-855D-F44DA7875776

12
src/main/resources/egovframework/egovProps/globals.properties
View File

@ -4,9 +4,21 @@
# Oracle # Oracle
Oracle.Driver=oracle.jdbc.driver.OracleDriver Oracle.Driver=oracle.jdbc.driver.OracleDriver
################################################################
# Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl is prod
#Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl
Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
################################################################
#Oracle.Url=jdbc:oracle:thin:@192.168.0.29:1521:xe
#Oracle.Url=jdbc:oracle:thin:@192.168.0.71:1521:orcl
#Oracle.Url=jdbc:oracle:thin:@220.121.145.78:7080:xe
#Oracle.Url=jdbc:oracle:thin:@localhost:1521:orcl
#Oracle.Url=jdbc:oracle:thin:@218.232.234.162:1521:ORAGEO
Oracle.ID=geoinfo Oracle.ID=geoinfo
Oracle.Password=geoinfo Oracle.Password=geoinfo
#Oracle.Password=!!kictgis1234
############################################### ###############################################

17
src/main/resources/egovframework/spring/context-datasource.xml
View File

@ -14,22 +14,6 @@
<!-- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> <property name="driverClassName" value="com.mysql.jdbc.Driver"/> <property name="url" value="jdbc:mysql://locakhost/imukorea"/> <property name="username" value="root"/> <property name="password" value="1234"/> </bean> --> <!-- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> <property name="driverClassName" value="com.mysql.jdbc.Driver"/> <property name="url" value="jdbc:mysql://locakhost/imukorea"/> <property name="username" value="root"/> <property name="password" value="1234"/> </bean> -->
<!-- Oracle --> <!-- Oracle -->
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="${Oracle.Driver}" />
<property name="url" value="${Oracle.Url}" />
<property name="username" value="${Oracle.ID}" />
<property name="password" value="${Oracle.Password}" />
<property name="initialSize" value="2"/>
<property name="maxActive" value="2"/>
<property name="maxIdle" value="2" />
<property name="minIdle" value="2" />
<property name="testOnBorrow" value="false" />
</bean>
<!-- thkim original -->
<!--
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="${Oracle.Driver}" /> <property name="driverClassName" value="${Oracle.Driver}" />
<property name="url" value="${Oracle.Url}" /> <property name="url" value="${Oracle.Url}" />
@ -41,7 +25,6 @@
<property name="minIdle" value="300" /> <property name="minIdle" value="300" />
<property name="testOnBorrow" value="false" /> <property name="testOnBorrow" value="false" />
</bean> </bean>
-->
<!-- PostgreSQL JDBC setting --> <!-- PostgreSQL JDBC setting -->

13
src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml
View File

@ -305,11 +305,8 @@
</select> </select>
<!-- 2023-10-19 LHJ 공지사항 팝업창 --> <!-- 2023-10-19 LHJ 공지사항 팝업창 -->
<!-- Disabled by thkim 2024-02-06 Due to the absence of the POPUP_ENDDT column in the WEB_NOTICE table of the current database, it will be replaced with an alternative query. -->
<select id="selectPopupIdx" resultType="java.lang.String"> <select id="selectPopupIdx" resultType="java.lang.String">
<!-- original query
<![CDATA[ <![CDATA[
SELECT SELECT
IDX IDX
FROM WEB_NOTICE FROM WEB_NOTICE
@ -317,14 +314,6 @@
AND TO_DATE(POPUP_BGNDT, 'YYYYMMDDHH24MI') <= SYSDATE AND TO_DATE(POPUP_BGNDT, 'YYYYMMDDHH24MI') <= SYSDATE
AND TO_DATE(POPUP_ENDDT, 'YYYYMMDDHH24MI') >= SYSDATE AND TO_DATE(POPUP_ENDDT, 'YYYYMMDDHH24MI') >= SYSDATE
]]> ]]>
-->
<!-- Alternative query -->
<![CDATA[
SELECT
IDX
FROM WEB_NOTICE
WHERE IDX < 1
]]>
</select> </select>
</mapper> </mapper>

9
src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
View File

@ -45,6 +45,15 @@
</if> </if>
</select> </select>
<select id="checkWebMemberIn" parameterType="HashMap" resultType="int">
SELECT COUNT(*)
FROM
WEB_MEMBER_IN
WHERE
USERID = #{userId} AND
DUPINFO = #{DI}
</select>
<select id="selectWebMemberInLoginCount" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap"> <select id="selectWebMemberInLoginCount" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
SELECT AGREEYN, USERID, PASSWD, CLS, USER_NAME, SYSDATE, LOGIN_COUNT, LAST_LOGIN_DATE + 1/(24*12) AS SYSDATE2, VIRTUALNO, SELECT AGREEYN, USERID, PASSWD, CLS, USER_NAME, SYSDATE, LOGIN_COUNT, LAST_LOGIN_DATE + 1/(24*12) AS SYSDATE2, VIRTUALNO,
DECODE(PROJECT_MASTER_COMPANY_CODE,'','0',PROJECT_MASTER_COMPANY_CODE) MASTER_COMPANY_CODE, DECODE(PROJECT_MASTER_COMPANY_CODE,'','0',PROJECT_MASTER_COMPANY_CODE) MASTER_COMPANY_CODE,

66
src/main/resources/egovframework/sqlmap/mapper/regi/common.xml
View File

@ -390,6 +390,23 @@
]]> ]]>
</select> </select>
<select id="getRockJointshearList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
nvl(hole_code,'noCode') AS hole_code,
nvl(rjoint_code, 'noCode') AS rjointcode,
nvl(graph_image, 'noImage') AS graph_image
FROM
temp_rock_jointshear
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
and RJOINT_CODE = #{rpointCode}
]]>
</select>
<select id="getRockPointload" parameterType="map" resultType="egovMap"> <select id="getRockPointload" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(rock_point_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as rpointCode, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(rock_point_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as rpointCode, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE
@ -401,6 +418,21 @@
]]> ]]>
</select> </select>
<select id="getRockPointloadList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
NVL(HOLE_CODE,'noCode') AS HOLE_CODE,
NVL(rock_point_code,'noCode') AS rpointCode,
NVL(GRAPH_IMAGE,'noImage') AS GRAPH_IMAGE
FROM TEMP_ROCK_POINTLOAD
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
AND rock_point_code = #{rpointCode}
]]>
</select>
<select id="getRockTriaxial" parameterType="map" resultType="egovMap"> <select id="getRockTriaxial" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(rtri_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as rtriCode, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(rtri_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as rtriCode, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE
@ -412,6 +444,23 @@
]]> ]]>
</select> </select>
<select id="getRockTriaxialList" parameterType="map" resultType="egovMap">
<![CDATA[
select
HOLE_CODE as holeCode,
rtri_code as rtriCode,
GRAPH_IMAGE as graphImage
FROM TEMP_ROCK_TRIAXIAL
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',
SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId} and RTRI_CODE = #{sampleCode}
]]>
</select>
<select id="getRockUniaxial" parameterType="map" resultType="egovMap"> <select id="getRockUniaxial" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(runi_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as runiCode, NVL(LISTAGG(test_order,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as testOrder, NVL(LISTAGG(GRAPH_IMAGE1,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE1, NVL(LISTAGG(GRAPH_IMAGE2,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE2 SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(runi_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as runiCode, NVL(LISTAGG(test_order,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as testOrder, NVL(LISTAGG(GRAPH_IMAGE1,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE1, NVL(LISTAGG(GRAPH_IMAGE2,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE2
@ -440,6 +489,23 @@
]]> ]]>
</select> </select>
<select id="getRockUniaxialListRuni" parameterType="map" resultType="egovMap">
<![CDATA[
select
project_code,
hole_code,
runi_code,
test_order,
graph_Image1,
graph_Image2
from temp_rock_uniaxial
where
]]>
<![CDATA[
PROJECT_CODE = #{mId} and runi_code = #{sampleCode}
]]>
</select>
<select id="getCbrCompac" parameterType="map" resultType="egovMap"> <select id="getCbrCompac" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(LISTAGG(B.HOLE_CODE,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(A.SAMPLE_CODE,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noCode') as SAMPLE_CODE, NVL(LISTAGG(GRAPH_IMAGE1,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noImage') as GRAPH_IMAGE1, NVL(LISTAGG(GRAPH_IMAGE2,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noImage') as GRAPH_IMAGE2 SELECT NVL(LISTAGG(B.HOLE_CODE,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(A.SAMPLE_CODE,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noCode') as SAMPLE_CODE, NVL(LISTAGG(GRAPH_IMAGE1,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noImage') as GRAPH_IMAGE1, NVL(LISTAGG(GRAPH_IMAGE2,',') WITHIN GROUP(ORDER BY A.SAMPLE_CODE),'noImage') as GRAPH_IMAGE2

23
src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml
View File

@ -82,7 +82,7 @@ INSERT INTO TEMP_META_INFO (
<select id="getProjectCd" parameterType="map" resultType="java.util.HashMap"> <select id="getProjectCd" parameterType="map" resultType="java.util.HashMap">
<![CDATA[ <![CDATA[
SELECT P_NUM , SELECT P_NUM ,
CASE WHEN P_CODE = 'A' or P_CODE = 'K' or P_CODE = 'P' or P_CODE = 'R' or P_CODE = 'Z' THEN CASE WHEN P_CODE = 'A' or P_CODE = 'K' or P_CODE = 'P' or P_CODE = 'R' or P_CODE = 'Z' or P_CODE = 'Y' OR P_CODE = 'X' THEN
CHR(ASCII(P_CODE)+1) CHR(ASCII(P_CODE)+1)
ELSE P_CODE END P_CODE ELSE P_CODE END P_CODE
FROM ( FROM (
@ -98,6 +98,12 @@ INSERT INTO TEMP_META_INFO (
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(90) AND SUBSTR(PROJECT_CODE,1,1) <> CHR(90)
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(89) AND SUBSTR(PROJECT_CODE,1,1) <> CHR(89)
AND SUBSTR(PROJECT_CODE,1,4) <> CHR(88) AND SUBSTR(PROJECT_CODE,1,4) <> CHR(88)
AND SUBSTR(PROJECT_CODE,1,4) <> CHR(89)
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(87)--'W'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(83)--'S'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(66)--'B'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(67)--'C'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(68)--'D'
UNION UNION
SELECT SUBSTR(PROJECT_CODE,1,1) CODE , SUBSTR(PROJECT_CODE,2,4) NUM SELECT SUBSTR(PROJECT_CODE,1,1) CODE , SUBSTR(PROJECT_CODE,2,4) NUM
FROM TEMP_META_INFO WHERE SUBSTR(PROJECT_CODE,1,1) <> CHR(65) FROM TEMP_META_INFO WHERE SUBSTR(PROJECT_CODE,1,1) <> CHR(65)
@ -106,8 +112,14 @@ INSERT INTO TEMP_META_INFO (
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(82) AND SUBSTR(PROJECT_CODE,1,1) <> CHR(82)
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(90) AND SUBSTR(PROJECT_CODE,1,1) <> CHR(90)
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(89) AND SUBSTR(PROJECT_CODE,1,1) <> CHR(89)
AND SUBSTR(PROJECT_CODE,1,4) <> CHR(89)
AND SUBSTR(PROJECT_CODE,1,4) <> CHR(88) AND SUBSTR(PROJECT_CODE,1,4) <> CHR(88)
ORDER BY CODE DESC, NUM DESC AND SUBSTR(PROJECT_CODE,1,1) <> CHR(87)--'W'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(83)--'S'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(66)--'B'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(67)--'C'
AND SUBSTR(PROJECT_CODE,1,1) <> CHR(68)--'D'
ORDER BY CODE ASC, NUM DESC
) WHERE ROWNUM = 1 ) WHERE ROWNUM = 1
) )
]]> ]]>
@ -118,6 +130,13 @@ INSERT INTO TEMP_META_INFO (
DELETE FROM ${tableName} WHERE PROJECT_CODE = #{PROJECT_CODE} DELETE FROM ${tableName} WHERE PROJECT_CODE = #{PROJECT_CODE}
]]> ]]>
</delete> </delete>
<delete id="deleteHoleCode" parameterType="map">
<![CDATA[
DELETE FROM ${tableName} WHERE HOLE_CODE = #{HOLE_CODE}
]]>
</delete>
<delete id="deleteWebData" parameterType="map"> <delete id="deleteWebData" parameterType="map">
<![CDATA[ <![CDATA[
DELETE FROM WEB_DATAINPUT WHERE PROJECT_CODE IS NOT NULL AND NVL(PROJECT_CODE,' ') <> ' ' AND PROJECT_CODE = #{PROJECT_CODE} DELETE FROM WEB_DATAINPUT WHERE PROJECT_CODE IS NOT NULL AND NVL(PROJECT_CODE,' ') <> ' ' AND PROJECT_CODE = #{PROJECT_CODE}

285
src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml
View File

@ -50,7 +50,7 @@
<if test="endDate != null"> <if test="endDate != null">
<![CDATA[ AND TO_CHAR(A.DATETIME,'YYYYMMDD') <= #{endDate} ]]> <![CDATA[ AND TO_CHAR(A.DATETIME,'YYYYMMDD') <= #{endDate} ]]>
</if> </if>
ORDER BY A.PROJECT_CODE DESC, A.DATETIME DESC ORDER BY A.DATETIME DESC, A.PROJECT_CODE DESC
</select> </select>
@ -741,6 +741,20 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getCone2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_CONE_PENETRATION_IMAGES
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
and hole_code = #{holeCode}
ORDER BY HOLE_CODE
]]>
</select>
<select id="getPermeability" parameterType="map" resultType="egovMap"> <select id="getPermeability" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
select select
@ -755,11 +769,33 @@ INSERT INTO TEMP_SMS_LOG (
WHERE WHERE
]]> ]]>
<![CDATA[ <![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId} ORDER BY HOLE_CODE DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
ORDER BY HOLE_CODE
) A ) A
]]> ]]>
</select> </select>
<select id="getPermeability2" parameterType="map" resultType="egovMap">
<![CDATA[
select
A.*,
(select COUNT(*) as permeabilitycount from TBL_FIELDPER_SUB where FIELDPER_CODE = A.HOLE_CODE) AS permeabilitycount
FROM
(
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(fieldper_code,'noCode') as fieldperCode,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_FIELD_PERMEABILITY
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),
SUBSTR(HOLE_CODE,0,4)) = #{mId} and hole_code = #{holeCode} ORDER BY HOLE_CODE,FIELDPERCODE
) A
]]>
</select>
<select id="getPermeabilityCount" parameterType="map" resultType="egovMap"> <select id="getPermeabilityCount" parameterType="map" resultType="egovMap">
<![CDATA[select <![CDATA[select
NVL(B.FIELDPER_CODE,'noCode') as fieldpercode,COUNT(*) as permeabilitycount NVL(B.FIELDPER_CODE,'noCode') as fieldpercode,COUNT(*) as permeabilitycount
@ -802,6 +838,17 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getWaterpressure2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(wp_code,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as wpCode, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE
FROM TBL_FIELD_WATERPRESSURE
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId} and hole_code = #{holeCode}
]]>
</select>
<select id="getRefractionSurvey" parameterType="map" resultType="egovMap"> <select id="getRefractionSurvey" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(LINE_NUMBER,0) as LINE_NUMBER, SELECT NVL(LINE_NUMBER,0) as LINE_NUMBER,
@ -826,6 +873,18 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getRockRepeatedTriaxual2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(rt_seq,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noCode') as rtSeq, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE
FROM TBL_ROCK_REPEATED_TRIAXIAL_U
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId} and hole_code = #{holeCode}
]]>
</select>
<select id="getRepeatedTriaxual" parameterType="map" resultType="egovMap"> <select id="getRepeatedTriaxual" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT SELECT
@ -841,6 +900,22 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getRepeatedTriaxual2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(SAMPLE_CODE,'noCode') as SAMPLE_CODE,
NVL(rt_seq,0) as rtSeq,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_REPEATED_TRIAXIAL_USUAL
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId} and HOLE_CODE = #{holeCode}
]]>
</select>
<select id="getResistivitySurvey" parameterType="map" resultType="egovMap"> <select id="getResistivitySurvey" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(LISTAGG(LINE_NUMBER,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noLine') as LINE_NUMBER, NVL(LISTAGG(GRAPH_IMAGE1,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noImage') as GRAPH_IMAGE1, NVL(LISTAGG(GRAPH_IMAGE2,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noImage') as GRAPH_IMAGE2 SELECT NVL(LISTAGG(LINE_NUMBER,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noLine') as LINE_NUMBER, NVL(LISTAGG(GRAPH_IMAGE1,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noImage') as GRAPH_IMAGE1, NVL(LISTAGG(GRAPH_IMAGE2,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noImage') as GRAPH_IMAGE2
@ -863,6 +938,18 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getResonantUsual2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(LISTAGG(HOLE_CODE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noCode') as HOLE_CODE, NVL(LISTAGG(rc_seq,',') WITHIN GROUP(ORDER BY PROJECT_CODE),'noCode') as rcSeq, NVL(LISTAGG(GRAPH_IMAGE,',') WITHIN GROUP(ORDER BY HOLE_CODE),'noImage') as GRAPH_IMAGE
FROM TBL_RESONANT_USUAL
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId} and HOLE_CODE = #{holeCode}
]]>
</select>
<select id="getRockResonantUsual" parameterType="map" resultType="egovMap"> <select id="getRockResonantUsual" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE, SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
@ -876,6 +963,20 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getRockResonantUsual2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(rc_seq,0) as rcSeq,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_ROCK_RESONANT_USUAL
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId} and hole_code=#{holeCode} ORDER BY HOLE_CODE, RCSEQ
]]>
</select>
<select id="getRockJointshear" parameterType="map" resultType="egovMap"> <select id="getRockJointshear" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE, SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
@ -889,6 +990,20 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getRockJointshear2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(rjoint_code,'noCode') as RJOINT_CODE,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_ROCK_JOINTSHEAR
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
and HOLE_CODE= #{holeCode} and TEST_ORDER = '1' ORDER BY HOLE_CODE
]]>
</select>
<select id="getRockPointload" parameterType="map" resultType="egovMap"> <select id="getRockPointload" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE, SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
@ -902,6 +1017,21 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getRockPointload2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(rock_point_code,'noCode') as rpointCode,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_ROCK_POINTLOAD
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId} AND
hole_code = #{holeCode} and TEST_ORDER = '1'
]]>
</select>
<select id="getRockTriaxial" parameterType="map" resultType="egovMap"> <select id="getRockTriaxial" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE, SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
@ -916,6 +1046,21 @@ INSERT INTO TEMP_SMS_LOG (
</select> </select>
<select id="getRockTriaxial2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(rtri_code,'noCode') as rtriCode,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_ROCK_TRIAXIAL
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
and hole_code = #{holeCode} and test_order = '1' ORDER BY HOLE_CODE
]]>
</select>
<select id="getRockTriaxialUnit" parameterType="map" resultType="egovMap"> <select id="getRockTriaxialUnit" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
select A.HOLE_CODE,a.item_info_code as item_info_code, select A.HOLE_CODE,a.item_info_code as item_info_code,
@ -947,6 +1092,37 @@ INSERT INTO TEMP_SMS_LOG (
</select> </select>
<select id="getRockTriaxialUnit2" parameterType="map" resultType="egovMap">
<![CDATA[
select A.HOLE_CODE,a.item_info_code as item_info_code,
B.REFERENCE_DESE as REFERENCE_DESE
from TEMP_REFERENCE A
LEFT JOIN
(SELECT
B.item_info_code as item_info_code,
B.reference_gubun as reference_gubun,
B.REFERENCE_CODE as REFERENCE_CODE,
b.reference_desc AS REFERENCE_DESE
FROM TEMP_REFERENCE_CODE B
WHERE B.TEST_INFO_CODE = 'ROCK_TRIAXIAL'
) B
ON A.item_info_code = B.item_info_code and A.reference_gubun = B.reference_gubun and A.REFERENCE_CODE = B.REFERENCE_CODE
WHERE
]]>
<![CDATA[
A.HOLE_CODE IN(
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE
FROM TBL_ROCK_TRIAXIAL
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(HOLE_CODE)), '9' ,SUBSTR(HOLE_CODE,0,4),'10',SUBSTR(HOLE_CODE,0,5),SUBSTR(HOLE_CODE,0,4)) = #{mId}
and hole_code = #{holeCode} and test_order = '1'
]]>
) ORDER BY A.HOLE_CODE
</select>
<select id="getRegiUnit" parameterType="map" resultType="egovMap"> <select id="getRegiUnit" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
select A.HOLE_CODE,a.item_info_code as item_info_code, select A.HOLE_CODE,a.item_info_code as item_info_code,
@ -1027,6 +1203,22 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getRockUniaxial2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(HOLE_CODE,'noCode') as HOLE_CODE,
NVL(runi_code,'noCode') as runiCode,
NVL(test_order,0) as testOrder,
NVL(GRAPH_IMAGE1,'noImage') as GRAPH_IMAGE1,
NVL(GRAPH_IMAGE2,'noImage') as GRAPH_IMAGE2
FROM TEMP_ROCK_UNIAXIAL
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId} and hole_code= #{holeCode} ORDER BY HOLE_CODE
]]>
</select>
<select id="getCbrCompac" parameterType="map" resultType="egovMap"> <select id="getCbrCompac" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE, SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE,
@ -1041,6 +1233,22 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getCbrCompac2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE,
NVL(A.SAMPLE_CODE,'noCode') as SAMPLE_CODE,
NVL(GRAPH_IMAGE1,'noImage') as GRAPH_IMAGE1,
NVL(GRAPH_IMAGE2,'noImage') as GRAPH_IMAGE2
FROM TBL_CBR_COMPAC A LEFT OUTER JOIN TBL_SAMPLE_INFO B ON A.SAMPLE_CODE = B.SAMPLE_CODE
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(A.SAMPLE_CODE)), '13' ,SUBSTR(A.SAMPLE_CODE,0,4),'14',SUBSTR(A.SAMPLE_CODE,0,5),SUBSTR(A.SAMPLE_CODE,0,4)) = #{mId}
and B.HOLE_CODE = #{holeCode}
ORDER BY A.SAMPLE_CODE
]]>
</select>
<select id="getClassification" parameterType="map" resultType="egovMap"> <select id="getClassification" parameterType="map" resultType="egovMap">
<![CDATA[ SELECT <![CDATA[ SELECT
NVL(B.HOLE_CODE,'noCode') as HOLE_CODE, NVL(B.HOLE_CODE,'noCode') as HOLE_CODE,
@ -1053,6 +1261,18 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getClassification2" parameterType="map" resultType="egovMap">
<![CDATA[ SELECT
NVL(B.HOLE_CODE,'noCode') as HOLE_CODE,
NVL(A.SAMPLE_CODE,'noCode') as SAMPLE_CODE,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TBL_CLASSIFICATION A LEFT OUTER JOIN TBL_SAMPLE_INFO B ON A.SAMPLE_CODE = B.SAMPLE_CODE
WHERE ]]>
<![CDATA[
DECODE(LENGTH(TRIM(a.SAMPLE_CODE)), '13' ,SUBSTR(a.SAMPLE_CODE,0,4),'14',SUBSTR(a.SAMPLE_CODE,0,5),SUBSTR(a.SAMPLE_CODE,0,4)) = #{mId} and hole_code = #{holeCode}
]]>
</select>
<select id="getConsolidation" parameterType="map" resultType="egovMap"> <select id="getConsolidation" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE, NVL(A.SAMPLE_CODE,'noCode') as SAMPLE_CODE, NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE, NVL(A.SAMPLE_CODE,'noCode') as SAMPLE_CODE, NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
@ -1064,6 +1284,17 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getConsolidation2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE, NVL(A.SAMPLE_CODE,'noCode') as SAMPLE_CODE, NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TEMP_CONSOLIDATION_USUAL A LEFT OUTER JOIN TEMP_SAMPLE_INFO B ON A.SAMPLE_CODE = B.SAMPLE_CODE
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(A.SAMPLE_CODE)), '13' ,SUBSTR(A.SAMPLE_CODE,0,4),'14',SUBSTR(A.SAMPLE_CODE,0,5),SUBSTR(A.SAMPLE_CODE,0,4)) = #{mId} and B.hole_code = #{holeCode}
]]>
</select>
<select id="getTriaxialCu" parameterType="map" resultType="egovMap"> <select id="getTriaxialCu" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
select select
@ -1079,6 +1310,23 @@ INSERT INTO TEMP_SMS_LOG (
]]> ]]>
</select> </select>
<select id="getTriaxialCu2" parameterType="map" resultType="egovMap">
<![CDATA[
select
NVL(b.tri_code,',') as triCode,
NVL(b.GRAPH_IMAGE1,',') as GRAPH_IMAGE1,
NVL(b.GRAPH_IMAGE2,',') as GRAPH_IMAGE2
from TBL_TRIAXIAL_USUAL b
left outer join TBL_TRIAXIAL_CU a on a.tri_code = b.tri_code
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(b.SAMPLE_CODE)), '13' ,SUBSTR(b.SAMPLE_CODE,0,4),'14',SUBSTR(b.SAMPLE_CODE,0,5),SUBSTR(b.SAMPLE_CODE,0,4)) = #{mId} AND a.tricu_testorder = '1'
and b.tri_code like #{holeCodeP}
ORDER BY b.SAMPLE_CODE
]]>
</select>
<select id="getTriaxialUu" parameterType="map" resultType="egovMap"> <select id="getTriaxialUu" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(a.tri_code,',') as triCode, SELECT NVL(a.tri_code,',') as triCode,
@ -1104,6 +1352,22 @@ INSERT INTO TEMP_SMS_LOG (
]]> --> ]]> -->
</select> </select>
<select id="getTriaxialUu2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(a.tri_code,',') as triCode,
NVL(a.GRAPH_IMAGE1,',') as GRAPH_IMAGE1,
NVL(a.GRAPH_IMAGE2,',') as GRAPH_IMAGE2
FROM TBL_TRIAXIAL_USUAL a left outer join TBL_TRIAXIAL_UU b
ON a.tri_code = b.tri_code
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(SAMPLE_CODE)), '13' ,SUBSTR(SAMPLE_CODE,0,4),'14',SUBSTR(SAMPLE_CODE,0,5),
SUBSTR(SAMPLE_CODE,0,4)) = #{mId} AND b.triuu_testorder = '1' and b.tri_code like #{holeCodeP} ORDER BY SAMPLE_CODE
]]>
</select>
<select id="getUnconfinedUsual" parameterType="map" resultType="egovMap"> <select id="getUnconfinedUsual" parameterType="map" resultType="egovMap">
<![CDATA[ <![CDATA[
SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE, SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE,
@ -1118,6 +1382,23 @@ INSERT INTO TEMP_SMS_LOG (
</select> </select>
<select id="getUnconfinedUsual2" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT NVL(B.HOLE_CODE,'noCode') as HOLE_CODE,
NVL(A.SAMPLE_CODE,'noCode') as SAMPLE_CODE,
NVL(GRAPH_IMAGE,'noImage') as GRAPH_IMAGE
FROM TEMP_UNCONFINED_USUAL A LEFT OUTER JOIN TEMP_SAMPLE_INFO B ON A.SAMPLE_CODE = B.SAMPLE_CODE
WHERE
]]>
<![CDATA[
DECODE(LENGTH(TRIM(A.SAMPLE_CODE)), '13' ,SUBSTR(A.SAMPLE_CODE,0,4),'14',SUBSTR(A.SAMPLE_CODE,0,5),SUBSTR(A.SAMPLE_CODE,0,4)) = #{mId} and
B.HOLE_CODE = #{holeCode}
ORDER BY A.SAMPLE_CODE
]]>
</select>
<select id="selectModeifyCallReason" parameterType="map" resultType="EgovMap"> <select id="selectModeifyCallReason" parameterType="map" resultType="EgovMap">
<![CDATA[ <![CDATA[
SELECT SMS_MSG SELECT SMS_MSG

BIN
src/main/webapp/WEB-INF/RexSOPServer.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/com/zipcode/Zipcode.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/com/zipcode/Zipcode_NewAddr.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/com/zipcode/Zipcode_Service.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlAttributes.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlElement.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlQueryString.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlRepeatBlock.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTable.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTableCell.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTableColgroup.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTableSection.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTableTBody.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTableTFoot.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTableTHead.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlTemplate.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/HtmlTemplate/HtmlUtilities.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/dbcp/ConnectionPool.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/dbcp/DatabaseQuery.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/property/GeoinfoProperties.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/framework/property/Globals.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/DllTest.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/Ellip2Ellipsoid.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/Ellipsoid.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/ExtensionFilter.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/FileDown.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/HTMLFilter.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/HangulEncode.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/Parameters7.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/Replace.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/Util.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/Values3.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/download.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/graphics.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/util/strUtil.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/CreateJDomXml.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/DataConvert.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/FileCopy.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/FtpUtil.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/GeoinfoPropertiesWeb.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/GlobalsWeb.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/MakeSpaceImage.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/WebConfirm.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/WebCoorUtil.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/WebSupplyXml.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/WebUtil.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/ZipUtils.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/_WebSupplyXml.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/comm/web/_WebUtil.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/ictway/com/BarLineChart.class
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/classes/ictway/com/jhlabs/map/AngleFormat.class
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More