From 45dae549d7e0b851d71ff1adfda6f7454977bcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 22 Feb 2024 15:25:05 +0900 Subject: [PATCH] =?UTF-8?q?transactionManager=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geoinfo/main/login/LoginController.java | 18 +++++------ .../login/service/impl/LoginServiceImpl.java | 18 +++++------ .../regi/basicInfo/BasicController.java | 31 +++++++++--------- .../geoLoggingInfo/GeoLoggingController.java | 16 +++++----- .../geoinfo/regi/info/InfoController.java | 32 ++++++++++--------- .../regi/layerInfo/LayerInfoController.java | 20 ++++++------ .../manageList/ManageList2019Controller.java | 18 +++++------ .../regi/manageList/ManageListController.java | 12 +++---- .../regi/sampleInfo/SampleInfoController.java | 28 ++++++++-------- .../regi/surface/SurfaceController.java | 4 +-- 10 files changed, 100 insertions(+), 97 deletions(-) diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java index ceced470..406399cb 100644 --- a/src/main/java/geoinfo/main/login/LoginController.java +++ b/src/main/java/geoinfo/main/login/LoginController.java @@ -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; } diff --git a/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java b/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java index 9920726f..0e77ed81 100644 --- a/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java @@ -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 selectWebDupMember(Map 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!!"); } diff --git a/src/main/java/geoinfo/regi/basicInfo/BasicController.java b/src/main/java/geoinfo/regi/basicInfo/BasicController.java index 074ffcab..e6ada5bc 100644 --- a/src/main/java/geoinfo/regi/basicInfo/BasicController.java +++ b/src/main/java/geoinfo/regi/basicInfo/BasicController.java @@ -69,13 +69,14 @@ public class BasicController { private CommonService commonService; /* 20231223수정 - * 트랜잭션 이중처리로 인한 삭제.*/ + * 트랜잭션 이중처리로 인한 삭제. @Autowired private PlatformTransactionManager transactionManager; DefaultTransactionDefinition def = null; TransactionStatus status = null; + */ @RequestMapping(value="/basic/labinfo2") public String labInfo2( @@ -268,11 +269,11 @@ public class BasicController { params.put("holeCode", HOLE_CODE); try { /* 20231223수정 - * 트랜잭션 이중처리로 인한 삭제.*/ + * 트랜잭션 이중처리로 인한 삭제. def = new DefaultTransactionDefinition(); def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); - status = transactionManager.getTransaction(def); + status = transactionManager.getTransaction(def);*/ List items = basicService.selectTempSpt(params); EgovMap mapSpt = new EgovMap(); @@ -383,29 +384,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);*/ } diff --git a/src/main/java/geoinfo/regi/geoLoggingInfo/GeoLoggingController.java b/src/main/java/geoinfo/regi/geoLoggingInfo/GeoLoggingController.java index 4fe072fb..0aeb961c 100644 --- a/src/main/java/geoinfo/regi/geoLoggingInfo/GeoLoggingController.java +++ b/src/main/java/geoinfo/regi/geoLoggingInfo/GeoLoggingController.java @@ -53,12 +53,12 @@ public class GeoLoggingController { @Resource(name ="commonService") private CommonService commonService; -/* 20231223 트랜젝션 중복문제로 제거*/ +/* 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 params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{ @@ -121,11 +121,11 @@ public class GeoLoggingController { try { - /* 20231223 트랜젝션 중복문제로 제거*/ + /* 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"; diff --git a/src/main/java/geoinfo/regi/info/InfoController.java b/src/main/java/geoinfo/regi/info/InfoController.java index bf6fd803..01cd967c 100644 --- a/src/main/java/geoinfo/regi/info/InfoController.java +++ b/src/main/java/geoinfo/regi/info/InfoController.java @@ -53,13 +53,15 @@ public class InfoController { @Resource(name = "infoService") private InfoService infoService; -/* 20231223 트랜젝션 중복문제로 제거*/ +/* 20231223 트랜젝션 중복문제로 제거 @Autowired private PlatformTransactionManager transactionManager; DefaultTransactionDefinition def = null; TransactionStatus status = null; + */ + // 지반정보등록 (관리자) @RequestMapping(value = "/info/projectInfo") public String manageRegi(@RequestParam HashMap params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -541,11 +543,11 @@ public class InfoController { String file_name = ""; try { -/* 20231223 트랜젝션 중복문제로 제거*/ +/* 20231223 트랜젝션 중복문제로 제거 def = new DefaultTransactionDefinition(); def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); - status = transactionManager.getTransaction(def); + status = transactionManager.getTransaction(def);*/ if("".equals(rPROJECT_CODE)) { @@ -618,23 +620,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);*/ } diff --git a/src/main/java/geoinfo/regi/layerInfo/LayerInfoController.java b/src/main/java/geoinfo/regi/layerInfo/LayerInfoController.java index 15af8d6a..4f909413 100644 --- a/src/main/java/geoinfo/regi/layerInfo/LayerInfoController.java +++ b/src/main/java/geoinfo/regi/layerInfo/LayerInfoController.java @@ -43,12 +43,12 @@ public class LayerInfoController { @Resource(name = "layerInfoService") private LayerInfoService layerInfoService; -/* 트랜젝션 데이터제거 20231223*/ +/* 트랜젝션 데이터제거 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*/ +/* 트랜젝션 데이터제거 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"; diff --git a/src/main/java/geoinfo/regi/manageList/ManageList2019Controller.java b/src/main/java/geoinfo/regi/manageList/ManageList2019Controller.java index e96cfdd1..0a0cd18a 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageList2019Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageList2019Controller.java @@ -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 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); diff --git a/src/main/java/geoinfo/regi/manageList/ManageListController.java b/src/main/java/geoinfo/regi/manageList/ManageListController.java index 577f5686..33541a4a 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageListController.java +++ b/src/main/java/geoinfo/regi/manageList/ManageListController.java @@ -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"; diff --git a/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java b/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java index 3b0c99de..2eae3258 100644 --- a/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java +++ b/src/main/java/geoinfo/regi/sampleInfo/SampleInfoController.java @@ -43,12 +43,12 @@ public class SampleInfoController { @Resource(name = "commonService") private CommonService commonService; -/* 20231223트랜젝션*/ +/* 20231223트랜젝션 @Autowired private PlatformTransactionManager transactionManager; DefaultTransactionDefinition def = null; - TransactionStatus status = null; + TransactionStatus status = null;*/ // 기본물성시험 정보 @RequestMapping(value = "/web/input/sampleInfo.do") @@ -114,12 +114,12 @@ public class SampleInfoController { } try { - /* 20231223트랜젝션*/ + /* 20231223트랜젝션 def = new DefaultTransactionDefinition(); def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); - status = transactionManager.getTransaction(def); + status = transactionManager.getTransaction(def);*/ @@ -250,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; } diff --git a/src/main/java/geoinfo/regi/surface/SurfaceController.java b/src/main/java/geoinfo/regi/surface/SurfaceController.java index c2b66a7e..a5b6a6a5 100644 --- a/src/main/java/geoinfo/regi/surface/SurfaceController.java +++ b/src/main/java/geoinfo/regi/surface/SurfaceController.java @@ -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")