diff --git a/src/main/java/com/madeu/batch/InsertPublicHolidayBatchExcute.java b/src/main/java/com/madeu/batch/InsertPublicHolidayBatchExcute.java index 22e09da..cc6f5e2 100644 --- a/src/main/java/com/madeu/batch/InsertPublicHolidayBatchExcute.java +++ b/src/main/java/com/madeu/batch/InsertPublicHolidayBatchExcute.java @@ -25,6 +25,7 @@ import javax.xml.xpath.XPathFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -33,75 +34,99 @@ import org.xml.sax.SAXException; import com.madeu.dao.web.webpublicholiday.WebPublicHolidaySqlMapDAO; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.context.event.EventListener; + import lombok.extern.slf4j.Slf4j; @Slf4j @Component public class InsertPublicHolidayBatchExcute { - - @Autowired + + @Autowired private WebPublicHolidaySqlMapDAO webPublicHolidaySqlMapDAO; - - // 21~22년 (공공 api 조회 가능 연도가 내년꺼까지만 가능.) https://www.data.go.kr/dataset/15012690/openapi.do + + /** + * [임시 실행용] 서버 시작(또는 리로드) 시 배치를 즉시 1회 실행합니다. + * 실행이 완료된 후에는 다시 주석 처리하거나 삭제하세요. + */ + @EventListener(ContextRefreshedEvent.class) + public void forceRunBatch() { + log.info("============================================================================"); + log.info("============== [FORCE START] Public Holiday Batch Execution =============="); + log.info("============================================================================"); + try { + go(); + } catch (Exception e) { + log.error("Force Batch Error", e); + } + log.info("============================================================================"); + log.info("============== [FORCE END] Public Holiday Batch Execution ================"); + log.info("============================================================================"); + } + + // 21~22년 (공공 api 조회 가능 연도가 내년꺼까지만 가능.) + // https://www.data.go.kr/dataset/15012690/openapi.do @Scheduled(cron = "0 0 03 1 * ?") // 매월 1일 03:00 -// @Scheduled(cron = "0 0/1 * * * ?") + // @Scheduled(cron = "0 0/1 * * * ?") + @Transactional public void go() { log.debug("InsertPublicHolidayBatchExcute - run start"); List> publicHolidayList = new ArrayList>(); - + Calendar c = Calendar.getInstance(); int year = c.get(Calendar.YEAR); - - for (int i = year; i <= year+1; i++) { + + for (int i = year; i <= year + 1; i++) { // 공휴일을 가져온다 - for(int j=1; j<=12; j++) { + for (int j = 1; j <= 12; j++) { int month = j; - - if(i==year) { - month = c.get(Calendar.MONTH)+j; + + if (i == year) { + month = c.get(Calendar.MONTH) + j; } - - if(12 < month) { - - }else { + + if (12 < month) { + + } else { String yearString = String.valueOf(i); String monthString = String.valueOf(month); - - if(10 > month) { - //한자리수일시 01, 02같이 0을 필요로함, request param이 2자리수 + + if (10 > month) { + // 한자리수일시 01, 02같이 0을 필요로함, request param이 2자리수 monthString = "0" + monthString; } - - List> listTemp = getPublicHolidayMap(yearString, monthString); - log.debug(yearString+"년 "+monthString+"월 결과 : " + listTemp); - + + List> listTemp = getPublicHolidayMap(yearString, monthString); + log.debug(yearString + "년 " + monthString + "월 결과 : " + listTemp); + publicHolidayList.addAll(listTemp); } } log.debug(i + "년의 totalPublicHolidayCount : " + publicHolidayList.size()); - //logger.debug("publicHolidayList : " + publicHolidayList); + // logger.debug("publicHolidayList : " + publicHolidayList); } - + int insertedCount = 0; - - for(int i=0; i publicHolidayParamMap = publicHolidayList.get(i); StringBuffer sbTemp = new StringBuffer(String.valueOf(publicHolidayParamMap.get("locdate"))); sbTemp.insert(6, "-"); sbTemp.insert(4, "-"); - + String dateName = publicHolidayParamMap.get("dateName").toString().replaceAll(" ", ""); publicHolidayParamMap.put("dateName", dateName); publicHolidayParamMap.put("locDate", sbTemp.toString()); - - List> listMapTemp = webPublicHolidaySqlMapDAO.selectListPublicHolidayDate(publicHolidayParamMap); - + + List> listMapTemp = webPublicHolidaySqlMapDAO + .selectListPublicHolidayDate(publicHolidayParamMap); + // 존재하는 공휴일일 경우 - if(1 <= listMapTemp.size()) { - - } - else{ + if (1 <= listMapTemp.size()) { + + } else { String muPublicHolidayId = ("PH").concat(String.valueOf(System.currentTimeMillis())); publicHolidayParamMap.put("muPublicHolidayId", muPublicHolidayId); publicHolidayParamMap.put("regId", "BATCH_SYSTEM"); @@ -111,58 +136,61 @@ public class InsertPublicHolidayBatchExcute { insertedCount++; } } - + log.debug("InsertPublicHolidayBatchExcute - " + insertedCount + " record inserted"); - + log.debug("InsertPublicHolidayBatchExcute - run end"); } - + // 해당 년/월의 공휴일을 가져오는 메서드 public List> getPublicHolidayMap(String year, String month) { - List> holidayList = new ArrayList>(); - + List> holidayList = new ArrayList>(); + log.debug("InsertPublicHolidayBatchExcute getPublicHolidayMap START"); - + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); DocumentBuilder builder; Document doc = null; - - String addr = "http://apis.data.go.kr/B090041/openapi/service/SpcdeInfoService"; - String query = "/getRestDeInfo?"; - + + String addr = "https://apis.data.go.kr/B090041/openapi/service/SpcdeInfoService"; + String query = "/getRestDeInfo?"; + StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append(addr); stringBuffer.append(query); - stringBuffer.append("ServiceKey=" + "IMP1dVPnFLL2UYlH8yyENSeLeS5UMLYxnaomTs5L2IHp8qnyd%2FzApTGcCUV9%2FD76wZQzD24HegGoNFotIoh9GA%3D%3D"); + stringBuffer.append("ServiceKey=" + + "bd37daa85809e0f1ef330722c6b92dd8ebbe7226a63be7644d9f334662996e7c"); stringBuffer.append("&solYear=" + year); stringBuffer.append("&solMonth=" + month); - - log.debug("stringBuffer.toString() "+ stringBuffer.toString()); - + + log.debug("stringBuffer.toString() " + stringBuffer.toString()); + try { URL url = new URL(stringBuffer.toString()); - + URLConnection conn = url.openConnection(); - + BufferedReader rd = null; - - rd = new BufferedReader(new InputStreamReader(conn.getInputStream(),"UTF-8")); + + rd = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8")); StringBuffer result = new StringBuffer(); - + String line; - - while((line=rd.readLine())!=null){ + + while ((line = rd.readLine()) != null) { result.append(line.trim()); } - + // xml 리절트 출력부분 - /*if(0 paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ + + try { + if (!webCheckLogin(session)) { return "/web/login/logout"; - } - else { + } else { paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); map = webHospitalService.selectHospitalIntro(paramMap); - + model.addAttribute("selectUseYn", map.get("selectUseYn")); model.addAttribute("insertUseYn", map.get("insertUseYn")); model.addAttribute("updateUseYn", map.get("updateUseYn")); model.addAttribute("deleteUseYn", map.get("deleteUseYn")); model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; } log.debug("WebHospitalController selectHospitalIntro END"); return "/web/hospital/hospitalUpdate"; } - + /** * 병원 정보 상세 조회 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webhospital/selectHospital.do") - public ModelAndView selectHospital(HttpSession session,HttpServletRequest request, HttpServletResponse response) { - + @RequestMapping(value = "/webhospital/selectHospital.do") + public ModelAndView selectHospital(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + log.debug("WebHospitalController selectHospital START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ + + try { + if (!webCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); map = webHospitalService.selectHospital(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } @@ -120,91 +114,125 @@ public class WebHospitalController extends ManagerDraftAction{ * @param response * @return */ - @RequestMapping(value="/webhospital/selectWorkTime.do") - public ModelAndView selectWorkTime(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webhospital/selectWorkTime.do") + public ModelAndView selectWorkTime(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebHospitalController selectWorkTime START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - try{ - if(!webCheckLogin(session)){ + try { + if (!webCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); map = webHospitalService.selectWorkTime(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } log.debug("WebHospitalController selectWorkTime END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + + /** + * 병원 휴일 정보 조회 (달력 표출용) + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/webhospital/selectHospitalHolidayList.do") + public ModelAndView selectHospitalHolidayList(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebHospitalController selectHospitalHolidayList START"); + + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + + try { + if (!webCheckLogin(session)) { + return null; + } else { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.selectHospitalHolidayList(paramMap); + } + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + + log.debug("WebHospitalController selectHospitalHolidayList END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + /** * 병원 정보 수정 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webhospital/updateHospital.do") - public ModelAndView updateHospital(HttpSession session,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { - + @RequestMapping(value = "/webhospital/updateHospital.do") + public ModelAndView updateHospital(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { + log.debug("WebHospitalController updateHospital START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); StringBuffer errorMsg = new StringBuffer(); - - try{ - if(!webCheckLogin(session)){ + + try { + if (!webCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); map = webHospitalService.updateHospital(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } - + try { HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); HashMap insertMap = new HashMap(); - + insertMap.put("url", "/webhospital/updateHospital.do"); insertMap.put("func", "updateHospital"); insertMap.put("funcName", "병원 수정"); @@ -213,18 +241,17 @@ public class WebHospitalController extends ManagerDraftAction{ insertMap.put("requestValue", String.valueOf(paramMap)); insertMap.put("responseValue", String.valueOf(map)); insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ + if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) + || String.valueOf(errorMsg).length() == 0) { insertMap.put("resultCode", "SUCCESS"); - } - else{ + } else { insertMap.put("resultCode", "ERROR"); } insertMap.put("resultMsg", String.valueOf(errorMsg)); insertMap.put("muMemberId", paramMap.get("loginMemberId")); - + webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/madeu/service/web/webhospital/WebHospitalService.java b/src/main/java/com/madeu/service/web/webhospital/WebHospitalService.java index 557b376..3ac64f1 100644 --- a/src/main/java/com/madeu/service/web/webhospital/WebHospitalService.java +++ b/src/main/java/com/madeu/service/web/webhospital/WebHospitalService.java @@ -5,8 +5,13 @@ import java.util.HashMap; public interface WebHospitalService { public HashMap selectHospitalIntro(HashMap paramMap) throws Exception; + public HashMap selectHospital(HashMap paramMap) throws Exception; + public HashMap selectWorkTime(HashMap paramMap) throws Exception; + public HashMap updateHospital(HashMap paramMap) throws Exception; + public HashMap selectHospitalHolidayList(HashMap paramMap) throws Exception; + } diff --git a/src/main/java/com/madeu/service/web/webhospital/impl/WebHospitalServiceImpl.java b/src/main/java/com/madeu/service/web/webhospital/impl/WebHospitalServiceImpl.java index 7a88581..9ceebcf 100644 --- a/src/main/java/com/madeu/service/web/webhospital/impl/WebHospitalServiceImpl.java +++ b/src/main/java/com/madeu/service/web/webhospital/impl/WebHospitalServiceImpl.java @@ -32,20 +32,19 @@ import org.springframework.web.multipart.MultipartFile; @Slf4j @Service("WebHospitalService") public class WebHospitalServiceImpl implements WebHospitalService { - + @Autowired private WebHospitalSqlMapDAO webHospitalSqlMapDAO; - + @Autowired private WebHospitalHolidaySqlMapDAO webHospitalHolidaySqlMapDAO; - + @Autowired private WebMemberSqlMapDAO webMemberSqlMapDAO; - + @Autowired private WebAuthMenuRelationSqlMapDAO webAuthMenuRelationSqlMapDAO; - /** * 병원 상세 화면으로 이동. * @@ -61,62 +60,60 @@ public class WebHospitalServiceImpl implements WebHospitalService { HashMap map = new HashMap(); - log.debug("loginMemberId :"+paramMap.get("loginMemberId")); - - log.debug("menuClass :"+paramMap.get("menuClass")); - - try{ - boolean check = true; - - String menuClass = String.valueOf(paramMap.get("menuClass")); - + log.debug("loginMemberId :" + paramMap.get("loginMemberId")); + + log.debug("menuClass :" + paramMap.get("menuClass")); + + try { + boolean check = true; + + String menuClass = String.valueOf(paramMap.get("menuClass")); + // 정렬 - if(true != ValidationCheckUtil.emptyCheck(menuClass)){ + if (true != ValidationCheckUtil.emptyCheck(menuClass)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","메뉴 정보가 없습니다."); + map.put("msgDesc", "메뉴 정보가 없습니다."); } - - if(true == check){ + + if (true == check) { // 사용자 확인 List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); int userListMapSize = userListMap.size(); - - if(1==userListMapSize){ + + if (1 == userListMapSize) { paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); } } - - if(true == check){ + + if (true == check) { // 권한 조회 HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass",paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId",paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO.selectAuthMenuRelation(authCheckParamMap); + authCheckParamMap.put("menuClass", paramMap.get("menuClass")); + authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); + List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO + .selectAuthMenuRelation(authCheckParamMap); int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if(1==authMenuRelationlistMapSize){ + + if (1 == authMenuRelationlistMapSize) { map.put("msgCode", Constants.OK); - map.put("success","true"); - + map.put("success", "true"); + map.put("selectUseYn", authMenuRelationlistMap.get(0).get("selectUseYn")); map.put("insertUseYn", authMenuRelationlistMap.get(0).get("insertUseYn")); map.put("updateUseYn", authMenuRelationlistMap.get(0).get("updateUseYn")); map.put("deleteUseYn", authMenuRelationlistMap.get(0).get("deleteUseYn")); map.put("downloadUseYn", authMenuRelationlistMap.get(0).get("downloadUseYn")); - } - else { + } else { map.put("msgCode", Constants.FAIL); map.put("msgDesc", "권한 정보가 없습니다."); } } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); throw e; } @@ -124,8 +121,7 @@ public class WebHospitalServiceImpl implements WebHospitalService { log.debug("WebHospitalServiceImpl selectHospitalIntro END"); return map; } - - + /** * 병원 정보 상세 조회 (one) * @@ -141,77 +137,74 @@ public class WebHospitalServiceImpl implements WebHospitalService { HashMap map = new HashMap(); - log.debug("loginMemberId :"+paramMap.get("loginMemberId")); - - log.debug("menuClass :"+paramMap.get("menuClass")); + log.debug("loginMemberId :" + paramMap.get("loginMemberId")); - try{ - boolean check = true; - - if(true == check){ + log.debug("menuClass :" + paramMap.get("menuClass")); + + try { + boolean check = true; + + if (true == check) { // 사용자 확인 List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); int userListMapSize = userListMap.size(); - - if(1==userListMapSize){ + + if (1 == userListMapSize) { paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); } } - if(true == check){ + if (true == check) { // 권한 조회 HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass",paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId",paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO.selectAuthMenuRelation(authCheckParamMap); + authCheckParamMap.put("menuClass", paramMap.get("menuClass")); + authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); + List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO + .selectAuthMenuRelation(authCheckParamMap); - if(1==authMenuRelationlistMap.size()){ + if (1 == authMenuRelationlistMap.size()) { - if(("Y").equals(authMenuRelationlistMap.get(0).get("selectUseYn"))) { + if (("Y").equals(authMenuRelationlistMap.get(0).get("selectUseYn"))) { - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "조회 권한 정보가 없습니다."); } - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "권한 정보가 없습니다."); } } - if(true == check){ + if (true == check) { List> hospitalListMap = webHospitalSqlMapDAO.selectHospital(paramMap); int hospitalListMapSize = hospitalListMap.size(); - - if(1 == hospitalListMapSize){ + + if (1 == hospitalListMapSize) { // 병원 휴일 정보 조회 paramMap.put("muHospitalId", hospitalListMap.get(0).get("muHospitalId")); - List> hospitalHolidayListMap = webHospitalHolidaySqlMapDAO.selectListHospitalHoliday(paramMap); - + List> hospitalHolidayListMap = webHospitalHolidaySqlMapDAO + .selectListHospitalHoliday(paramMap); + hospitalListMap.get(0).put("holidayRows", hospitalHolidayListMap); - + map.put("msgCode", Constants.OK); - map.put("success","true"); - map.put("rows",hospitalListMap); - } - else { + map.put("success", "true"); + map.put("rows", hospitalListMap); + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "병원 정보가 없습니다."); } - + } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); throw e; } @@ -234,44 +227,43 @@ public class WebHospitalServiceImpl implements WebHospitalService { HashMap map = new HashMap(); - log.debug("loginMemberId :"+paramMap.get("loginMemberId")); + log.debug("loginMemberId :" + paramMap.get("loginMemberId")); - log.debug("menuClass :"+paramMap.get("menuClass")); + log.debug("menuClass :" + paramMap.get("menuClass")); - try{ - boolean check = true; + try { + boolean check = true; - if(true == check){ + if (true == check) { // 사용자 확인 List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); int userListMapSize = userListMap.size(); - if(1==userListMapSize){ + if (1 == userListMapSize) { paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); } } - if(true == check){ + if (true == check) { List> hospitalListMap = webHospitalSqlMapDAO.selectHospital(paramMap); int hospitalListMapSize = hospitalListMap.size(); - if(1 == hospitalListMapSize){ + if (1 == hospitalListMapSize) { // 병원 휴일 정보 조회 paramMap.put("muHospitalId", hospitalListMap.get(0).get("muHospitalId")); - List> hospitalHolidayListMap = webHospitalHolidaySqlMapDAO.selectListHospitalHoliday(paramMap); + List> hospitalHolidayListMap = webHospitalHolidaySqlMapDAO + .selectListHospitalHoliday(paramMap); hospitalListMap.get(0).put("holidayRows", hospitalHolidayListMap); map.put("msgCode", Constants.OK); - map.put("success","true"); - map.put("rows",hospitalListMap); - } - else { + map.put("success", "true"); + map.put("rows", hospitalListMap); + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "병원 정보가 없습니다."); @@ -279,438 +271,476 @@ public class WebHospitalServiceImpl implements WebHospitalService { } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); throw e; } log.debug("WebHospitalServiceImpl selectWorkTime END"); return map; } - + + /** + * 병원 휴일 정보 조회 (달력 표출용) + * + * @param paramMap + * @return + * @throws Exception + */ + @Override + public HashMap selectHospitalHolidayList(HashMap paramMap) throws Exception { + log.debug("WebHospitalServiceImpl selectHospitalHolidayList START"); + + HashMap map = new HashMap(); + try { + // 병원 정보 조회 (병원 ID 등을 가져오기 위함) + // paramMap에 muHospitalId가 없을 수 있으므로, 로그인한 사용자의 병원을 찾아야 할 수도 있음. + // 하지만 보통 관리자 메뉴이므로 muHospitalId를 parameter로 받거나, 없으면 첫번째 병원을 가져오는 로직이 필요할 수 있음. + // 여기서는 selectHospital 로직을 참고하여 병원 조회를 먼저 수행. + + List> hospitalListMap = null; + + if (paramMap.get("muHospitalId") == null || "".equals(paramMap.get("muHospitalId"))) { + hospitalListMap = webHospitalSqlMapDAO.selectHospital(paramMap); + if (hospitalListMap.size() > 0) { + paramMap.put("muHospitalId", hospitalListMap.get(0).get("muHospitalId")); + } + } + + // muHospitalId가 있어야 조회 가능 + if (paramMap.get("muHospitalId") != null && !"".equals(paramMap.get("muHospitalId"))) { + // 병원 휴일 및 공휴일 조회 (UNION 쿼리 사용) + List> holidayList = webHospitalSqlMapDAO.selectHospitalHoliday(paramMap); + + map.put("msgCode", Constants.OK); + map.put("success", "true"); + map.put("rows", holidayList); + } else { + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "병원 정보가 없습니다."); + } + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + + log.debug("WebHospitalServiceImpl selectHospitalHolidayList END"); + return map; + } + /** * 병원 정보 수정 * * @param paramMap * @return - * @throws Exception + * @throws Exception */ @Override - @Transactional(rollbackFor={Exception.class}, propagation = Propagation.REQUIRES_NEW) + @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRES_NEW) public HashMap updateHospital( - HashMap paramMap) throws Exception{ + HashMap paramMap) throws Exception { log.debug("WebHospitalServiceImpl updateHospital START"); - - HashMap map = new HashMap(); - - log.debug("loginMemberId :"+paramMap.get("loginMemberId")); - - log.debug("menuClass :"+paramMap.get("menuClass")); - - log.debug("muHospitalId :"+paramMap.get("muHospitalId")); - - log.debug("monOpenYn :"+paramMap.get("monOpenYn")); - log.debug("monOpenStartTime :"+paramMap.get("monOpenStartTime")); - log.debug("monOpenEndTime :"+paramMap.get("monOpenEndTime")); - log.debug("monBreakStartTime :"+paramMap.get("monBreakStartTime")); - log.debug("monBreakEndTime :"+paramMap.get("monBreakEndTime")); - log.debug("tueOpenYn :"+paramMap.get("tueOpenYn")); - log.debug("tueOpenStartTime :"+paramMap.get("tueOpenStartTime")); - log.debug("tueOpenEndTime :"+paramMap.get("tueOpenEndTime")); - log.debug("tueBreakStartTime :"+paramMap.get("tueBreakStartTime")); - log.debug("tueBreakEndTime :"+paramMap.get("tueBreakEndTime")); - log.debug("wedOpenYn :"+paramMap.get("wedOpenYn")); - log.debug("wedOpenStartTime :"+paramMap.get("wedOpenStartTime")); - log.debug("wedOpenEndTime :"+paramMap.get("wedOpenEndTime")); - log.debug("wedBreakStartTime :"+paramMap.get("wedBreakStartTime")); - log.debug("wedBreakEndTime :"+paramMap.get("wedBreakEndTime")); - log.debug("thuOpenYn :"+paramMap.get("thuOpenYn")); - log.debug("thuOpenStartTime :"+paramMap.get("thuOpenStartTime")); - log.debug("thuOpenEndTime :"+paramMap.get("thuOpenEndTime")); - log.debug("thuBreakStartTime :"+paramMap.get("thuBreakStartTime")); - log.debug("thuBreakEndTime :"+paramMap.get("thuBreakEndTime")); - log.debug("friOpenYn :"+paramMap.get("friOpenYn")); - log.debug("friOpenStartTime :"+paramMap.get("friOpenStartTime")); - log.debug("friOpenEndTime :"+paramMap.get("friOpenEndTime")); - log.debug("friBreakStartTime :"+paramMap.get("friBreakStartTime")); - log.debug("friBreakEndTime :"+paramMap.get("friBreakEndTime")); - log.debug("satOpenYn :"+paramMap.get("satOpenYn")); - log.debug("satOpenStartTime :"+paramMap.get("satOpenStartTime")); - log.debug("satOpenEndTime :"+paramMap.get("satOpenEndTime")); - log.debug("satBreakStartTime :"+paramMap.get("satBreakStartTime")); - log.debug("satBreakEndTime :"+paramMap.get("satBreakEndTime")); - log.debug("sunOpenYn :"+paramMap.get("sunOpenYn")); - log.debug("sunOpenStartTime :"+paramMap.get("sunOpenStartTime")); - log.debug("sunOpenEndTime :"+paramMap.get("sunOpenEndTime")); - log.debug("sunBreakStartTime :"+paramMap.get("sunBreakStartTime")); - log.debug("sunBreakEndTime :"+paramMap.get("sunBreakEndTime")); - log.debug("publicHolidayUseYn :"+paramMap.get("publicHolidayUseYn")); - - log.debug("holidayRows :"+paramMap.get("holidayRows")); - try{ - boolean check = true; + HashMap map = new HashMap(); + + log.debug("loginMemberId :" + paramMap.get("loginMemberId")); + + log.debug("menuClass :" + paramMap.get("menuClass")); + + log.debug("muHospitalId :" + paramMap.get("muHospitalId")); + + log.debug("monOpenYn :" + paramMap.get("monOpenYn")); + log.debug("monOpenStartTime :" + paramMap.get("monOpenStartTime")); + log.debug("monOpenEndTime :" + paramMap.get("monOpenEndTime")); + log.debug("monBreakStartTime :" + paramMap.get("monBreakStartTime")); + log.debug("monBreakEndTime :" + paramMap.get("monBreakEndTime")); + log.debug("tueOpenYn :" + paramMap.get("tueOpenYn")); + log.debug("tueOpenStartTime :" + paramMap.get("tueOpenStartTime")); + log.debug("tueOpenEndTime :" + paramMap.get("tueOpenEndTime")); + log.debug("tueBreakStartTime :" + paramMap.get("tueBreakStartTime")); + log.debug("tueBreakEndTime :" + paramMap.get("tueBreakEndTime")); + log.debug("wedOpenYn :" + paramMap.get("wedOpenYn")); + log.debug("wedOpenStartTime :" + paramMap.get("wedOpenStartTime")); + log.debug("wedOpenEndTime :" + paramMap.get("wedOpenEndTime")); + log.debug("wedBreakStartTime :" + paramMap.get("wedBreakStartTime")); + log.debug("wedBreakEndTime :" + paramMap.get("wedBreakEndTime")); + log.debug("thuOpenYn :" + paramMap.get("thuOpenYn")); + log.debug("thuOpenStartTime :" + paramMap.get("thuOpenStartTime")); + log.debug("thuOpenEndTime :" + paramMap.get("thuOpenEndTime")); + log.debug("thuBreakStartTime :" + paramMap.get("thuBreakStartTime")); + log.debug("thuBreakEndTime :" + paramMap.get("thuBreakEndTime")); + log.debug("friOpenYn :" + paramMap.get("friOpenYn")); + log.debug("friOpenStartTime :" + paramMap.get("friOpenStartTime")); + log.debug("friOpenEndTime :" + paramMap.get("friOpenEndTime")); + log.debug("friBreakStartTime :" + paramMap.get("friBreakStartTime")); + log.debug("friBreakEndTime :" + paramMap.get("friBreakEndTime")); + log.debug("satOpenYn :" + paramMap.get("satOpenYn")); + log.debug("satOpenStartTime :" + paramMap.get("satOpenStartTime")); + log.debug("satOpenEndTime :" + paramMap.get("satOpenEndTime")); + log.debug("satBreakStartTime :" + paramMap.get("satBreakStartTime")); + log.debug("satBreakEndTime :" + paramMap.get("satBreakEndTime")); + log.debug("sunOpenYn :" + paramMap.get("sunOpenYn")); + log.debug("sunOpenStartTime :" + paramMap.get("sunOpenStartTime")); + log.debug("sunOpenEndTime :" + paramMap.get("sunOpenEndTime")); + log.debug("sunBreakStartTime :" + paramMap.get("sunBreakStartTime")); + log.debug("sunBreakEndTime :" + paramMap.get("sunBreakEndTime")); + log.debug("publicHolidayUseYn :" + paramMap.get("publicHolidayUseYn")); + + log.debug("holidayRows :" + paramMap.get("holidayRows")); + + try { + boolean check = true; String tId = String.valueOf(System.currentTimeMillis()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar c1 = Calendar.getInstance(); String tDate = sdf.format(c1.getTime()); - - String muHospitalId = String.valueOf(paramMap.get("muHospitalId")); - - String monOpenYn = String.valueOf(paramMap.get("monOpenYn")); - String monOpenStartTime = String.valueOf(paramMap.get("monOpenStartTime")); - String monOpenEndTime = String.valueOf(paramMap.get("monOpenEndTime")); - String monBreakStartTime = String.valueOf(paramMap.get("monBreakStartTime")); - String monBreakEndTime = String.valueOf(paramMap.get("monBreakEndTime")); - String tueOpenYn = String.valueOf(paramMap.get("tueOpenYn")); - String tueOpenStartTime = String.valueOf(paramMap.get("tueOpenStartTime")); - String tueOpenEndTime = String.valueOf(paramMap.get("tueOpenEndTime")); - String tueBreakStartTime = String.valueOf(paramMap.get("tueBreakStartTime")); - String tueBreakEndTime = String.valueOf(paramMap.get("tueBreakEndTime")); - String wedOpenYn = String.valueOf(paramMap.get("wedOpenYn")); - String wedOpenStartTime = String.valueOf(paramMap.get("wedOpenStartTime")); - String wedOpenEndTime = String.valueOf(paramMap.get("wedOpenEndTime")); - String wedBreakStartTime = String.valueOf(paramMap.get("wedBreakStartTime")); - String wedBreakEndTime = String.valueOf(paramMap.get("wedBreakEndTime")); - String thuOpenYn = String.valueOf(paramMap.get("thuOpenYn")); - String thuOpenStartTime = String.valueOf(paramMap.get("thuOpenStartTime")); - String thuOpenEndTime = String.valueOf(paramMap.get("thuOpenEndTime")); - String thuBreakStartTime = String.valueOf(paramMap.get("thuBreakStartTime")); - String thuBreakEndTime = String.valueOf(paramMap.get("thuBreakEndTime")); - String friOpenYn = String.valueOf(paramMap.get("friOpenYn")); - String friOpenStartTime = String.valueOf(paramMap.get("friOpenStartTime")); - String friOpenEndTime = String.valueOf(paramMap.get("friOpenEndTime")); - String friBreakStartTime = String.valueOf(paramMap.get("friBreakStartTime")); - String friBreakEndTime = String.valueOf(paramMap.get("friBreakEndTime")); - String satOpenYn = String.valueOf(paramMap.get("satOpenYn")); - String satOpenStartTime = String.valueOf(paramMap.get("satOpenStartTime")); - String satOpenEndTime = String.valueOf(paramMap.get("satOpenEndTime")); - String satBreakStartTime = String.valueOf(paramMap.get("satBreakStartTime")); - String satBreakEndTime = String.valueOf(paramMap.get("satBreakEndTime")); - String sunOpenYn = String.valueOf(paramMap.get("sunOpenYn")); - String sunOpenStartTime = String.valueOf(paramMap.get("sunOpenStartTime")); - String sunOpenEndTime = String.valueOf(paramMap.get("sunOpenEndTime")); - String sunBreakStartTime = String.valueOf(paramMap.get("sunBreakStartTime")); - String sunBreakEndTime = String.valueOf(paramMap.get("sunBreakEndTime")); - String publicHolidayUseYn = String.valueOf(paramMap.get("publicHolidayUseYn")); - - if(true != ValidationCheckUtil.emptyCheck(muHospitalId)){ + String muHospitalId = String.valueOf(paramMap.get("muHospitalId")); + + String monOpenYn = String.valueOf(paramMap.get("monOpenYn")); + String monOpenStartTime = String.valueOf(paramMap.get("monOpenStartTime")); + String monOpenEndTime = String.valueOf(paramMap.get("monOpenEndTime")); + String monBreakStartTime = String.valueOf(paramMap.get("monBreakStartTime")); + String monBreakEndTime = String.valueOf(paramMap.get("monBreakEndTime")); + String tueOpenYn = String.valueOf(paramMap.get("tueOpenYn")); + String tueOpenStartTime = String.valueOf(paramMap.get("tueOpenStartTime")); + String tueOpenEndTime = String.valueOf(paramMap.get("tueOpenEndTime")); + String tueBreakStartTime = String.valueOf(paramMap.get("tueBreakStartTime")); + String tueBreakEndTime = String.valueOf(paramMap.get("tueBreakEndTime")); + String wedOpenYn = String.valueOf(paramMap.get("wedOpenYn")); + String wedOpenStartTime = String.valueOf(paramMap.get("wedOpenStartTime")); + String wedOpenEndTime = String.valueOf(paramMap.get("wedOpenEndTime")); + String wedBreakStartTime = String.valueOf(paramMap.get("wedBreakStartTime")); + String wedBreakEndTime = String.valueOf(paramMap.get("wedBreakEndTime")); + String thuOpenYn = String.valueOf(paramMap.get("thuOpenYn")); + String thuOpenStartTime = String.valueOf(paramMap.get("thuOpenStartTime")); + String thuOpenEndTime = String.valueOf(paramMap.get("thuOpenEndTime")); + String thuBreakStartTime = String.valueOf(paramMap.get("thuBreakStartTime")); + String thuBreakEndTime = String.valueOf(paramMap.get("thuBreakEndTime")); + String friOpenYn = String.valueOf(paramMap.get("friOpenYn")); + String friOpenStartTime = String.valueOf(paramMap.get("friOpenStartTime")); + String friOpenEndTime = String.valueOf(paramMap.get("friOpenEndTime")); + String friBreakStartTime = String.valueOf(paramMap.get("friBreakStartTime")); + String friBreakEndTime = String.valueOf(paramMap.get("friBreakEndTime")); + String satOpenYn = String.valueOf(paramMap.get("satOpenYn")); + String satOpenStartTime = String.valueOf(paramMap.get("satOpenStartTime")); + String satOpenEndTime = String.valueOf(paramMap.get("satOpenEndTime")); + String satBreakStartTime = String.valueOf(paramMap.get("satBreakStartTime")); + String satBreakEndTime = String.valueOf(paramMap.get("satBreakEndTime")); + String sunOpenYn = String.valueOf(paramMap.get("sunOpenYn")); + String sunOpenStartTime = String.valueOf(paramMap.get("sunOpenStartTime")); + String sunOpenEndTime = String.valueOf(paramMap.get("sunOpenEndTime")); + String sunBreakStartTime = String.valueOf(paramMap.get("sunBreakStartTime")); + String sunBreakEndTime = String.valueOf(paramMap.get("sunBreakEndTime")); + String publicHolidayUseYn = String.valueOf(paramMap.get("publicHolidayUseYn")); + + if (true != ValidationCheckUtil.emptyCheck(muHospitalId)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","병원 식별자 정보가 없습니다."); + map.put("msgDesc", "병원 식별자 정보가 없습니다."); } - if(("Y").equals(monOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(monOpenStartTime)){ + if (("Y").equals(monOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(monOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","월요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(monOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","월요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "월요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(monBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(monOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","월요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "월요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(monBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(monBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","월요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "월요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(monBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "월요일 휴게 종료시간 정보가 없습니다."); + } + } else { monOpenYn = "N"; monOpenStartTime = "00:00"; monOpenEndTime = "00:00"; monBreakStartTime = "00:00"; monBreakEndTime = "00:00"; } - - if(("Y").equals(tueOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(tueOpenStartTime)){ + + if (("Y").equals(tueOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(tueOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","화요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(tueOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","화요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "화요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(tueBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(tueOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","화요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "화요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(tueBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(tueBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","화요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "화요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(tueBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "화요일 휴게 종료시간 정보가 없습니다."); + } + } else { tueOpenYn = "N"; tueOpenStartTime = "00:00"; tueOpenEndTime = "00:00"; tueBreakStartTime = "00:00"; tueBreakEndTime = "00:00"; } - - if(("Y").equals(wedOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(wedOpenStartTime)){ + + if (("Y").equals(wedOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(wedOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","수요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(wedOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","수요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "수요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(wedBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(wedOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","수요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "수요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(wedBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(wedBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","수요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "수요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(wedBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "수요일 휴게 종료시간 정보가 없습니다."); + } + } else { wedOpenYn = "N"; wedOpenStartTime = "00:00"; wedOpenEndTime = "00:00"; wedBreakStartTime = "00:00"; wedBreakEndTime = "00:00"; } - - if(("Y").equals(thuOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(thuOpenStartTime)){ + + if (("Y").equals(thuOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(thuOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","목요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(thuOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","목요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "목요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(thuBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(thuOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","목요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "목요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(thuBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(thuBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","목요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "목요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(thuBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "목요일 휴게 종료시간 정보가 없습니다."); + } + } else { thuOpenYn = "N"; thuOpenStartTime = "00:00"; thuOpenEndTime = "00:00"; thuBreakStartTime = "00:00"; thuBreakEndTime = "00:00"; } - - if(("Y").equals(friOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(friOpenStartTime)){ + + if (("Y").equals(friOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(friOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","금요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(friOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","금요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "금요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(friBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(friOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","금요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "금요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(friBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(friBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","금요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "금요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(friBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "금요일 휴게 종료시간 정보가 없습니다."); + } + } else { friOpenYn = "N"; friOpenStartTime = "00:00"; friOpenEndTime = "00:00"; friBreakStartTime = "00:00"; friBreakEndTime = "00:00"; } - - if(("Y").equals(satOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(satOpenStartTime)){ + + if (("Y").equals(satOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(satOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","토요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(satOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","토요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "토요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(satBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(satOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","토요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "토요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(satBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(satBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","토요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "토요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(satBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "토요일 휴게 종료시간 정보가 없습니다."); + } + } else { satOpenYn = "N"; satOpenStartTime = "00:00"; satOpenEndTime = "00:00"; satBreakStartTime = "00:00"; satBreakEndTime = "00:00"; } - - if(("Y").equals(sunOpenYn)){ - if(true != ValidationCheckUtil.emptyCheck(sunOpenStartTime)){ + + if (("Y").equals(sunOpenYn)) { + if (true != ValidationCheckUtil.emptyCheck(sunOpenStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","일요일 운영 시작시간 정보가 없습니다."); - } - - if(true != ValidationCheckUtil.emptyCheck(sunOpenEndTime)){ - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc","일요일 운영 종료시간 정보가 없습니다."); + map.put("msgDesc", "일요일 운영 시작시간 정보가 없습니다."); } - if(true != ValidationCheckUtil.emptyCheck(sunBreakStartTime)){ + if (true != ValidationCheckUtil.emptyCheck(sunOpenEndTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","일요일 휴게 시작시간 정보가 없습니다."); + map.put("msgDesc", "일요일 운영 종료시간 정보가 없습니다."); } - - if(true != ValidationCheckUtil.emptyCheck(sunBreakEndTime)){ + + if (true != ValidationCheckUtil.emptyCheck(sunBreakStartTime)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","일요일 휴게 종료시간 정보가 없습니다."); + map.put("msgDesc", "일요일 휴게 시작시간 정보가 없습니다."); } - } - else { + + if (true != ValidationCheckUtil.emptyCheck(sunBreakEndTime)) { + check = false; + map.put("msgCode", Constants.FAIL); + map.put("msgDesc", "일요일 휴게 종료시간 정보가 없습니다."); + } + } else { sunOpenYn = "N"; sunOpenStartTime = "00:00"; sunOpenEndTime = "00:00"; sunBreakStartTime = "00:00"; sunBreakEndTime = "00:00"; } - - if(true != ValidationCheckUtil.emptyCheck(publicHolidayUseYn)){ + + if (true != ValidationCheckUtil.emptyCheck(publicHolidayUseYn)) { check = false; map.put("msgCode", Constants.FAIL); - map.put("msgDesc","법정공휴일 반영여부 정보가 없습니다."); + map.put("msgDesc", "법정공휴일 반영여부 정보가 없습니다."); } - - if(true == check){ + + if (true == check) { // 사용자 확인 List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); int userListMapSize = userListMap.size(); - - if(1==userListMapSize){ + + if (1 == userListMapSize) { paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); } } - - if(true == check){ + + if (true == check) { // 권한 조회 HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass",paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId",paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO.selectAuthMenuRelation(authCheckParamMap); + authCheckParamMap.put("menuClass", paramMap.get("menuClass")); + authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); + List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO + .selectAuthMenuRelation(authCheckParamMap); int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if(1==authMenuRelationlistMapSize){ - - if(("Y").equals(authMenuRelationlistMap.get(0).get("updateUseYn"))) { - - } - else { + + if (1 == authMenuRelationlistMapSize) { + + if (("Y").equals(authMenuRelationlistMap.get(0).get("updateUseYn"))) { + + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "수정 권한 정보가 없습니다."); } - } - else { + } else { check = false; map.put("msgCode", Constants.FAIL); map.put("msgDesc", "권한 정보가 없습니다."); } } - - if(true == check){ + + if (true == check) { paramMap.put("tDate", tDate); paramMap.put("tId", tId); - + webHospitalSqlMapDAO.updateHospital(paramMap); - + // 휴일정보 삭제 webHospitalHolidaySqlMapDAO.deleteHospitalHoliday(paramMap); - + // 휴일정보 등록 JSONParser jsonParser = new JSONParser(); JSONObject jsonObject = (JSONObject) jsonParser.parse(String.valueOf(paramMap.get("holidayRows"))); JSONArray detailArray = (JSONArray) jsonObject.get("data"); - - for(int j=0; j holidayParamMap = new HashMap(); String muHospitalHolidayId = ("HH").concat(String.valueOf(System.currentTimeMillis())); - holidayParamMap.put("muHospitalHolidayId",muHospitalHolidayId); + holidayParamMap.put("muHospitalHolidayId", muHospitalHolidayId); holidayParamMap.put("muHospitalId", paramMap.get("muHospitalId")); holidayParamMap.put("hospitalHolidayName", hospitalHolidayName); holidayParamMap.put("locDate", locDate); holidayParamMap.put("repeatYn", repeatYn); + holidayParamMap.put("useYn", "Y"); holidayParamMap.put("regId", paramMap.get("regId")); holidayParamMap.put("modId", paramMap.get("modId")); holidayParamMap.put("tId", paramMap.get("tId")); @@ -721,8 +751,7 @@ public class WebHospitalServiceImpl implements WebHospitalService { map.put("msgCode", Constants.OK); map.put("msgDesc", "수정되었습니다."); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); throw e; } diff --git a/src/main/resources/mappers/WebHospitalSqlMap.xml b/src/main/resources/mappers/WebHospitalSqlMap.xml index 77f04af..5ab5297 100644 --- a/src/main/resources/mappers/WebHospitalSqlMap.xml +++ b/src/main/resources/mappers/WebHospitalSqlMap.xml @@ -190,22 +190,26 @@ '; addRowHtml += ' '; - + addRowHtml += '
'; addRowHtml += '
'; addRowHtml += ' calendar'; - addRowHtml += ' '; + addRowHtml += ' '; addRowHtml += '
'; addRowHtml += '
'; - + addRowHtml += '
'; addRowHtml += ' '; addRowHtml += '
'; - - if(i==0){ + + if (i == 0) { addRowHtml += '
'; addRowHtml += ' '; addRowHtml += '
'; @@ -201,53 +204,53 @@ function fn_addRow2(detailList){ addRowHtml += ' '; addRowHtml += ''; } - else{ + else { addRowHtml += ''; - + addRowHtml += '
'; addRowHtml += ' '; addRowHtml += '
'; } - + addRowHtml += ''; } $('#hospitalHolidayList').empty().html(addRowHtml).trigger("create"); } - else{ + else { fn_addRow(); } - + // 날짜 datepicker fn_datePicker("#hospitalHolidayList input[type='date']"); - + let parentTable = $("#hospitalHolidayList"); fn_hospitalRefreshOrderNumber(parentTable); - + } /**************************************************************************** * row 추가 이벤트 ****************************************************************************/ -function fn_addRow(param){ +function fn_addRow(param) { let addRowHtml = ''; addRowHtml += '
  • '; addRowHtml += '
    '; addRowHtml += ' '; addRowHtml += '
    '; - + addRowHtml += '
    '; addRowHtml += '
    '; addRowHtml += ' calendar'; addRowHtml += ' '; addRowHtml += '
    '; addRowHtml += '
    '; - + addRowHtml += '
    '; addRowHtml += ' + +
    + +
    +
    + + + + - -
    - -
    - + + - -
    + + +
    - + - + + \ No newline at end of file