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

주석해제 

pom.xml 수정
ojdbc 수정.
cks
강석 최 2024-02-21 13:43:11 +09:00
parent c63875ab3e
commit 05284b66e9
8 changed files with 301 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
doc/javadoc.xml
View File

File diff suppressed because one or more lines are too long

12
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,11 +197,11 @@
</dependency>
<!-- MySql -->
<dependency>
<!-- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.31</version>
</dependency>
</dependency> -->
<!-- Oracle -->
<!-- <dependency>
@ -213,11 +213,11 @@
</dependency> -->
<!-- PostgreSQL 9.1-901 -->
<dependency>
<!-- <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 -->

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

@ -69,13 +69,13 @@ public class BasicController {
private CommonService commonService;
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
*
* @Autowired
* 트랜잭션 이중처리로 인한 삭제.*/
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
@RequestMapping(value="/basic/labinfo2")
public String labInfo2(
@ -268,11 +268,11 @@ public class BasicController {
params.put("holeCode", HOLE_CODE);
try {
/* 20231223수정
* 트랜잭션 이중처리로 인한 삭제.
* def = new DefaultTransactionDefinition();
* 트랜잭션 이중처리로 인한 삭제.*/
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
status = transactionManager.getTransaction(def);
List<EgovMap> items = basicService.selectTempSpt(params);
EgovMap mapSpt = new EgovMap();
@ -383,29 +383,29 @@ 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);
}

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

@ -53,12 +53,12 @@ public class GeoLoggingController {
@Resource(name ="commonService")
private CommonService commonService;
/* 20231223 트랜젝션 중복문제로 제거
* @Autowired
/* 20231223 트랜젝션 중복문제로 제거*/
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
@RequestMapping(value="/geoLogging/borehole_wave")
public String borehole_wave(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
@ -121,11 +121,11 @@ public class GeoLoggingController {
try {
/* 20231223 트랜젝션 중복문제로 제거
* def = new DefaultTransactionDefinition();
/* 20231223 트랜젝션 중복문제로 제거*/
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
status = transactionManager.getTransaction(def);
String rPROJECT_CODE = sUtil.checkNull(String.valueOf(params.get("PROJECT_CODE")));
String rHOLE_CODE = sUtil.checkNull(String.valueOf(params.get("HOLE_CODE")));
@ -283,12 +283,12 @@ public class GeoLoggingController {
}
model.put("msg", "성공");
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.commit(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.commit(status);
} catch (Exception e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.rollback(status);
LOGGER.debug("error" + e);//오류시 오류 코드랑 프로젝트 저장하게 기록해야됨.
}
return "/web/input/geoLogging/boreholeWaveDb";

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

@ -53,12 +53,12 @@ public class InfoController {
@Resource(name = "infoService")
private InfoService infoService;
/* 20231223 트랜젝션 중복문제로 제거
* @Autowired
/* 20231223 트랜젝션 중복문제로 제거*/
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
// 지반정보등록 (관리자)
@RequestMapping(value = "/info/projectInfo")
@ -541,11 +541,11 @@ public class InfoController {
String file_name = "";
try {
/* 20231223 트랜젝션 중복문제로 제거
* def = new DefaultTransactionDefinition();
/* 20231223 트랜젝션 중복문제로 제거*/
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
status = transactionManager.getTransaction(def);
if("".equals(rPROJECT_CODE)) {
@ -618,23 +618,23 @@ public class InfoController {
rUrl = "expertOpinion.do?REPORT_TYPE=" + oREPORT_TYPE + "&PROJECT_CODE=" + oPROJECT_CODE;
}
model.put("rUrl", rUrl);
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.commit(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.commit(status);
} catch (MalformedURLException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.rollback(status);
} catch (ParseException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.rollback(status);
} catch (NumberFormatException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.rollback(status);
} catch (IOException e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.rollback(status);
} catch (Exception e) {
/* 20231223 트랜젝션 중복문제로 제거
* transactionManager.rollback(status);*/
/* 20231223 트랜젝션 중복문제로 제거*/
transactionManager.rollback(status);
}

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

@ -43,12 +43,12 @@ public class LayerInfoController {
@Resource(name = "layerInfoService")
private LayerInfoService layerInfoService;
/* 트랜젝션 데이터제거 20231223
* @Autowired
/* 트랜젝션 데이터제거 20231223*/
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
private static final Logger LOGGER = LoggerFactory.getLogger(LayerInfoController.class);
@ -136,11 +136,11 @@ public class LayerInfoController {
String sJOB_TYPE = "";
try {
/* 트랜젝션 데이터제거 20231223
* def = new DefaultTransactionDefinition();
/* 트랜젝션 데이터제거 20231223*/
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
status = transactionManager.getTransaction(def);
//request
String changedData = String.valueOf(params.get("changedDataXML"));
@ -229,15 +229,15 @@ public class LayerInfoController {
}
}
/* 트랜젝션 데이터제거 20231223
* transactionManager.commit(status);*/
/* 트랜젝션 데이터제거 20231223*/
transactionManager.commit(status);
} catch (NumberFormatException e) {
/* 트랜젝션 데이터제거 20231223
* transactionManager.rollback(status);*/
/* 트랜젝션 데이터제거 20231223*/
transactionManager.rollback(status);
LOGGER.debug("error" + e);//오류시 오류 코드랑 프로젝트 저장하게 기록해야됨.
} catch (Exception e) {
/* 트랜젝션 데이터제거 20231223
* transactionManager.rollback(status);*/
/* 트랜젝션 데이터제거 20231223*/
transactionManager.rollback(status);
LOGGER.debug("error" + e);//오류시 오류 코드랑 프로젝트 저장하게 기록해야됨.
}
return "/web/input/layerInfo/layerInfoDb";

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

@ -43,12 +43,12 @@ public class SampleInfoController {
@Resource(name = "commonService")
private CommonService commonService;
/* 20231223트랜젝션
* @Autowired
/* 20231223트랜젝션*/
@Autowired
private PlatformTransactionManager transactionManager;
DefaultTransactionDefinition def = null;
TransactionStatus status = null;*/
TransactionStatus status = null;
// 기본물성시험 정보
@RequestMapping(value = "/web/input/sampleInfo.do")
@ -114,12 +114,13 @@ public class SampleInfoController {
}
try {
/* 20231223트랜젝션
*
* def = new DefaultTransactionDefinition();
/* 20231223트랜젝션*/
def = new DefaultTransactionDefinition();
def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
status = transactionManager.getTransaction(def);*/
status = transactionManager.getTransaction(def);
if (!(changedData == null || changedData.length() == 0)) {
@ -249,27 +250,27 @@ public class SampleInfoController {
}
//commit
/* 20231223트랜젝션
* transactionManager.commit(status);*/
/* 20231223트랜젝션*/
transactionManager.commit(status);
} catch(NumberFormatException e) {
/* 20231223트랜젝션
* transactionManager.rollback(status);*/
/* 20231223트랜젝션*/
transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
} catch(MalformedURLException e) {
/* 20231223트랜젝션
* transactionManager.rollback(status);*/
/* 20231223트랜젝션*/
transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
} catch(ParseException e) {
/*20231223트랜젝션
* transactionManager.rollback(status);*/
/*20231223트랜젝션*/
transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
} catch(Exception e) {
/* 20231223트랜젝션
* transactionManager.rollback(status);*/
/* 20231223트랜젝션*/
transactionManager.rollback(status);
Log.debug("error", e);
affectRow = 0;
}

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

Binary file not shown.