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

Compare commits

merge into: DBNT:main
Branches Tags
DBNT:main
DBNT:master
DBNT:cks
...
pull from: DBNT:cks
Branches Tags
DBNT:main
DBNT:master
DBNT:cks

3 Commits
main ... cks

Author SHA1 Message Date
강석 최 45dae549d7 transactionManager 주석 처리. 2024-02-22 15:25:05 +09:00
강석 최 1580a8e424 ojdbc maven 의존성 추가. 별도로 lib에 존재하는 ojdbc 삭제. 2024-02-22 15:14:38 +09:00
강석 최 05284b66e9 주석해제 
pom.xml 수정
ojdbc 수정.
 2024-02-21 13:43:11 +09:00
14 changed files with 307 additions and 86 deletions
Show Stats Expand all files Collapse all files

219
doc/javadoc.xml
View File

File diff suppressed because one or more lines are too long

28
pom.xml
View File

@ -87,7 +87,7 @@
<dependency>
<groupId>egovframework.rte</groupId>
<artifactId>egovframework.rte.psl.dataaccess</artifactId>
<version>2.7.0</version>
<version>${egovframework.rte.version}</version>
</dependency>
<dependency>
<groupId>egovframework.rte</groupId>
@ -197,27 +197,27 @@
</dependency>
<!-- MySql -->
<dependency>
<!-- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.31</version>
</dependency>
<!-- Oracle -->
<!-- <dependency>
<groupId>ojdbc</groupId>
<artifactId>ojdbc14</artifactId>
<version>14</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.4.0.jar</systemPath>
</dependency> -->
<!-- PostgreSQL 9.1-901 -->
<!-- Oracle -->
<!-- https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc6 -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.4</version>
</dependency>
<!-- PostgreSQL 9.1-901 -->
<!-- <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901.jdbc4</version>
</dependency>
</dependency> -->
<!-- AspectJ -->
<dependency>
@ -329,7 +329,7 @@
<dependency>
<groupId>egovframework.rte</groupId>
<artifactId>egovframework.rte.fdl.property</artifactId>
<version>2.7.0</version>
<version>${egovframework.rte.version}</version>
</dependency>
<!-- Log4j -->

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

@ -86,11 +86,11 @@ public class LoginController {
@Resource(name="egovMessageSource")
EgovMessageSource egovMessageSource;
@Autowired
/*@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
TransactionStatus status = null;*/
private static boolean loginFlag = true;
private static MultiValueMap users = new MultiValueMap();
@ -611,10 +611,10 @@ public class LoginController {
try {
def = new DefaultTransactionDefinition();
/*def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
status = transactionManager.getTransaction(def);*/
clientIp = request.getRemoteAddr();
if(clientIp != "0:0:0:0:0:0:0:1") {
@ -965,21 +965,21 @@ public class LoginController {
}
}
transactionManager.commit(status);
// transactionManager.commit(status);
} catch(NumberFormatException e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
} catch(MalformedURLException e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
} catch(ParseException e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
} catch(Exception e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
}

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

@ -43,11 +43,11 @@ public class LoginServiceImpl implements LoginService{
@Resource(name="loginMapper")
private LoginMapper loginMapper;
@Autowired
/*@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
TransactionStatus status = null;*/
@Override
public Map<String, Object> selectWebDupMember(Map<String, Object> map) throws Exception {
@ -337,9 +337,9 @@ public class LoginServiceImpl implements LoginService{
map.put("idx", request.getParameter("idx"));
if(request.getParameter("content") != null) map.put("content", request.getParameter("content")); // 추후삭제
def = new DefaultTransactionDefinition();
/*def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
status = transactionManager.getTransaction(def);*/
try{
// 활용사례 DB 등록
@ -354,21 +354,21 @@ public class LoginServiceImpl implements LoginService{
if(!prcUseSaveName.equals("")) FileUtil.writeUploadedFile(prcUseFile, prcUseSaveName, savePath);
if(!referSaveName.equals("")) FileUtil.writeUploadedFile(referFile, referSaveName, savePath);
}
transactionManager.commit(status);
/*transactionManager.commit(status);*/
} catch(FileNotFoundException e){
transactionManager.rollback(status);
/*transactionManager.rollback(status);*/
logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!");
} catch(NumberFormatException e){
transactionManager.rollback(status);
/*transactionManager.rollback(status);*/
logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!");
} catch(IndexOutOfBoundsException e){
transactionManager.rollback(status);
/*transactionManager.rollback(status);*/
logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!");
} catch(Exception e){
transactionManager.rollback(status);
/*transactionManager.rollback(status);*/
logger.debug("error", e);
throw new Exception("PrcUseCase Save Exception!!");
}

21
src/main/java/geoinfo/regi/basicInfo/BasicController.java
View File

@ -70,12 +70,13 @@ public class BasicController {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
*
* @Autowired
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
*/
@RequestMapping(value="/basic/labinfo2")
public String labInfo2(
@ -269,7 +270,7 @@ public class BasicController {
try {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* def = new DefaultTransactionDefinition();
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
@ -384,28 +385,28 @@ public class BasicController {
}
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* transactionManager.commit(status);*/
transactionManager.commit(status);*/
} catch (MalformedURLException e) {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (ParseException e) {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (NumberFormatException e) {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (IOException e) {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (Exception e) {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
}

8
src/main/java/geoinfo/regi/geoLoggingInfo/GeoLoggingController.java
View File

@ -54,7 +54,7 @@ public class GeoLoggingController {
private CommonService commonService;
/* 20231223 트랜젝션 중복문제로 제거
* @Autowired
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
@ -122,7 +122,7 @@ public class GeoLoggingController {
try {
/* 20231223 트랜젝션 중복문제로 제거
* def = new DefaultTransactionDefinition();
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
@ -284,11 +284,11 @@ public class GeoLoggingController {
model.put("msg", "성공");
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.commit(status);*/
transactionManager.commit(status);*/
} catch (Exception e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
LOGGER.debug("error" + e);//오류시 오류 코드랑 프로젝트 저장하게 기록해야됨.
}
return "/web/input/geoLogging/boreholeWaveDb";

20
src/main/java/geoinfo/regi/info/InfoController.java
View File

@ -54,11 +54,13 @@ public class InfoController {
private InfoService infoService;
/* 20231223 트랜젝션 중복문제로 제거
* @Autowired
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
*/
// 지반정보등록 (관리자)
@RequestMapping(value = "/info/projectInfo")
@ -542,7 +544,7 @@ public class InfoController {
try {
/* 20231223 트랜젝션 중복문제로 제거
* def = new DefaultTransactionDefinition();
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
@ -619,22 +621,22 @@ public class InfoController {
}
model.put("rUrl", rUrl);
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.commit(status);*/
transactionManager.commit(status);*/
} catch (MalformedURLException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (ParseException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (NumberFormatException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (IOException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
} catch (Exception e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
}

10
src/main/java/geoinfo/regi/layerInfo/LayerInfoController.java
View File

@ -44,7 +44,7 @@ public class LayerInfoController {
private LayerInfoService layerInfoService;
/* 트랜젝션 데이터제거 20231223
* @Autowired
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
@ -137,7 +137,7 @@ public class LayerInfoController {
try {
/* 트랜젝션 데이터제거 20231223
* def = new DefaultTransactionDefinition();
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
@ -230,14 +230,14 @@ public class LayerInfoController {
}
/* 트랜젝션 데이터제거 20231223
* transactionManager.commit(status);*/
transactionManager.commit(status);*/
} catch (NumberFormatException e) {
/* 트랜젝션 데이터제거 20231223
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
LOGGER.debug("error" + e);//오류시 오류 코드랑 프로젝트 저장하게 기록해야됨.
} catch (Exception e) {
/* 트랜젝션 데이터제거 20231223
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
LOGGER.debug("error" + e);//오류시 오류 코드랑 프로젝트 저장하게 기록해야됨.
}
return "/web/input/layerInfo/layerInfoDb";

18
src/main/java/geoinfo/regi/manageList/ManageList2019Controller.java
View File

@ -101,11 +101,11 @@ public class ManageList2019Controller {
private SelectClass2019Service selectClass2019Service;
@Autowired
/*@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
TransactionStatus status = null;*/
private final String _TEMP_FOLDER = "TEMP\\";
@ -286,10 +286,10 @@ public class ManageList2019Controller {
resultMsg = "파일 전송 오류입니다.";
}else{
try {
def = new DefaultTransactionDefinition();
/*def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
status = transactionManager.getTransaction(def);*/
// 입력결과보고서
HashMap<String,Object> map01 = null;
@ -349,10 +349,10 @@ public class ManageList2019Controller {
fileMap.put("REF_PK", map03.get("projectCode") + "|C");
file2019Service.insertWebCommFile(fileMap);
transactionManager.commit(status);
// transactionManager.commit(status);
} catch (NumberFormatException e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
//에러발생시 파일 원위치 시킨다.
moveFile(request, (String)jsonData01.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
moveFile(request, (String)jsonData02.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
@ -361,7 +361,7 @@ public class ManageList2019Controller {
Log.debug("error", e);
resultMsg = "저장 중 오류가 발생했습니다.";
} catch (IOException e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
//에러발생시 파일 원위치 시킨다.
moveFile(request, (String)jsonData01.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
moveFile(request, (String)jsonData02.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
@ -370,7 +370,7 @@ public class ManageList2019Controller {
Log.debug("error", e);
resultMsg = "저장 중 오류가 발생했습니다.";
} catch (ParseException e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
//에러발생시 파일 원위치 시킨다.
moveFile(request, (String)jsonData01.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
moveFile(request, (String)jsonData02.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
@ -379,7 +379,7 @@ public class ManageList2019Controller {
Log.debug("error", e);
resultMsg = "저장 중 오류가 발생했습니다.";
} catch (Exception e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
//에러발생시 파일 원위치 시킨다.
moveFile(request, (String)jsonData01.get("FILE_NM"), _TEMP_FOLDER, moveFolder);
moveFile(request, (String)jsonData02.get("FILE_NM"), _TEMP_FOLDER, moveFolder);

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

@ -51,11 +51,11 @@ public class ManageListController {
@Resource(name = "infoService")
private InfoService infoService;
@Autowired
/*@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
TransactionStatus status = null;*/
// 지반정보등록 (관리자) - 검수등록대기 목록
@RequestMapping(value = "/manageList.do")
@ -276,10 +276,10 @@ public class ManageListController {
strUtil sUtil = new strUtil();
int ok = 0;
try {
def = new DefaultTransactionDefinition();
/*def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);
status = transactionManager.getTransaction(def);*/
map.put("PROJECT_CODE", PROJECT_CODE);
map.put("MODEIFY_USER", MODEIFY_USER);
@ -292,10 +292,10 @@ public class ManageListController {
ok = 1;
}
model.addAttribute("ok", ok);
transactionManager.commit(status);
// transactionManager.commit(status);
}catch (Exception e) {
transactionManager.rollback(status);
// transactionManager.rollback(status);
}
return "/web/manage/modeify_update";

17
src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java
View File

@ -44,7 +44,7 @@ public class SampleInfoController {
private CommonService commonService;
/* 20231223트랜젝션
* @Autowired
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
@ -115,13 +115,14 @@ public class SampleInfoController {
try {
/* 20231223트랜젝션
*
* def = new DefaultTransactionDefinition();
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
if (!(changedData == null || changedData.length() == 0)) {
//웹 취약점 때문에 수정
// }else{
@ -250,26 +251,26 @@ public class SampleInfoController {
}
//commit
/* 20231223트랜젝션
* transactionManager.commit(status);*/
transactionManager.commit(status);*/
} catch(NumberFormatException e) {
/* 20231223트랜젝션
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
Log.debug("error", e);
affectRow = 0;
} catch(MalformedURLException e) {
/* 20231223트랜젝션
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
Log.debug("error", e);
affectRow = 0;
} catch(ParseException e) {
/*20231223트랜젝션
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
Log.debug("error", e);
affectRow = 0;
} catch(Exception e) {
/* 20231223트랜젝션
* transactionManager.rollback(status);*/
transactionManager.rollback(status);*/
Log.debug("error", e);
affectRow = 0;
}

4
src/main/java/geoinfo/regi/surface/SurfaceController.java
View File

@ -54,12 +54,12 @@ public class SurfaceController {
@Resource(name = "commonService")
private CommonService commonService;
@Autowired
/*@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;
*/
private final static Logger logger = LoggerFactory.getLogger(SurfaceController.class);
@RequestMapping(value = "/surface/resistivitySurvey")

BIN
src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.4.0.jar
View File

Binary file not shown.

BIN
src/main/webapp/WEB-INF/lib/ojdbc6-11.2.0.4.jar
View File

Binary file not shown.