From c30d94f9d4a4d4da5d121ca7c9037e3e3019a833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 12 Dec 2022 16:37:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C=20?= =?UTF-8?q?=EC=B2=A9=EB=B3=B4=EC=88=98=EC=A7=91=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EC=9E=91=EC=97=85=20=EC=8B=9C=EC=9E=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/equip/EquipController.java | 373 +++++----- .../main/equip/service/EquipService.java | 667 +++++++++--------- src/main/resources/static/css/common.css | 3 - src/main/resources/static/js/equip/equip.js | 436 ++++++------ src/main/resources/static/js/equip/use.js | 360 +++++----- .../templates/equip/cellPhoneEditModal.html | 26 +- .../templates/equip/cellPhoneList.html | 8 +- .../templates/equip/equipEditModal.html | 10 +- .../templates/equip/equipHistory.html | 180 +++-- .../resources/templates/equip/equipList.html | 55 +- .../templates/equip/equipModifyModal.html | 84 +-- .../templates/equip/equipStatus.html | 8 +- .../templates/equip/equipTypeSelecBox.html | 8 +- .../templates/equip/pvreUseList.html | 8 +- .../resources/templates/equip/qirUseList.html | 8 +- .../templates/equip/useEditModal.html | 110 +-- .../templates/equip/useModifyModal.html | 110 +-- 17 files changed, 1206 insertions(+), 1248 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java index 6a035763..92d4bdc1 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -2,10 +2,7 @@ package com.dbnt.faisp.main.equip; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; -import com.dbnt.faisp.main.equip.model.CellPhone; -import com.dbnt.faisp.main.equip.model.Equip; -import com.dbnt.faisp.main.equip.model.EquipLog; -import com.dbnt.faisp.main.equip.model.UseList; +import com.dbnt.faisp.main.equip.model.*; import com.dbnt.faisp.main.equip.service.EquipService; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; import com.dbnt.faisp.main.userInfo.model.UserInfo; @@ -41,52 +38,52 @@ public class EquipController { private final AuthMgtService authMgtService; private final OrganConfigService organConfigService; private final UserInfoService userInfoService; - + @GetMapping("/equipStatus") public ModelAndView equipStatus(@AuthenticationPrincipal UserInfo loginUser, Equip equip) { ModelAndView mav = new ModelAndView("equip/equipStatus"); - + //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - mav.addObject("equipList", equipService.selectEquipStatus(equip)); + mav.addObject("equipList", equipService.selectEquipStatus(equip)); return mav; } - + @GetMapping("/equipEditModal") public ModelAndView equipEditModal(@AuthenticationPrincipal UserInfo loginUser) { ModelAndView mav = new ModelAndView("equip/equipEditModal"); - //메뉴권한 확인 + //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("accessAuth", accessAuth); - + return mav; } - - + + @GetMapping("/equipTypeSelecBox") public ModelAndView equipTypeSelecBox(String equType) { ModelAndView mav = new ModelAndView("equip/equipTypeSelecBox"); mav.addObject("equType", equType); return mav; } - + @PostMapping("/saveEquip") public void saveEquip(@AuthenticationPrincipal UserInfo loginUser,Equip equip, MultipartHttpServletRequest request){ - equip.setWrtNm(loginUser.getUserNm()); - equip.setWrtOrgan(loginUser.getOgCd()); - equip.setWrtPart(loginUser.getOfcCd()); - equip.setWrtTitle(loginUser.getTitleCd()); - equip.setWrtDt(LocalDateTime.now()); - equipService.saveEquip(equip,request); + equip.setWrtNm(loginUser.getUserNm()); + equip.setWrtOrgan(loginUser.getOgCd()); + equip.setWrtPart(loginUser.getOfcCd()); + equip.setWrtTitle(loginUser.getTitleCd()); + equip.setWrtDt(LocalDateTime.now()); + equipService.saveEquip(equip,request); } - + @GetMapping("/List") public ModelAndView equipList(@AuthenticationPrincipal UserInfo loginUser,Equip equip) { ModelAndView mav = new ModelAndView("equip/equipList"); - + //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); @@ -99,10 +96,10 @@ public class EquipController { equip.setContentCnt(equipService.selectEquipListCnt(equip)); equip.setPaginationInfo(); mav.addObject("searchParams", equip); - + return mav; } - + @GetMapping("/updatePage") public ModelAndView equipUpdatePage(@AuthenticationPrincipal UserInfo loginUser, Equip equip) { ModelAndView mav = new ModelAndView("equip/equipModifyModal"); @@ -114,72 +111,72 @@ public class EquipController { mav.addObject("equInfo", equipService.selectEquipInfo(equip)); return mav; } - + @PostMapping("/updateEquip") @ResponseBody public int updateEquip(@AuthenticationPrincipal UserInfo loginUser,Equip equip, MultipartHttpServletRequest request){ - equip.setWrtNm(loginUser.getUserNm()); - equip.setWrtOrgan(loginUser.getOgCd()); - equip.setWrtPart(loginUser.getOfcCd()); - equip.setWrtTitle(loginUser.getTitleCd()); - equip.setWrtDt(LocalDateTime.now()); - int result = equipService.updateEquip(equip,request); - return result; + equip.setWrtNm(loginUser.getUserNm()); + equip.setWrtOrgan(loginUser.getOgCd()); + equip.setWrtPart(loginUser.getOfcCd()); + equip.setWrtTitle(loginUser.getTitleCd()); + equip.setWrtDt(LocalDateTime.now()); + int result = equipService.updateEquip(equip,request); + return result; } - + @GetMapping("/historyView") public ModelAndView historyView(Equip equip) { ModelAndView mav = new ModelAndView("equip/equipHistory"); mav.addObject("equList", equipService.selectHistoryList(equip)); return mav; } - + @GetMapping("/HistoryDetail") @ResponseBody public Equip HistoryDetail(Equip equip){ return equipService.selectHistoryDetail(equip); } - + @PostMapping("/epuipDelete") public void epuipDelete(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List equip){ - equipService.equipDelete(equip,loginUser); + equipService.equipDelete(equip,loginUser); } - + @GetMapping("/getEquipImg") public void getThumbImage(Equip equip , HttpServletResponse response) throws Exception { - - Equip dbImg = equipService.selectEquipInfo(equip); - - String realFile = dbImg.getFilePath()+"/"+ dbImg.getConvNm(); - String fileNm = dbImg.getConvNm(); - - - BufferedOutputStream out = null; - InputStream in = null; - - try { - response.setContentType("image/jpeg;charset=UTF-8"); - response.setHeader("Content-Disposition", "inline;filename=" + fileNm); - File file = new File(realFile); -// File file = new File(realFile + "/" + fileNm); - if(file.exists()){ - in = new FileInputStream(file); - out = new BufferedOutputStream(response.getOutputStream()); - int len; - byte[] buf = new byte[1024]; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); - } - } - } catch (Exception e) { - } finally { - if(out != null){ out.flush(); } - if(out != null){ out.close(); } - if(in != null){ in.close(); } - } - } - + EquipFile dbImg = equipService.selectEquipFile(equip); + + String realFile = dbImg.getFilePath()+"/"+ dbImg.getConvNm(); + String fileNm = dbImg.getConvNm(); + + + BufferedOutputStream out = null; + InputStream in = null; + + try { + response.setContentType("image/jpeg;charset=UTF-8"); + response.setHeader("Content-Disposition", "inline;filename=" + fileNm); + File file = new File(realFile); +// File file = new File(realFile + "/" + fileNm); + if(file.exists()){ + in = new FileInputStream(file); + out = new BufferedOutputStream(response.getOutputStream()); + int len; + byte[] buf = new byte[1024]; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + } + } catch (Exception e) { + + } finally { + if(out != null){ out.flush(); } + if(out != null){ out.close(); } + if(in != null){ in.close(); } + } + } + @GetMapping("/Log") public ModelAndView equipLog(@AuthenticationPrincipal UserInfo loginUser,EquipLog equipLog) { ModelAndView mav = new ModelAndView("equip/equipLogList"); @@ -189,82 +186,82 @@ public class EquipController { equipLog.setContentCnt(equipService.selectEquipLogListCnt(equipLog)); equipLog.setPaginationInfo(); mav.addObject("searchParams", equipLog); - + return mav; } - + @GetMapping("/statusExcelDown") public void statisticsExcelDown(Model model,HttpServletResponse response, Equip equip) { - String[] headers = { "rownum","equ_type", "item_value", "total", "cnt_bon", "cnt_center", "cnt_incheon", "cnt_pyeongtaek", "cnt_taean","cnt_boryeong","cnt_west","cnt_mokpo","cnt_buan", - "cnt_gunsan","cnt_yusu","cnt_wando","cnt_south","cnt_ulsan","cnt_busan","cnt_changwon","cnt_tongyong","cnt_sacheon","cnt_east","cnt_sokcho","cnt_donghe", - "cnt_ulgin","cnt_pohang","cnt_jeju","cnt_jejuseo","cnt_seoguipo"}; - String[] headerNames = { "", "", "", "", "", "중부", "", "","","","서해","","","","","","남해","","","","","","동해","","","","","제주","",""}; - String[] headerNames2 = { "연번", "분류", "세부분류", "총계", "본청", "청", "인천서", "평택서","태안서","보령서","청","목포서","부안서","군산서","여수서","완도서","청","울산서","부산서","창원서","통영서","서천서","청","속초서","동해서","울진서","포항서","청","제주서","서귀포서"}; - String[] columnType = { "int", "String", "String", "int", "int", "int", "int", "int","int","int","int","int","int","int","int","int","int","int","int","int", - "int","int","int","int","int","int","int","int","int","int"}; - String sheetName = "외사장비현황"; - String excelFileName = "외사장비현황"; - List equStatusList = equipService.selectEquipStatus(equip); + String[] headers = { "rownum","equ_type", "item_value", "total", "cnt_bon", "cnt_center", "cnt_incheon", "cnt_pyeongtaek", "cnt_taean","cnt_boryeong","cnt_west","cnt_mokpo","cnt_buan", + "cnt_gunsan","cnt_yusu","cnt_wando","cnt_south","cnt_ulsan","cnt_busan","cnt_changwon","cnt_tongyong","cnt_sacheon","cnt_east","cnt_sokcho","cnt_donghe", + "cnt_ulgin","cnt_pohang","cnt_jeju","cnt_jejuseo","cnt_seoguipo"}; + String[] headerNames = { "", "", "", "", "", "중부", "", "","","","서해","","","","","","남해","","","","","","동해","","","","","제주","",""}; + String[] headerNames2 = { "연번", "분류", "세부분류", "총계", "본청", "청", "인천서", "평택서","태안서","보령서","청","목포서","부안서","군산서","여수서","완도서","청","울산서","부산서","창원서","통영서","서천서","청","속초서","동해서","울진서","포항서","청","제주서","서귀포서"}; + String[] columnType = { "int", "String", "String", "int", "int", "int", "int", "int","int","int","int","int","int","int","int","int","int","int","int","int", + "int","int","int","int","int","int","int","int","int","int"}; + String sheetName = "외사장비현황"; + String excelFileName = "외사장비현황"; + List equStatusList = equipService.selectEquipStatus(equip); - try { - Utils.downEquipStatusExcel(equStatusList, response, headers, headerNames,headerNames2, columnType, sheetName, excelFileName); - } catch (IOException e) { - model.addAttribute("message", "엑셀다운로드 중 오류가 발생했습니다."); - } + try { + Utils.downEquipStatusExcel(equStatusList, response, headers, headerNames,headerNames2, columnType, sheetName, excelFileName); + } catch (IOException e) { + model.addAttribute("message", "엑셀다운로드 중 오류가 발생했습니다."); + } } - + @GetMapping("/cellPhoneList") public ModelAndView cellPhoneList(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone,HttpServletResponse response) { ModelAndView mav = new ModelAndView("equip/cellPhoneList"); cellPhone.setDownOrganCdList(loginUser.getDownOrganCdList()); - //엑셀다운 + //엑셀다운 if(cellPhone.getExcel() != null && cellPhone.getExcel().equals("Y")){ - String[] headers = { "phone_key", "sosok", "tel_no", "user_nm", "ext_mail", "webex_no", "katalk_id"}; - String[] headerNames = { "연번", "소속","전화번호", "사용자(관리자)", "등록 외부메일", "웹엑스 미팅번호", "카카오톡 ID"}; - String[] columnType = { "int", "String","String", "String", "String", "String", "String", "Stiring"}; - String sheetName = "업무용 휴대전화 현황"; - String excelFileName = "업무용 휴대전화 현황"; - List cellPhoneList= equipService.selectCellPhoneList(cellPhone); + String[] headers = { "phone_key", "sosok", "tel_no", "user_nm", "ext_mail", "webex_no", "katalk_id"}; + String[] headerNames = { "연번", "소속","전화번호", "사용자(관리자)", "등록 외부메일", "웹엑스 미팅번호", "카카오톡 ID"}; + String[] columnType = { "int", "String","String", "String", "String", "String", "String", "Stiring"}; + String sheetName = "업무용 휴대전화 현황"; + String excelFileName = "업무용 휴대전화 현황"; + List cellPhoneList= equipService.selectCellPhoneList(cellPhone); - try { - Utils.cellPhoneListToExcel(cellPhoneList, response, headers, headerNames, columnType, sheetName, excelFileName); - } catch (IOException e) { - - } - return null; + try { + Utils.cellPhoneListToExcel(cellPhoneList, response, headers, headerNames, columnType, sheetName, excelFileName); + } catch (IOException e) { + + } + return null; } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/cellPhoneList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + mav.addObject("accessAuth", accessAuth); cellPhone.setQueryInfo(); mav.addObject("cellPhoneList", equipService.selectCellPhoneList(cellPhone)); cellPhone.setContentCnt(equipService.selectCellPhoneListCnt(cellPhone)); cellPhone.setPaginationInfo(); mav.addObject("searchParams", cellPhone); - + return mav; } - + @GetMapping("/cellPhoneEditModal") public ModelAndView cellPhoneEditModal(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone) { - ModelAndView mav = new ModelAndView("equip/cellPhoneEditModal"); - + ModelAndView mav = new ModelAndView("equip/cellPhoneEditModal"); + if(cellPhone.getPhoneKey() != null) { - cellPhone = equipService.selectCellPhoneInfo(cellPhone.getPhoneKey()); - ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(cellPhone.getMgtOrgan())); - mav.addObject("managerList", userInfoService.selectManagerList(param)); - mav.addObject("userSeq", loginUser.getUserSeq()); + cellPhone = equipService.selectCellPhoneInfo(cellPhone.getPhoneKey()); + ParamMap param = new ParamMap(); + param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(cellPhone.getMgtOrgan())); + mav.addObject("managerList", userInfoService.selectManagerList(param)); + mav.addObject("userSeq", loginUser.getUserSeq()); } - + if(cellPhone.getPhoneKey() == null) { - cellPhone.setWrtOrgan(loginUser.getOgCd()); - cellPhone.setWrtPart(loginUser.getOfcCd()); - cellPhone.setWrtTitle(loginUser.getTitleCd()); - cellPhone.setWrtUserSeq(loginUser.getUserSeq()); - cellPhone.setWrtNm(loginUser.getUserNm()); + cellPhone.setWrtOrgan(loginUser.getOgCd()); + cellPhone.setWrtPart(loginUser.getOfcCd()); + cellPhone.setWrtTitle(loginUser.getTitleCd()); + cellPhone.setWrtUserSeq(loginUser.getUserSeq()); + cellPhone.setWrtNm(loginUser.getUserNm()); } - //메뉴권한 확인 + //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/cellPhoneList").get(0).getAccessAuth(); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("userOrgan", loginUser.getOgCd()); @@ -272,28 +269,28 @@ public class EquipController { mav.addObject("info", cellPhone); return mav; } - + @GetMapping("/cellPhoneSelecBox") public ModelAndView cellPhoneSelecBox(String ogCd) { ModelAndView mav = new ModelAndView("equip/cellPhoneSelecBox"); - ParamMap param = new ParamMap(); + ParamMap param = new ParamMap(); param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); mav.addObject("managerList", userInfoService.selectManagerList(param)); return mav; } - + @PostMapping("/saveCellPhone") public Integer saveCellPhone (@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone){ - cellPhone.setWrtDt(LocalDateTime.now()); - return equipService.saveCellPhone(cellPhone); + cellPhone.setWrtDt(LocalDateTime.now()); + return equipService.saveCellPhone(cellPhone); } - + @PostMapping("/deleteCellPhone") public void deleteCellPhone(@RequestBody List cellPhone){ - equipService.deleteCellPhone(cellPhone); + equipService.deleteCellPhone(cellPhone); } - + @GetMapping("/pvreUseList") public ModelAndView pvreUseList(@AuthenticationPrincipal UserInfo loginUser,UseList useList,HttpServletResponse response) { ModelAndView mav = new ModelAndView("equip/pvreUseList"); @@ -301,23 +298,23 @@ public class EquipController { useList.setUseType("PVRE"); //엑셀다운 if(useList.getExcel() != null && useList.getExcel().equals("Y")){ - String[] headers = { "use_no", "sosok", "use_dt", "detail_type_name", "people_cnt", "description", "wrt_dt"}; - String[] headerNames = { "연번", "경찰서","사용일시", "사용사유", "사용인원", "비고", "최종수정일"}; - String[] columnType = { "String", "String","String", "String", "int", "String", "String"}; - String sheetName = "휴대용 녹화장비 사용 대장"; - String excelFileName = "휴대용 녹화장비 사용 대장"; - List useExcelList= equipService.selectUseList(useList); + String[] headers = { "use_no", "sosok", "use_dt", "detail_type_name", "people_cnt", "description", "wrt_dt"}; + String[] headerNames = { "연번", "경찰서","사용일시", "사용사유", "사용인원", "비고", "최종수정일"}; + String[] columnType = { "String", "String","String", "String", "int", "String", "String"}; + String sheetName = "휴대용 녹화장비 사용 대장"; + String excelFileName = "휴대용 녹화장비 사용 대장"; + List useExcelList= equipService.selectUseList(useList); - try { - Utils.useListToExcel(useExcelList, response, headers, headerNames, columnType, sheetName, excelFileName); - } catch (IOException e) { - - } - return null; + try { + Utils.useListToExcel(useExcelList, response, headers, headerNames, columnType, sheetName, excelFileName); + } catch (IOException e) { + + } + return null; } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + mav.addObject("accessAuth", accessAuth); useList.setQueryInfo(); mav.addObject("useList", equipService.selectUseList(useList)); useList.setContentCnt(equipService.selectUseListCnt(useList)); @@ -326,7 +323,7 @@ public class EquipController { mav.addObject("searchParams", useList); return mav; } - + @GetMapping("/useEditModal") public ModelAndView useEditModal(@AuthenticationPrincipal UserInfo loginUser,UseList useList) { ModelAndView mav = new ModelAndView("equip/useEditModal"); @@ -334,29 +331,29 @@ public class EquipController { mav.addObject("organList", equipService.selectOrganList(useList)); mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("useType", useList.getUseType()); - //메뉴권한 확인 + //메뉴권한 확인 String accessAuth; if(useList.getUseType().equals("PVRE")) { - accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); }else if(useList.getUseType().equals("QIR")) { - accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/qirUseList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/qirUseList").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); } return mav; } - + @PostMapping("/saveUse") public void saveUse(@AuthenticationPrincipal UserInfo loginUser,UseList useList){ - useList.setWrtOrgan(loginUser.getOgCd()); - useList.setWrtPart(loginUser.getOfcCd()); - useList.setWrtTitle(loginUser.getTitleCd()); - useList.setWrtUserSeq(loginUser.getUserSeq()); - useList.setWrtNm(loginUser.getUserNm()); - useList.setWrtDt(LocalDateTime.now()); - equipService.saveUse(useList); + useList.setWrtOrgan(loginUser.getOgCd()); + useList.setWrtPart(loginUser.getOfcCd()); + useList.setWrtTitle(loginUser.getTitleCd()); + useList.setWrtUserSeq(loginUser.getUserSeq()); + useList.setWrtNm(loginUser.getUserNm()); + useList.setWrtDt(LocalDateTime.now()); + equipService.saveUse(useList); } - + @GetMapping("/useModifyModal") public ModelAndView useModifyModal(@AuthenticationPrincipal UserInfo loginUser,UseList useList) { ModelAndView mav = new ModelAndView("equip/useModifyModal"); @@ -365,48 +362,48 @@ public class EquipController { mav.addObject("info", equipService.selectUseInfo(useList)); mav.addObject("wrtUserSeq", equipService.selectFirstWrtUserSeq(useList)); mav.addObject("userSeq", loginUser.getUserSeq()); - - //메뉴권한 확인 + + //메뉴권한 확인 String accessAuth; if(useList.getUseType().equals("PVRE")) { - accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); }else if(useList.getUseType().equals("QIR")) { - accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/qirUseList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/qirUseList").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); } return mav; } - + @PostMapping("/updateUse") public UseList uadateUse(@AuthenticationPrincipal UserInfo loginUser,UseList useList){ - useList.setWrtOrgan(loginUser.getOgCd()); - useList.setWrtPart(loginUser.getOfcCd()); - useList.setWrtTitle(loginUser.getTitleCd()); - useList.setWrtUserSeq(loginUser.getUserSeq()); - useList.setWrtNm(loginUser.getUserNm()); - useList.setWrtDt(LocalDateTime.now()); - return equipService.updateUse(useList); + useList.setWrtOrgan(loginUser.getOgCd()); + useList.setWrtPart(loginUser.getOfcCd()); + useList.setWrtTitle(loginUser.getTitleCd()); + useList.setWrtUserSeq(loginUser.getUserSeq()); + useList.setWrtNm(loginUser.getUserNm()); + useList.setWrtDt(LocalDateTime.now()); + return equipService.updateUse(useList); } - + @GetMapping("/useHistory") public ModelAndView useHistory(@AuthenticationPrincipal UserInfo loginUser,UseList useList) { ModelAndView mav = new ModelAndView("equip/useHistory"); mav.addObject("infoList", equipService.selectUseHistoryList(useList)); return mav; } - + @GetMapping("/HistoryView") @ResponseBody public UseList HistoryView(UseList useList){ return equipService.selectUseInfo(useList); } - + @PostMapping("/useDelete") public void useDelete(@RequestBody List useList){ - equipService.useDelete(useList); + equipService.useDelete(useList); } - + @GetMapping("/qirUseList") public ModelAndView qirUseList(@AuthenticationPrincipal UserInfo loginUser,UseList useList,HttpServletResponse response) { ModelAndView mav = new ModelAndView("equip/qirUseList"); @@ -414,23 +411,23 @@ public class EquipController { useList.setUseType("QIR"); //엑셀다운 if(useList.getExcel() != null && useList.getExcel().equals("Y")){ - String[] headers = { "use_no", "sosok", "use_dt", "detail_type_name", "people_cnt", "description", "wrt_dt"}; - String[] headerNames = { "연번", "경찰서","사용일시", "사용사유", "사용인원", "비고", "최종수정일"}; - String[] columnType = { "String", "String","String", "String", "int", "String", "String"}; - String sheetName = "방역조사실 사용대장"; - String excelFileName = "방역조사실 사용대장"; - List useExcelList= equipService.selectUseList(useList); + String[] headers = { "use_no", "sosok", "use_dt", "detail_type_name", "people_cnt", "description", "wrt_dt"}; + String[] headerNames = { "연번", "경찰서","사용일시", "사용사유", "사용인원", "비고", "최종수정일"}; + String[] columnType = { "String", "String","String", "String", "int", "String", "String"}; + String sheetName = "방역조사실 사용대장"; + String excelFileName = "방역조사실 사용대장"; + List useExcelList= equipService.selectUseList(useList); - try { - Utils.useListToExcel(useExcelList, response, headers, headerNames, columnType, sheetName, excelFileName); - } catch (IOException e) { - - } - return null; + try { + Utils.useListToExcel(useExcelList, response, headers, headerNames, columnType, sheetName, excelFileName); + } catch (IOException e) { + + } + return null; } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/qirUseList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + mav.addObject("accessAuth", accessAuth); useList.setQueryInfo(); mav.addObject("useList", equipService.selectUseList(useList)); useList.setContentCnt(equipService.selectUseListCnt(useList)); @@ -439,9 +436,9 @@ public class EquipController { mav.addObject("organList", equipService.selectOrganList(useList)); return mav; } - - - - + + + + } diff --git a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java index 129e82dc..b9f8527a 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java @@ -36,376 +36,363 @@ import java.util.*; @Service @RequiredArgsConstructor public class EquipService { - @Value("${file.dir}") - protected String fileDir; - @Value("${file.dir.equip}") - protected String equ; + @Value("${file.dir}") + protected String fileDir; + @Value("${file.dir.equip}") + protected String equ; - private final EquipRepository equipRepository; - private final EquipFileRepository equipFileRepository; - private final EquipLogRepository equipLogRepository; - private final CellPhoneRepository cellPhoneRepository; - private final UseListRepository useListRepository; - private final EquipMapper equipMapper; - - SimpleDateFormat Date = new SimpleDateFormat("yyyy"); - String year = Date.format(new Date()); - - - @Transactional - public void saveEquip(Equip equip, MultipartHttpServletRequest request) { - Equip dbEquip = equipRepository.findFirstByOrderByEquKeyDesc(); - try { - if(dbEquip == null) { - equip.setEquKey(1); - equip.setVersionNo(1); - equipRepository.save(equip); - } else { - equip.setEquKey(dbEquip.getEquKey()+1); - equip.setVersionNo(1); - equipRepository.save(equip); - } - saveFile(equip,request); - EquipLog equLog = new EquipLog(); - equLog.setEquType(equip.getEquType()); - equLog.setDetailType(equip.getDetailType()); - equLog.setElContents("입력"); - equLog.setWrtNm(equip.getWrtNm()); - equLog.setWrtOrgan(equip.getWrtOrgan()); - equLog.setWrtPart(equip.getWrtPart()); - equLog.setWrtTitle(equip.getWrtTitle()); - equLog.setWrtDt(equip.getWrtDt()); - equipLogRepository.save(equLog); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void saveFile(Equip equip, MultipartHttpServletRequest mRequest) throws Exception { - try { - String path = fileDir+equ; - String FileSize; - File dir = new File(path); - if(!dir.exists()) dir.mkdir(); - //파일등록 - List mFiles = mRequest.getFiles("file"); - for(int i = 0; i < mFiles.size(); i++) { - MultipartFile mFile = mFiles.get(i); - FileSize = calculationSize(mFile.getSize()); - if(!"".equals(mFile.getOriginalFilename())){ - String fileName = mFile.getOriginalFilename(); - if(fileName.contains("\\")){ - String notSecuredFileName = fileName.substring(fileName.lastIndexOf("\\") +1); - fileName = ("".equals(notSecuredFileName) || null == notSecuredFileName) ? fileName : notSecuredFileName; - }; + private final EquipRepository equipRepository; + private final EquipFileRepository equipFileRepository; + private final EquipLogRepository equipLogRepository; + private final CellPhoneRepository cellPhoneRepository; + private final UseListRepository useListRepository; + private final EquipMapper equipMapper; - String fileExt = Utils.getFileExtention(fileName); - String saveName = Utils.generationSaveName() + "." + fileExt; - FileCopyUtils.copy(mFile.getBytes(), new File(path, saveName)); + SimpleDateFormat Date = new SimpleDateFormat("yyyy"); + String year = Date.format(new Date()); - EquipFile equipFile = new EquipFile(); - equipFile.setEquKey(equip.getEquKey()); - equipFile.setVersionNo(equip.getVersionNo()); - equipFile.setOrigNm(fileName); - equipFile.setConvNm(saveName); - equipFile.setFileExtn(fileExt); - equipFile.setFilePath(path); - equipFile.setFileSize(FileSize); - equipFileRepository.save(equipFile); - } else { - EquipFile equipFile = new EquipFile(); - equipFile.setEquKey(equip.getEquKey()); - equipFile.setVersionNo(equip.getVersionNo()); - equipFileRepository.save(equipFile); - } - } + @Transactional + public void saveEquip(Equip equip, MultipartHttpServletRequest request) { + Equip dbEquip = equipRepository.findFirstByOrderByEquKeyDesc(); + try { + if(dbEquip == null) { + equip.setEquKey(1); + equip.setVersionNo(1); + equipRepository.save(equip); + } else { + equip.setEquKey(dbEquip.getEquKey()+1); + equip.setVersionNo(1); + equipRepository.save(equip); + } + saveFile(equip,request); + EquipLog equLog = new EquipLog(); + equLog.setEquType(equip.getEquType()); + equLog.setDetailType(equip.getDetailType()); + equLog.setElContents("입력"); + equLog.setWrtNm(equip.getWrtNm()); + equLog.setWrtOrgan(equip.getWrtOrgan()); + equLog.setWrtPart(equip.getWrtPart()); + equLog.setWrtTitle(equip.getWrtTitle()); + equLog.setWrtDt(equip.getWrtDt()); + equipLogRepository.save(equLog); + } catch (Exception e) { + e.printStackTrace(); + } + } - } catch (Exception e) { - throw e; - } - } - - - private String calculationSize(double fileSize){ - String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"}; - double unitSelector = Math.floor(Math.log(fileSize)/Math.log(1024)); - if(fileSize>0){ - return Math.round((fileSize/Math.pow(1024, unitSelector))*100)/100d+" "+units[(int)unitSelector]; - }else{ - return ""; - } - } + public void saveFile(Equip equip, MultipartHttpServletRequest mRequest) throws Exception { + try { + String path = fileDir+equ; + String FileSize; + File dir = new File(path); + if(!dir.exists()) dir.mkdir(); + //파일등록 + List mFiles = mRequest.getFiles("file"); + for(int i = 0; i < mFiles.size(); i++) { + MultipartFile mFile = mFiles.get(i); + FileSize = calculationSize(mFile.getSize()); + if(!"".equals(mFile.getOriginalFilename())){ + String fileName = mFile.getOriginalFilename(); + if(fileName.contains("\\")){ + String notSecuredFileName = fileName.substring(fileName.lastIndexOf("\\") +1); + fileName = ("".equals(notSecuredFileName) || null == notSecuredFileName) ? fileName : notSecuredFileName; + }; - public List selectEquipStatus(Equip equip) { - return equipMapper.selectEquipStatus(equip); - } + String fileExt = Utils.getFileExtention(fileName); + String saveName = Utils.generationSaveName() + "." + fileExt; + FileCopyUtils.copy(mFile.getBytes(), new File(path, saveName)); - public List selectEquipList(Equip equip) { - return equipMapper.selectEquipList(equip); - } + EquipFile equipFile = new EquipFile(); + equipFile.setEquKey(equip.getEquKey()); + equipFile.setVersionNo(equip.getVersionNo()); + equipFile.setOrigNm(fileName); + equipFile.setConvNm(saveName); + equipFile.setFileExtn(fileExt); + equipFile.setFilePath(path); + equipFile.setFileSize(FileSize); - public Integer selectEquipListCnt(Equip equip) { - return equipMapper.selectEquipListCnt(equip); - } + equipFileRepository.save(equipFile); + } else { + EquipFile equipFile = new EquipFile(); + equipFile.setEquKey(equip.getEquKey()); + equipFile.setVersionNo(equip.getVersionNo()); + equipFileRepository.save(equipFile); + } + } - public Equip selectEquipInfo(Equip equip) { - return equipMapper.selectEquipInfo(equip); - } - - @Transactional - public int updateEquip(Equip equip, MultipartHttpServletRequest request) { - try { - Equip dbEquip = equipRepository.findById(new EquipId(equip.getEquKey(), equip.getVersionNo())).orElse(null); - Equip equipTmp = new Equip(); - equipTmp.setEquKey(dbEquip.getEquKey()); - equipTmp.setVersionNo(dbEquip.getVersionNo()+1); - equipTmp.setMgtOrgan(equip.getMgtOrgan()); - equipTmp.setEquType(equip.getEquType()); - equipTmp.setDetailType(equip.getDetailType()); - equipTmp.setStoredYear(equip.getStoredYear()); - equipTmp.setItemQty(equip.getItemQty()); - equipTmp.setItemCondition(equip.getItemCondition()); - equipTmp.setNote(equip.getNote()); - equipTmp.setWrtOrgan(equip.getWrtOrgan()); - equipTmp.setWrtPart(equip.getWrtPart()); - equipTmp.setWrtTitle(equip.getWrtTitle()); - equipTmp.setWrtNm(equip.getWrtNm()); - equipTmp.setWrtDt(equip.getWrtDt()); - equipRepository.save(equipTmp); - updateFile(equip,equipTmp,request); - EquipLog equLog = new EquipLog(); - equLog.setEquType(equip.getEquType()); - equLog.setDetailType(equip.getDetailType()); - equLog.setElContents("수정"); - equLog.setWrtNm(equip.getWrtNm()); - equLog.setWrtOrgan(equip.getWrtOrgan()); - equLog.setWrtDt(equip.getWrtDt()); - equLog.setWrtPart(equip.getWrtPart()); - equLog.setWrtTitle(equip.getWrtTitle()); - equipLogRepository.save(equLog); - } catch (Exception e) { - e.printStackTrace(); - } - return equip.getEquKey(); - } - - public void updateFile(Equip equip,Equip equipTmp, MultipartHttpServletRequest mRequest) throws Exception { - try { - String path = fileDir+equ; - String FileSize; - File dir = new File(path); - if(!dir.exists()) dir.mkdir(); - - //이미지 삭제했을경우 - if(equip.getDeleteFileKey() != null) { - EquipFile equFile = new EquipFile(); - equFile.setEquKey(equip.getDeleteFileKey()); - equFile.setVersionNo(equip.getDeleteFileVnum()); - EquipFile dbEquFile = equipFileRepository.findById(new EquipFileId(equFile.getEquKey(), equFile.getVersionNo())).orElse(null); - if(dbEquFile != null) { - File file = new File(dbEquFile.getFilePath(), dbEquFile.getConvNm()); + } catch (Exception e) { + throw e; + } + } - if(file.exists()) { - file.delete(); - } - } - } - //파일등록 - List mFiles = mRequest.getFiles("file"); - for(int i = 0; i < mFiles.size(); i++) { - MultipartFile mFile = mFiles.get(i); - FileSize = calculationSize(mFile.getSize()); - if(!"".equals(mFile.getOriginalFilename())){ - String fileName = mFile.getOriginalFilename(); - if(fileName.contains("\\")){ - String notSecuredFileName = fileName.substring(fileName.lastIndexOf("\\") +1); - fileName = ("".equals(notSecuredFileName) || null == notSecuredFileName) ? fileName : notSecuredFileName; - }; + private String calculationSize(double fileSize){ + String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"}; + double unitSelector = Math.floor(Math.log(fileSize)/Math.log(1024)); + if(fileSize>0){ + return Math.round((fileSize/Math.pow(1024, unitSelector))*100)/100d+" "+units[(int)unitSelector]; + }else{ + return ""; + } + } - String fileExt = Utils.getFileExtention(fileName); - String saveName = Utils.generationSaveName() + "." + fileExt; - FileCopyUtils.copy(mFile.getBytes(), new File(path, saveName)); + public List selectEquipStatus(Equip equip) { + return equipMapper.selectEquipStatus(equip); + } - EquipFile equipFile = new EquipFile(); - equipFile.setEquKey(equipTmp.getEquKey()); - equipFile.setVersionNo(equipTmp.getVersionNo()); - equipFile.setOrigNm(fileName); - equipFile.setConvNm(saveName); - equipFile.setFileExtn(fileExt); - equipFile.setFilePath(path); - equipFile.setFileSize(FileSize); + public List selectEquipList(Equip equip) { + return equipMapper.selectEquipList(equip); + } - equipFileRepository.save(equipFile); - } else if(equip.getNoUpdateImg() != null) { - EquipFile equipFile = new EquipFile(); - equipFile.setEquKey(equipTmp.getEquKey()); - equipFile.setVersionNo(equipTmp.getVersionNo()); - EquipFile dbEquFile = equipFileRepository.findById(new EquipFileId(equip.getEquKey(), equip.getVersionNo())).orElse(null); - equipFile.setOrigNm(dbEquFile.getOrigNm()); - equipFile.setConvNm(dbEquFile.getConvNm()); - equipFile.setFileExtn(dbEquFile.getFileExtn()); - equipFile.setFilePath(dbEquFile.getFilePath()); - equipFile.setFileSize(dbEquFile.getFileSize()); - equipFileRepository.save(equipFile); - } else { - EquipFile equipFile = new EquipFile(); - equipFile.setEquKey(equipTmp.getEquKey()); - equipFile.setVersionNo(equipTmp.getVersionNo()); - equipFileRepository.save(equipFile); - } - } - } catch (Exception e) { - throw e; - } - } + public Integer selectEquipListCnt(Equip equip) { + return equipMapper.selectEquipListCnt(equip); + } - public ParamMap selectEduType(Equip equip) { - return equipMapper.selectEduType(equip); - } + public Equip selectEquipInfo(Equip equip) { + return equipMapper.selectEquipInfo(equip); + } - public List selectHistoryList(Equip equip) { - return equipMapper.selectHistoryList(equip); - } + @Transactional + public int updateEquip(Equip equip, MultipartHttpServletRequest request) { + try { + Equip dbEquip = equipRepository.findById(new EquipId(equip.getEquKey(), equip.getVersionNo())).orElse(null); + Equip equipTmp = new Equip(); + equipTmp.setEquKey(dbEquip.getEquKey()); + equipTmp.setVersionNo(dbEquip.getVersionNo()+1); + equipTmp.setMgtOrgan(equip.getMgtOrgan()); + equipTmp.setEquType(equip.getEquType()); + equipTmp.setDetailType(equip.getDetailType()); + equipTmp.setStoredYear(equip.getStoredYear()); + equipTmp.setItemQty(equip.getItemQty()); + equipTmp.setItemCondition(equip.getItemCondition()); + equipTmp.setNote(equip.getNote()); + equipTmp.setWrtOrgan(equip.getWrtOrgan()); + equipTmp.setWrtPart(equip.getWrtPart()); + equipTmp.setWrtTitle(equip.getWrtTitle()); + equipTmp.setWrtNm(equip.getWrtNm()); + equipTmp.setWrtDt(equip.getWrtDt()); + equipRepository.save(equipTmp); + updateFile(equip,equipTmp,request); + EquipLog equLog = new EquipLog(); + equLog.setEquType(equip.getEquType()); + equLog.setDetailType(equip.getDetailType()); + equLog.setElContents("수정"); + equLog.setWrtNm(equip.getWrtNm()); + equLog.setWrtOrgan(equip.getWrtOrgan()); + equLog.setWrtDt(equip.getWrtDt()); + equLog.setWrtPart(equip.getWrtPart()); + equLog.setWrtTitle(equip.getWrtTitle()); + equipLogRepository.save(equLog); + } catch (Exception e) { + e.printStackTrace(); + } + return equip.getEquKey(); + } - public Equip selectHistoryDetail(Equip equip) { - return equipMapper.selectHistoryDetail(equip); - } - - @Transactional - public void equipDelete(List equip,UserInfo loginUser) { - for(Equip equ: equip) { - //파일삭제 - Equip dbEquip = equipMapper.selectEquipInfo(equ); - if(dbEquip.getOrigNm() != null) { - File file = new File(dbEquip.getFilePath(), dbEquip.getConvNm()); + public void updateFile(Equip equip, Equip equipTmp, MultipartHttpServletRequest mRequest) throws Exception { + try { + String path = fileDir+equ; + String FileSize; + File dir = new File(path); + if(!dir.exists()) dir.mkdir(); - if(file.exists()) { + //파일등록 + List mFiles = mRequest.getFiles("file"); + for(int i = 0; i < mFiles.size(); i++) { + MultipartFile mFile = mFiles.get(i); + FileSize = calculationSize(mFile.getSize()); + if(!"".equals(mFile.getOriginalFilename())){ + String fileName = mFile.getOriginalFilename(); + if(fileName.contains("\\")){ + String notSecuredFileName = fileName.substring(fileName.lastIndexOf("\\") +1); + fileName = ("".equals(notSecuredFileName) || null == notSecuredFileName) ? fileName : notSecuredFileName; + }; - file.delete(); - } - } - equipRepository.deleteByEquKey(equ.getEquKey()); - equipFileRepository.deleteByEquKey(equ.getEquKey()); - EquipLog equLog = new EquipLog(); - equLog.setEquType(dbEquip.getEquType()); - equLog.setDetailType(dbEquip.getDetailType()); - equLog.setElContents("삭제"); - equLog.setWrtNm(loginUser.getUserNm()); - equLog.setWrtOrgan(loginUser.getOgCd()); - equLog.setWrtPart(loginUser.getOfcCd()); - equLog.setWrtTitle(loginUser.getTitleCd()); - equLog.setWrtDt(LocalDateTime.now()); - equipLogRepository.save(equLog); - } - - } + String fileExt = Utils.getFileExtention(fileName); + String saveName = Utils.generationSaveName() + "." + fileExt; + FileCopyUtils.copy(mFile.getBytes(), new File(path, saveName)); - public List selectEquipLogList(EquipLog equipLog) { - return equipMapper.selectEquipLogList(equipLog); - } + EquipFile equipFile = new EquipFile(); + equipFile.setEquKey(equipTmp.getEquKey()); + equipFile.setVersionNo(equipTmp.getVersionNo()); + equipFile.setOrigNm(fileName); + equipFile.setConvNm(saveName); + equipFile.setFileExtn(fileExt); + equipFile.setFilePath(path); + equipFile.setFileSize(FileSize); - public Integer selectEquipLogListCnt(EquipLog equipLog) { - return equipMapper.selectEquipLogListCnt(equipLog); - } + equipFileRepository.save(equipFile); + } else if(equip.getNoUpdateImg() != null) { + EquipFile equipFile = new EquipFile(); + equipFile.setEquKey(equipTmp.getEquKey()); + equipFile.setVersionNo(equipTmp.getVersionNo()); + EquipFile dbEquFile = equipFileRepository.findById(new EquipFileId(equip.getEquKey(), equip.getVersionNo())).orElse(null); + equipFile.setOrigNm(dbEquFile.getOrigNm()); + equipFile.setConvNm(dbEquFile.getConvNm()); + equipFile.setFileExtn(dbEquFile.getFileExtn()); + equipFile.setFilePath(dbEquFile.getFilePath()); + equipFile.setFileSize(dbEquFile.getFileSize()); + equipFileRepository.save(equipFile); + } else { + EquipFile equipFile = new EquipFile(); + equipFile.setEquKey(equipTmp.getEquKey()); + equipFile.setVersionNo(equipTmp.getVersionNo()); + equipFileRepository.save(equipFile); + } + } + } catch (Exception e) { + throw e; + } + } - public String selectEquipFirstUserSeq(Equip equip) { - return equipMapper.selectEquipFirstUserSeq(equip); - } - - @Transactional - public Integer saveCellPhone(CellPhone cellPhone) { - return cellPhoneRepository.save(cellPhone).getPhoneKey(); - } + public ParamMap selectEduType(Equip equip) { + return equipMapper.selectEduType(equip); + } - public List selectCellPhoneList(CellPhone cellPhone) { - return equipMapper.selectCellPhoneList(cellPhone); - } + public List selectHistoryList(Equip equip) { + return equipMapper.selectHistoryList(equip); + } - public Integer selectCellPhoneListCnt(CellPhone cellPhone) { - return equipMapper.selectCellPhoneListCnt(cellPhone); - } + public Equip selectHistoryDetail(Equip equip) { + return equipMapper.selectHistoryDetail(equip); + } - public CellPhone selectCellPhoneInfo(Integer phoneKey) { - return cellPhoneRepository.findById(phoneKey).orElse(null); - } - - @Transactional - public void deleteCellPhone(List cellPhone) { - cellPhoneRepository.deleteAll(cellPhone); - } + @Transactional + public void equipDelete(List equip,UserInfo loginUser) { + for(Equip equ: equip) { + //파일삭제 + Equip dbEquip = equipMapper.selectEquipInfo(equ); + if(dbEquip.getOrigNm() != null) { + File file = new File(dbEquip.getFilePath(), dbEquip.getConvNm()); - public List selectOrganList(UseList useList) { - return equipMapper.selectOrganList(useList); - } - - @Transactional - public void saveUse(UseList useList) { - useList.setYear(year); - Integer useNo = equipMapper.selectLastUseNo(useList); - if(useNo == null) { - useList.setUseNo(year+"-001"); - useList.setVersionNo(1); - } else { - useList.setUseNo(year+"-"+String.format("%03d", useNo+1)); - useList.setVersionNo(1); - } - useListRepository.save(useList); - - } + if(file.exists()) { - public List selectUseList(UseList useList) { - return equipMapper.selectUseList(useList); - } + file.delete(); + } + } + equipRepository.deleteByEquKey(equ.getEquKey()); + equipFileRepository.deleteByEquKey(equ.getEquKey()); + EquipLog equLog = new EquipLog(); + equLog.setEquType(dbEquip.getEquType()); + equLog.setDetailType(dbEquip.getDetailType()); + equLog.setElContents("삭제"); + equLog.setWrtNm(loginUser.getUserNm()); + equLog.setWrtOrgan(loginUser.getOgCd()); + equLog.setWrtPart(loginUser.getOfcCd()); + equLog.setWrtTitle(loginUser.getTitleCd()); + equLog.setWrtDt(LocalDateTime.now()); + equipLogRepository.save(equLog); + } - public Integer selectUseListCnt(UseList useList) { - return equipMapper.selectUseListCnt(useList); - } + } - public UseList selectUseInfo(UseList useList) { - return equipMapper.selectUseInfo(useList); - } - - @Transactional - public UseList updateUse(UseList useList) { - UseList dbUseList = useListRepository - .findById(new UseListId(useList.getMgtOrgan(),useList.getUseNo(),useList.getVersionNo(),useList.getUseType())).orElse(null); - UseList useTmp = new UseList(); - useTmp.setMgtOrgan(dbUseList.getMgtOrgan()); - useTmp.setUseNo(dbUseList.getUseNo()); - useTmp.setVersionNo(dbUseList.getVersionNo()+1); - useTmp.setUseType(dbUseList.getUseType()); - useTmp.setUseDt(useList.getUseDt()); - useTmp.setDetailType(useList.getDetailType()); - useTmp.setDetailSelf(useList.getDetailSelf()); - useTmp.setPeopleCnt(useList.getPeopleCnt()); - useTmp.setDescription(useList.getDescription()); - useTmp.setWrtOrgan(useList.getWrtOrgan()); - useTmp.setWrtPart(useList.getWrtPart()); - useTmp.setWrtTitle(useList.getWrtTitle()); - useTmp.setWrtUserSeq(useList.getWrtUserSeq()); - useTmp.setWrtNm(useList.getWrtNm()); - useTmp.setWrtDt(useList.getWrtDt()); - return useListRepository.save(useTmp); - - } + public List selectEquipLogList(EquipLog equipLog) { + return equipMapper.selectEquipLogList(equipLog); + } - public List selectUseHistoryList(UseList useList) { - return equipMapper.selectUseHistoryList(useList); - } - - @Transactional - public void useDelete(List useList) { - for(UseList use:useList) { - useListRepository.deleteByMgtOrganAndUseNoAndUseType(use.getMgtOrgan(),use.getUseNo(),use.getUseType()); - } - } + public Integer selectEquipLogListCnt(EquipLog equipLog) { + return equipMapper.selectEquipLogListCnt(equipLog); + } - public Integer selectFirstWrtUserSeq(UseList useList) { - return useListRepository.getWrtUserSeq(useList.getMgtOrgan(),useList.getUseNo(),useList.getUseType()); - } - + public String selectEquipFirstUserSeq(Equip equip) { + return equipMapper.selectEquipFirstUserSeq(equip); + } - + @Transactional + public Integer saveCellPhone(CellPhone cellPhone) { + return cellPhoneRepository.save(cellPhone).getPhoneKey(); + } + + public List selectCellPhoneList(CellPhone cellPhone) { + return equipMapper.selectCellPhoneList(cellPhone); + } + + public Integer selectCellPhoneListCnt(CellPhone cellPhone) { + return equipMapper.selectCellPhoneListCnt(cellPhone); + } + + public CellPhone selectCellPhoneInfo(Integer phoneKey) { + return cellPhoneRepository.findById(phoneKey).orElse(null); + } + + @Transactional + public void deleteCellPhone(List cellPhone) { + cellPhoneRepository.deleteAll(cellPhone); + } + + public List selectOrganList(UseList useList) { + return equipMapper.selectOrganList(useList); + } + + @Transactional + public void saveUse(UseList useList) { + useList.setYear(year); + Integer useNo = equipMapper.selectLastUseNo(useList); + if(useNo == null) { + useList.setUseNo(year+"-001"); + useList.setVersionNo(1); + } else { + useList.setUseNo(year+"-"+String.format("%03d", useNo+1)); + useList.setVersionNo(1); + } + useListRepository.save(useList); + + } + + public List selectUseList(UseList useList) { + return equipMapper.selectUseList(useList); + } + + public Integer selectUseListCnt(UseList useList) { + return equipMapper.selectUseListCnt(useList); + } + + public UseList selectUseInfo(UseList useList) { + return equipMapper.selectUseInfo(useList); + } + + @Transactional + public UseList updateUse(UseList useList) { + UseList dbUseList = useListRepository + .findById(new UseListId(useList.getMgtOrgan(),useList.getUseNo(),useList.getVersionNo(),useList.getUseType())).orElse(null); + UseList useTmp = new UseList(); + useTmp.setMgtOrgan(dbUseList.getMgtOrgan()); + useTmp.setUseNo(dbUseList.getUseNo()); + useTmp.setVersionNo(dbUseList.getVersionNo()+1); + useTmp.setUseType(dbUseList.getUseType()); + useTmp.setUseDt(useList.getUseDt()); + useTmp.setDetailType(useList.getDetailType()); + useTmp.setDetailSelf(useList.getDetailSelf()); + useTmp.setPeopleCnt(useList.getPeopleCnt()); + useTmp.setDescription(useList.getDescription()); + useTmp.setWrtOrgan(useList.getWrtOrgan()); + useTmp.setWrtPart(useList.getWrtPart()); + useTmp.setWrtTitle(useList.getWrtTitle()); + useTmp.setWrtUserSeq(useList.getWrtUserSeq()); + useTmp.setWrtNm(useList.getWrtNm()); + useTmp.setWrtDt(useList.getWrtDt()); + return useListRepository.save(useTmp); + + } + + public List selectUseHistoryList(UseList useList) { + return equipMapper.selectUseHistoryList(useList); + } + + @Transactional + public void useDelete(List useList) { + for(UseList use:useList) { + useListRepository.deleteByMgtOrganAndUseNoAndUseType(use.getMgtOrgan(),use.getUseNo(),use.getUseType()); + } + } + + public Integer selectFirstWrtUserSeq(UseList useList) { + return useListRepository.getWrtUserSeq(useList.getMgtOrgan(),useList.getUseNo(),useList.getUseType()); + } + + + public EquipFile selectEquipFile(Equip equip) { + return equipFileRepository.findById(new EquipFileId(equip.getEquKey(), equip.getVersionNo())).orElse(null); + } } diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index fbc20583..8635f35d 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -96,9 +96,6 @@ .pl-15{ padding-left: 15%; } -.pl-23{ - padding-left: 23%; -} .w-30{ width: 30%!important; } diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index f6672223..f8a0a114 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -1,18 +1,18 @@ $(document).ready(function(){ - $(".table_id").each(function(){ - var rows = $(".table_id:contains('"+$(this).text()+"')"); - - if(rows.length > 1){ - rows.eq(0).attr("rowspan", rows.length); - rows.not(":eq(0)").remove(); - } - }) - + $(".table_id").each(function(){ + var rows = $(".table_id:contains('"+$(this).text()+"')"); + + if(rows.length > 1){ + rows.eq(0).attr("rowspan", rows.length); + rows.not(":eq(0)").remove(); + } + }) + }); - + $(document).on('click', '#addEquip', function (){ - $.ajax({ + $.ajax({ url: '/equip/equipEditModal', type: 'GET', dataType:"html", @@ -33,13 +33,13 @@ $(document).on('click', '#addEquip', function (){ }) $(document).on('change', '#equType', function (){ - const equType = $(this).val(); - - $.ajax({ + const equType = $(this).val(); + + $.ajax({ url: '/equip/equipTypeSelecBox', data: { - equType, - }, + equType, + }, type: 'GET', dataType:"html", success: function(html){ @@ -50,236 +50,236 @@ $(document).on('change', '#equType', function (){ } }); }); - + $(document).on('click', '#saveEquip', function (){ - if($('#mgtOrgan').val() == ''){ - alert("관리처를 선택해주세요."); - $('#mgtOrgan').focus(); - return false; - } - if($('#equType').val() == ''){ - alert("분류를 선택해주세요."); - $('#equType').focus(); - return false; - } - if($('#detailType').val() == ''){ - alert("세부분류를 선택해주세요."); - $('#detailType').focus(); - return false; - } - if($('#itemQty').val() == ''){ - alert("수량을 입력해주세요."); - $('#itemQty').focus(); - return false; - } - if(confirm("저장하시겠습니까?")){ - document.getElementById("mgtOrgan").disabled = false; - let ajaxUrl = "/equip/saveEquip"; - const formData = new FormData($("#equipEditForm")[0]); - contentFade("in"); - $.ajax({ - type : 'POST', - data : formData, - url : ajaxUrl, - processData: false, - contentType: false, - success : function() { - alert("저장되었습니다."); - location.reload(); - contentFade("out"); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) - } - + if($('#mgtOrgan').val() == ''){ + alert("관리처를 선택해주세요."); + $('#mgtOrgan').focus(); + return false; + } + if($('#equType').val() == ''){ + alert("분류를 선택해주세요."); + $('#equType').focus(); + return false; + } + if($('#detailType').val() == ''){ + alert("세부분류를 선택해주세요."); + $('#detailType').focus(); + return false; + } + if($('#itemQty').val() == ''){ + alert("수량을 입력해주세요."); + $('#itemQty').focus(); + return false; + } + if(confirm("저장하시겠습니까?")){ + document.getElementById("mgtOrgan").disabled = false; + let ajaxUrl = "/equip/saveEquip"; + const formData = new FormData($("#equipEditForm")[0]); + contentFade("in"); + $.ajax({ + type : 'POST', + data : formData, + url : ajaxUrl, + processData: false, + contentType: false, + success : function() { + alert("저장되었습니다."); + location.reload(); + contentFade("out"); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + } + }); $(document).on('click', '#equUpdateBtn', function (){ - if($('input:checkbox[name=equChk]:checked').length < 1){ - alert("게시물을 선택해주세요") - return false; - } - if($('input:checkbox[name=equChk]:checked').length > 1){ - alert("한개만 선택해주세요") - return false; - } - const target = $('input:checkbox[name=equChk]:checked'); - const equKey = Number(target.parents('tr').find('.equKey').val()); - showUpdateModal(equKey); + if($('input:checkbox[name=equChk]:checked').length < 1){ + alert("게시물을 선택해주세요") + return false; + } + if($('input:checkbox[name=equChk]:checked').length > 1){ + alert("한개만 선택해주세요") + return false; + } + const target = $('input:checkbox[name=equChk]:checked'); + const equKey = Number(target.parents('tr').find('.equKey').val()); + showUpdateModal(equKey); }) function showUpdateModal(equKey){ - $.ajax({ - url: '/equip/updatePage', - data: {equKey: equKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#equipEditModalContent").empty().append(html) - $("#equipModifyModal").modal('show'); - $(".mStoredYear").datepicker({ - minViewMode: 'years', - format: "yyyy", - language: "ko", - autoclose: true - }) - }, - error:function(){ - - } - }); + $.ajax({ + url: '/equip/updatePage', + data: {equKey: equKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#equipModifyModalContent").empty().append(html) + $("#equipModifyModal").modal('show'); + $(".mStoredYear").datepicker({ + minViewMode: 'years', + format: "yyyy", + language: "ko", + autoclose: true + }) + }, + error:function(){ + + } + }); } $(document).on('click', '#addImgBtn', function (){ - $("#imgUpload").remove(); - $("#addImgBtn").hide(); - $("#imgUpdate").show(); - + $("#imgUpload").remove(); + $("#addImgBtn").hide(); + $("#imgUpdate").show(); + }) function deleteImg(equKey,versionNo){ - $('#equipModifyForm').append('', - ''); - $("#imgUpload").remove(); - $("#deleteImgBtn").hide(); - $("#imgUpdate").show(); + $('#equipModifyForm').append('', + ''); + $("#imgUpload").remove(); + $("#deleteImgBtn").hide(); + $("#imgUpdate").show(); } $(document).on('click', '#updateEquip', function (){ - if($('#mMgtOrgan').val() == ''){ - alert("관리처를 선택해주세요."); - $('#mMgtOrgan').focus(); - return false; - } - if($('#mItemQty').val() == ''){ - alert("수량을 입력해주세요."); - $('#mItemQty').focus(); - return false; - } - if(confirm("수정하시겠습니까?")){ - document.getElementById("mMgtOrgan").disabled = false; - let ajaxUrl = "/equip/updateEquip"; - const formData = new FormData($("#equipModifyForm")[0]); - contentFade("in"); - $.ajax({ - type : 'POST', - data : formData, - url : ajaxUrl, - processData: false, - contentType: false, - success : function(data) { - alert("수정되었습니다."); - showUpdateModal(data); - contentFade("out"); - }, - error : function(xhr, status) { - alert("수정에 실패하였습니다.") - contentFade("out"); - } - }) - } - + if($('#mMgtOrgan').val() == ''){ + alert("관리처를 선택해주세요."); + $('#mMgtOrgan').focus(); + return false; + } + if($('#mItemQty').val() == ''){ + alert("수량을 입력해주세요."); + $('#mItemQty').focus(); + return false; + } + if(confirm("수정하시겠습니까?")){ + document.getElementById("mMgtOrgan").disabled = false; + let ajaxUrl = "/equip/updateEquip"; + const formData = new FormData($("#equipModifyForm")[0]); + contentFade("in"); + $.ajax({ + type : 'POST', + data : formData, + url : ajaxUrl, + processData: false, + contentType: false, + success : function(data) { + alert("수정되었습니다."); + showUpdateModal(data); + contentFade("out"); + }, + error : function(xhr, status) { + alert("수정에 실패하였습니다.") + contentFade("out"); + } + }) + } + }); $(document).on('click', '#historyBtn', function (){ - if($('input:checkbox[name=equChk]:checked').length < 1){ - alert("게시물을 선택해주세요") - return false; - } - if($('input:checkbox[name=equChk]:checked').length > 1){ - alert("한개만 선택해주세요") - return false; - } - const target = $('input:checkbox[name=equChk]:checked'); - const equKey = Number(target.parents('tr').find('.equKey').val()); - $.ajax({ - url: '/equip/historyView', - data: {equKey: equKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#configEqu").empty().append(html) - $("#equipModifyModal").modal('show'); - }, - error:function(){ - - } - }); + if($('input:checkbox[name=equChk]:checked').length < 1){ + alert("장비를 선택해주세요") + return false; + } + if($('input:checkbox[name=equChk]:checked').length > 1){ + alert("한개만 선택해주세요") + return false; + } + const target = $('input:checkbox[name=equChk]:checked'); + const equKey = Number(target.parents('tr').find('.equKey').val()); + $.ajax({ + url: '/equip/historyView', + data: {equKey: equKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#equipHistoryModalContent").empty().append(html) + $("#equipHistoryModal").modal('show'); + }, + error:function(){ + + } + }); }) $(document).on('click', '.historyInfoTr', function (){ - $(this).find('.hisChk').prop('checked',true) - if($(this).find('.hisChk').prop('checked')){ - $('.hisChk').prop('checked',false); - $(this).find('.hisChk').prop('checked',true) - } + $(this).find('.hisChk').prop('checked',true) + if($(this).find('.hisChk').prop('checked')){ + $('.hisChk').prop('checked',false); + $(this).find('.hisChk').prop('checked',true) + } $.ajax({ - url: '/equip/HistoryDetail', - data: { - equKey : Number($(this).find(".equKey").val()), - versionNo : Number($(this).find(".verNo").val()) - }, - type: 'GET', - dataType:"json", - success: function(data){ - $('#vSosok').val(data.sosok); - $('#vEquType').val(data.equType); - $('#vDetailType').val(data.detailType); - $('#vStoredYear').val(data.storedYear); - $('#vItemQty').val(data.itemQty); - $('#vItemCondition').val(data.itemCondition); - $('#vNote').val(data.note); - $('#vImgName').val(data.origNm); - - }, - error:function(){ - - } + url: '/equip/HistoryDetail', + data: { + equKey : Number($(this).find(".equKey").val()), + versionNo : Number($(this).find(".verNo").val()) + }, + type: 'GET', + dataType:"json", + success: function(data){ + $('#vSosok').val(data.sosok); + $('#vEquType').val(data.equType); + $('#vDetailType').val(data.detailType); + $('#vStoredYear').val(data.storedYear); + $('#vItemQty').val(data.itemQty); + $('#vItemCondition').val(data.itemCondition); + $('#vNote').val(data.note); + $('#vImgName').attr("src", "/equip/getEquipImg?equKey="+data.equKey+"&versionNo="+data.versionNo); + $('#vImgName').show(); + }, + error:function(){ + + } }); }) $(document).on('click', '#equDeleteBtn', function (){ - if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ - const checkArr = []; - $('input:checkbox[name=equChk]:checked').each(function (idx, el){ - checkArr.push({}); - const target = $(el); - checkArr[idx].equKey = Number(target.parents('tr').find('.equKey').val()); - }) - deleteEquip(checkArr); + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + $('input:checkbox[name=equChk]:checked').each(function (idx, el){ + checkArr.push({}); + const target = $(el); + checkArr[idx].equKey = Number(target.parents('tr').find('.equKey').val()); + }) + deleteEquip(checkArr); - } + } }) $(document).on('click', '#deleteEquip', function (){ - if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ - const checkArr = []; - checkArr.push({}); - checkArr[0].equKey = Number($('#mEquKey').val()); - deleteEquip(checkArr); - } + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + checkArr.push({}); + checkArr[0].equKey = Number($('#mEquKey').val()); + deleteEquip(checkArr); + } }) function deleteEquip(checkArr){ - $.ajax({ - type : 'POST', - url : "/equip/epuipDelete", - data : JSON.stringify(checkArr), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function() { - alert("삭제처리 되었습니다."); - location.reload(); - }, - error : function(xhr, status) { - alert("삭제처리에 실패하였습니다"); - } - }) + $.ajax({ + type : 'POST', + url : "/equip/epuipDelete", + data : JSON.stringify(checkArr), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function() { + alert("삭제처리 되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제처리에 실패하였습니다"); + } + }) } $(document).ready( function() { @@ -289,13 +289,13 @@ $(document).ready( function() { }); $(document).on('click', '#statusExcel', function (){ - if(confirm("엑셀로 다운로드 하시겠습니까?")){ - location.href='/equip/statusExcelDown' - } + if(confirm("엑셀로 다운로드 하시겠습니까?")){ + location.href='/equip/statusExcelDown' + } }) $(document).on('click', '.modalCloseBtn', function (){ - location.reload(); + location.reload(); }) - - + + diff --git a/src/main/resources/static/js/equip/use.js b/src/main/resources/static/js/equip/use.js index 416ce622..081843d5 100644 --- a/src/main/resources/static/js/equip/use.js +++ b/src/main/resources/static/js/equip/use.js @@ -7,19 +7,19 @@ $(function(){ }) $(document).on('click', '#addPvre', function (){ - const useType = "PVRE"; - showEditModal(useType); + const useType = "PVRE"; + showEditModal(useType); }) $(document).on('click', '#addQir', function (){ - const useType = "QIR"; - showEditModal(useType); + const useType = "QIR"; + showEditModal(useType); }) function showEditModal(useType){ - $.ajax({ + $.ajax({ url: '/equip/useEditModal', - data: {useType: useType}, + data: {useType: useType}, type: 'GET', dataType:"html", success: function(html){ @@ -39,59 +39,59 @@ function showEditModal(useType){ } $(document).on('click', '#saveUse', function (){ - if($('#mgtOrgan').val() == ""){ - alert("사용관서를 선택해주세요."); - $('#mgtOrgan').focus(); - return false; - } - if(confirm("저장하시겠습니까?")){ - document.getElementById("mgtOrgan").disabled = false; - contentFade("in"); - const formData = new FormData($("#useFm")[0]); - $.ajax({ - type : 'POST', - data : formData, - url : "/equip/saveUse", - processData: false, - contentType: false, - success : function(result) { - alert("저장되었습니다."); - contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) - } + if($('#mgtOrgan').val() == ""){ + alert("사용관서를 선택해주세요."); + $('#mgtOrgan').focus(); + return false; + } + if(confirm("저장하시겠습니까?")){ + document.getElementById("mgtOrgan").disabled = false; + contentFade("in"); + const formData = new FormData($("#useFm")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/equip/saveUse", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + } }) $(document).on('change', '#detailType', function (){ - if($(this).val() == 'PVREUSE007' || $(this).val() == 'QIRUSE006'){ - $('#detailSelf').show(); - }else{ - $('#detailSelf').hide(); - $('#detailSelf').val(''); - } + if($(this).val() == 'PVREUSE007' || $(this).val() == 'QIRUSE006'){ + $('#detailSelf').show(); + }else{ + $('#detailSelf').hide(); + $('#detailSelf').val(''); + } }); $(document).on('click', '.useTr', function (event){ - const target = event.target; - if(!(target.className === "useChk" ||$(target).parents("td").length>0)){ - const useNo = $(target).parent('tr').data("useno"); - const useType = $(target).parent('tr').data("usetype"); - const mgtOrgan = $(target).parent('tr').data("mgtorgan"); - showMdifyModal(useNo,useType,mgtOrgan); - } + const target = event.target; + if(!(target.className === "useChk" ||$(target).parents("td").length>0)){ + const useNo = $(target).parent('tr').data("useno"); + const useType = $(target).parent('tr').data("usetype"); + const mgtOrgan = $(target).parent('tr').data("mgtorgan"); + showModifyModal(useNo,useType,mgtOrgan); + } }); -function showMdifyModal(useNo,useType,mgtOrgan){ - $.ajax({ +function showModifyModal(useNo,useType,mgtOrgan){ + $.ajax({ url: '/equip/useModifyModal', - data: {useNo: useNo, - useType: useType, - mgtOrgan: mgtOrgan}, + data: {useNo: useNo, + useType: useType, + mgtOrgan: mgtOrgan}, type: 'GET', dataType:"html", success: function(html){ @@ -103,10 +103,10 @@ function showMdifyModal(useNo,useType,mgtOrgan){ autoclose: true }); if($('#mDetailType').val() != 'PVREUSE007' && $('#mDetailType').val() != 'QIRUSE006'){ - $('#mDetailSelf').hide(); - }else{ - $('#mDetailSelf').show(); - } + $('#mDetailSelf').hide(); + }else{ + $('#mDetailSelf').show(); + } }, error:function(){ @@ -115,152 +115,152 @@ function showMdifyModal(useNo,useType,mgtOrgan){ } $(document).on('change', '#mDetailType', function (){ - if($(this).val() == 'PVREUSE007' || $(this).val() == 'QIRUSE006'){ - $('#mDetailSelf').show(); - }else{ - $('#mDetailSelf').hide(); - $('#mDetailSelf').val(''); - } + if($(this).val() == 'PVREUSE007' || $(this).val() == 'QIRUSE006'){ + $('#mDetailSelf').show(); + }else{ + $('#mDetailSelf').hide(); + $('#mDetailSelf').val(''); + } }); $(document).on('click', '#updateUse', function (){ - if(confirm("수정하시겠습니까?")){ - document.getElementById("mMgtOrgan").disabled = false; - contentFade("in"); - const formData = new FormData($("#useUpdateFm")[0]); - $.ajax({ - type : 'POST', - data : formData, - url : "/equip/updateUse", - processData: false, - contentType: false, - success : function(data) { - alert("수정되었습니다."); - contentFade("out"); - showMdifyModal(data.useNo,data.useType,data.mgtOrgan); - }, - error : function(xhr, status) { - alert("수정에 실패하였습니다.") - contentFade("out"); - } - }) - } + if(confirm("수정하시겠습니까?")){ + document.getElementById("mMgtOrgan").disabled = false; + contentFade("in"); + const formData = new FormData($("#useUpdateFm")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/equip/updateUse", + processData: false, + contentType: false, + success : function(data) { + alert("수정되었습니다."); + contentFade("out"); + showModifyModal(data.useNo,data.useType,data.mgtOrgan); + }, + error : function(xhr, status) { + alert("수정에 실패하였습니다.") + contentFade("out"); + } + }) + } }) $(document).on('click', '#historyBtn', function (){ - if($('input:checkbox[name=useChk]:checked').length < 1){ - alert("게시물을 선택해주세요") - return false; - } - if($('input:checkbox[name=useChk]:checked').length > 1){ - alert("한개만 선택해주세요") - return false; - } - const target = $('input:checkbox[name=useChk]:checked'); - const useNo = $(target).parent().parent('tr').data("useno"); - const useType = $(target).parent().parent('tr').data("usetype"); - const mgtOrgan = $(target).parent().parent('tr').data("mgtorgan"); - $.ajax({ - url: '/equip/useHistory', - data: {useNo: useNo, - useType: useType, - mgtOrgan: mgtOrgan}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#useEditModalContent").empty().append(html); - $("#useEditModal").modal('show'); - $('#vDetailSelf').hide(); - }, - error:function(){ - - } - }); -}) - -$(document).on('click', '.historyTr', function (event){ - const target = event.target; - $(this).find('.hisChk').prop('checked',true) - if($(this).find('.hisChk').prop('checked')){ - $('.hisChk').prop('checked',false); - $(this).find('.hisChk').prop('checked',true) - } - $.ajax({ - url: '/equip/HistoryView', - data: { - useNo: $(target).parents('tr').data("useno"), - versionNo : Number($(target).parents('tr').data("verno")), - useType : $(target).parents('tr').data("usetype"), - mgtOrgan : $(target).parents('tr').data("mgtorgan") - }, + if($('input:checkbox[name=useChk]:checked').length < 1){ + alert("게시물을 선택해주세요") + return false; + } + if($('input:checkbox[name=useChk]:checked').length > 1){ + alert("한개만 선택해주세요") + return false; + } + const target = $('input:checkbox[name=useChk]:checked'); + const useNo = $(target).parent().parent('tr').data("useno"); + const useType = $(target).parent().parent('tr').data("usetype"); + const mgtOrgan = $(target).parent().parent('tr').data("mgtorgan"); + $.ajax({ + url: '/equip/useHistory', + data: {useNo: useNo, + useType: useType, + mgtOrgan: mgtOrgan}, type: 'GET', - dataType:"json", - success: function(data){ - $('#vSosok').val(data.sosok); - $('#vUseDt').val(data.useDt); - $('#vDetailType').val(data.detailTypeName); - if(data.detailType != 'PVREUSE007' && data.detailType != 'QIRUSE006'){ - $('#vDetailSelf').hide(); - $('#vDetailSelf').val(''); - }else{ - $('#vDetailSelf').show(); - $('#vDetailSelf').val(data.detailSelf); - } - $('#vCnt').val(data.peopleCnt); - $('#vDescription').val(data.description); + dataType:"html", + success: function(html){ + $("#useEditModalContent").empty().append(html); + $("#useEditModal").modal('show'); + $('#vDetailSelf').hide(); }, error:function(){ } - }); + }); +}) + +$(document).on('click', '.historyTr', function (event){ + const target = event.target; + $(this).find('.hisChk').prop('checked',true) + if($(this).find('.hisChk').prop('checked')){ + $('.hisChk').prop('checked',false); + $(this).find('.hisChk').prop('checked',true) + } + $.ajax({ + url: '/equip/HistoryView', + data: { + useNo: $(target).parents('tr').data("useno"), + versionNo : Number($(target).parents('tr').data("verno")), + useType : $(target).parents('tr').data("usetype"), + mgtOrgan : $(target).parents('tr').data("mgtorgan") + }, + type: 'GET', + dataType:"json", + success: function(data){ + $('#vSosok').val(data.sosok); + $('#vUseDt').val(data.useDt); + $('#vDetailType').val(data.detailTypeName); + if(data.detailType != 'PVREUSE007' && data.detailType != 'QIRUSE006'){ + $('#vDetailSelf').hide(); + $('#vDetailSelf').val(''); + }else{ + $('#vDetailSelf').show(); + $('#vDetailSelf').val(data.detailSelf); + } + $('#vCnt').val(data.peopleCnt); + $('#vDescription').val(data.description); + }, + error:function(){ + + } + }); }) $(document).on('click', '#deleteUse', function (){ - if($('input:checkbox[name=useChk]:checked').length < 1){ - alert("삭제할 게시물을 선택해주세요") - return false; - } - if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ - const checkArr = []; - $('input:checkbox[name=useChk]:checked').each(function (idx, el){ - checkArr.push({}); - const target = $(el); - checkArr[idx].useNo = target.parents('tr').data("useno"); - checkArr[idx].mgtOrgan = target.parents('tr').data("mgtorgan"); - checkArr[idx].useType = target.parents('tr').data("usetype"); - }) - deleteUse(checkArr); - } + if($('input:checkbox[name=useChk]:checked').length < 1){ + alert("삭제할 게시물을 선택해주세요") + return false; + } + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + $('input:checkbox[name=useChk]:checked').each(function (idx, el){ + checkArr.push({}); + const target = $(el); + checkArr[idx].useNo = target.parents('tr').data("useno"); + checkArr[idx].mgtOrgan = target.parents('tr').data("mgtorgan"); + checkArr[idx].useType = target.parents('tr').data("usetype"); + }) + deleteUse(checkArr); + } }) function deleteUse(checkArr){ - $.ajax({ - type : 'POST', - url : "/equip/useDelete", - data : JSON.stringify(checkArr), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function() { - alert("삭제처리 되었습니다."); - location.reload(); - }, - error : function(xhr, status) { - alert("삭제처리에 실패하였습니다"); - } - }) + $.ajax({ + type : 'POST', + url : "/equip/useDelete", + data : JSON.stringify(checkArr), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function() { + alert("삭제처리 되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제처리에 실패하였습니다"); + } + }) } $(document).on('click', '#goExcel', function (){ - if(confirm("엑셀로 다운로드 하시겠습니까?")){ - $('input[name=excel]').val('Y'); - $('#searchFm').submit(); - $('input[name=excel]').val(''); - }else{ - false; - } + if(confirm("엑셀로 다운로드 하시겠습니까?")){ + $('input[name=excel]').val('Y'); + $('#searchFm').submit(); + $('input[name=excel]').val(''); + }else{ + false; + } }) $(document).ready( function() { @@ -270,5 +270,5 @@ $(document).ready( function() { }); $(document).on('click', '#closeModal', function (){ - location.reload(); + location.reload(); }) \ No newline at end of file diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html index bbefa2a1..b9aec63b 100644 --- a/src/main/resources/templates/equip/cellPhoneEditModal.html +++ b/src/main/resources/templates/equip/cellPhoneEditModal.html @@ -20,7 +20,7 @@ -
+
@@ -51,34 +51,34 @@
-
+
- +
-
+
- +
-
- +
+
- +
-
+
- +
-
+
- +
diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index 8c3ae7b2..a4d61e2e 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -117,14 +117,8 @@