From 2fd4fb2d2e6330e7a548e6f927f3d4f8e4d1d892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 18 Apr 2023 12:01:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=98=EC=95=88=EC=88=98=EC=9A=94=20?= =?UTF-8?q?=EB=B6=84=EC=84=9D=EA=B2=B0=EA=B3=BC=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/BaseService.java | 4 +- .../CounterIntelligenceController.java | 246 ++++++-------- .../mapper/CounterIntelligenceMapper.java | 4 +- .../model/CounterIntelligenceActivity.java | 2 +- ...yDemandInfo.java => SafetyDemandInfo.java} | 4 +- .../SafetyDemandInfoRepository.java | 10 + .../repository/SaftyDemandInfoRepository.java | 13 - .../service/CounterIntelligenceService.java | 305 ++++++++++-------- src/main/resources/application-dev.properties | 2 +- .../resources/application-test1.properties | 2 +- .../resources/application-test2.properties | 2 +- .../resources/application-was1.properties | 2 +- .../resources/application-was2.properties | 2 +- .../CounterIntelligenceMapper.xml | 8 +- .../static/js/counterIntelligence/ciaEdu.js | 8 +- .../js/counterIntelligence/ciaForeigner.js | 8 +- .../counterIntelligence/ciaManageCompany.js | 8 +- .../{ciaSaftyDemand.js => ciaSafetyDemand.js} | 36 +-- ...dal.html => ciaSafetyDemandEditModal.html} | 6 +- ...mandList.html => ciaSafetyDemandList.html} | 12 +- ...dal.html => ciaSafetyDemandviewModal.html} | 12 +- 21 files changed, 333 insertions(+), 363 deletions(-) rename src/main/java/com/dbnt/faisp/main/counterIntelligence/model/{SaftyDemandInfo.java => SafetyDemandInfo.java} (88%) create mode 100644 src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SafetyDemandInfoRepository.java delete mode 100644 src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SaftyDemandInfoRepository.java rename src/main/resources/static/js/counterIntelligence/{ciaSaftyDemand.js => ciaSafetyDemand.js} (73%) rename src/main/resources/templates/counterIntelligence/{ciaSaftyDemandEditModal.html => ciaSafetyDemandEditModal.html} (93%) rename src/main/resources/templates/counterIntelligence/{ciaSaftyDemandList.html => ciaSafetyDemandList.html} (93%) rename src/main/resources/templates/counterIntelligence/{ciaSaftyDemandviewModal.html => ciaSafetyDemandviewModal.html} (87%) diff --git a/src/main/java/com/dbnt/faisp/config/BaseService.java b/src/main/java/com/dbnt/faisp/config/BaseService.java index 8921e465..dbbb0e9f 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseService.java +++ b/src/main/java/com/dbnt/faisp/config/BaseService.java @@ -38,8 +38,8 @@ public class BaseService { protected String sriPath; @Value("${file.dir.ciw}") protected String ciwPath; - @Value("${file.dir.cia.safty}") - protected String ciaSaftyPath; + @Value("${file.dir.cia.safety}") + protected String ciaSafetyPath; @Value("${file.dir.cia.company}") protected String ciaCompanyPath; @Value("${file.dir.cia.foreigner}") diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java index 7ac40d87..870db62b 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -4,8 +4,6 @@ import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.counterIntelligence.model.*; import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService; -import com.dbnt.faisp.main.equip.model.Equip; -import com.dbnt.faisp.main.equip.model.EquipFile; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -13,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletResponse; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -20,8 +19,6 @@ import java.io.InputStream; import java.time.LocalDateTime; import java.util.List; -import javax.servlet.http.HttpServletResponse; - @RestController @RequiredArgsConstructor @RequestMapping("/counterIntelligence") @@ -121,89 +118,55 @@ public class CounterIntelligenceController { mav.addObject("searchParams", ciWorkStatistics); return mav; } - - @GetMapping("/ciaSaftyDemandList") - public ModelAndView ciaSaftyDemandList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandList"); + + + + @PostMapping("/saveCiActivity") + public Integer saveCiActivity(CounterIntelligenceActivity cia,@AuthenticationPrincipal UserInfo loginUser, + MultipartHttpServletRequest request, + @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ + cia.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); + if(cia.getCiKey()==null){ + cia.setWrtOrgan(loginUser.getOgCd()); + cia.setWrtPart(loginUser.getOfcCd()); + cia.setWrtUserSeq(loginUser.getUserSeq()); + cia.setWrtUserGrd(loginUser.getTitleCd()); + cia.setWrtUserNm(loginUser.getUserNm()); + cia.setWrtDt(LocalDateTime.now()); + } + Integer ciKey = ciService.saveCiActivity(cia, deleteFileSeq); + + + return ciKey; + } + + + @GetMapping("/ciaSafetyDemandList") + public ModelAndView ciaSafetyDemandList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaSafetyDemandList"); String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaSaftyDemandList").get(0).getAccessAuth(); + (loginUser.getUserSeq(), "/counterIntelligence/ciaSafetyDemandList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - + cia.setDownOrganCdList(loginUser.getDownOrganCdList()); cia.setWrtUserSeq(loginUser.getUserSeq()); cia.setQueryInfo(); - mav.addObject("sdiList", ciService.selectCiaSaftyDemandList(cia)); - cia.setContentCnt(ciService.selectCiaSaftyDemandListCnt(cia)); + mav.addObject("sdiList", ciService.selectCiaSafetyDemandList(cia)); + cia.setContentCnt(ciService.selectCiaSafetyDemandListCnt(cia)); cia.setPaginationInfo(); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("loginUserSeq", loginUser.getUserSeq()); mav.addObject("searchParams", cia); return mav; } - - @GetMapping("/ciaSaftyDemandEditModal") - public ModelAndView ciaSaftyDemandEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandEditModal"); - if(cia.getCiKey() != null) { - cia = ciService.selectSaftyDemandInfo(cia); - }else{ - cia.setSaftyDemandInfo(new SaftyDemandInfo()); - } - mav.addObject("cia", cia); - return mav; - } - - @PostMapping("/saveCiActivity") - public Integer saveCiActivity(CounterIntelligenceActivity cia,@AuthenticationPrincipal UserInfo loginUser, - MultipartHttpServletRequest request, - @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ - cia.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); - if(cia.getCiKey()==null){ - cia.setWrtOrgan(loginUser.getOgCd()); - cia.setWrtPart(loginUser.getOfcCd()); - cia.setWrtUserSeq(loginUser.getUserSeq()); - cia.setWrtUserGrd(loginUser.getTitleCd()); - cia.setWrtUserNm(loginUser.getUserNm()); - cia.setWrtDt(LocalDateTime.now()); - } - Integer ciKey = ciService.saveCiActivity(cia, deleteFileSeq); - switch (cia.getCiType()) { - case "SDI": // 치안수요분석 - ciService.saveSaftyDemand(cia); - break; - case "MCI": // 해양산업보호관리업체 - ciService.saveManageCompany(cia); - break; - case "FI": // 외국인커뮤니티모니터링 - ciService.saveForeigner(cia); - break; - case "EI": // 방첩교육실시 - ciService.saveEdu(cia); - break; - } - - return ciKey; - } - - @GetMapping("/ciaSaftyDemandViewModal") - public ModelAndView ciaSaftyDemandViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandViewModal"); - String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaSaftyDemandList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); - mav.addObject("lineSeparator", '\n'); - mav.addObject("viewUserSeq", loginUser.getUserSeq()); - mav.addObject("cia", ciService.selectSaftyDemandInfo(cia)); - return mav; - } - + @GetMapping("/ciaManageCompanyList") public ModelAndView ciaManageCompanyList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyList"); String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaManageCompanyList").get(0).getAccessAuth(); + (loginUser.getUserSeq(), "/counterIntelligence/ciaManageCompanyList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - + cia.setWrtUserSeq(loginUser.getUserSeq()); cia.setDownOrganCdList(loginUser.getDownOrganCdList()); cia.setQueryInfo(); @@ -215,40 +178,16 @@ public class CounterIntelligenceController { mav.addObject("searchParams", cia); return mav; } - - @GetMapping("/ciaManageCompanyEditModal") - public ModelAndView ciaManageCompanyEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal"); - if(cia.getCiKey() != null) { - cia = ciService.selectManageCompanyInfo(cia); - }else{ - cia.setManageCompanyInfo(new ManageCompanyInfo()); - } - - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("cia", cia); - return mav; - } - - @GetMapping("/ciaManageCompanyViewModal") - public ModelAndView ciaManageCompanyViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyViewModal"); - String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaManageCompanyList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); - mav.addObject("lineSeparator", '\n'); - mav.addObject("viewUserSeq", loginUser.getUserSeq()); - mav.addObject("cia", ciService.selectManageCompanyInfo(cia)); - return mav; - } - + + + @GetMapping("/ciaForeignerList") public ModelAndView ciaForeignerList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerList"); String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaForeignerList").get(0).getAccessAuth(); + (loginUser.getUserSeq(), "/counterIntelligence/ciaForeignerList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - + cia.setWrtUserSeq(loginUser.getUserSeq()); cia.setDownOrganCdList(loginUser.getDownOrganCdList()); cia.setQueryInfo(); @@ -260,40 +199,15 @@ public class CounterIntelligenceController { mav.addObject("searchParams", cia); return mav; } - - @GetMapping("/ciaForeignerEditModal") - public ModelAndView ciaForeignerEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal"); - if(cia.getCiKey() != null) { - cia = ciService.selectForeignerInfo(cia); - }else{ - cia.setForeignerInfo(new ForeignerInfo()); - } - - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("cia", cia); - return mav; - } - - @GetMapping("/ciaForeignerViewModal") - public ModelAndView ciaForeignerViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerViewModal"); - String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaForeignerList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); - mav.addObject("lineSeparator", '\n'); - mav.addObject("viewUserSeq", loginUser.getUserSeq()); - mav.addObject("cia", ciService.selectForeignerInfo(cia)); - return mav; - } - + + @GetMapping("/ciaEduList") public ModelAndView ciaEduList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaEduList"); + ModelAndView mav = new ModelAndView("counterIntelligence/ciaEduList"); String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciaEduList").get(0).getAccessAuth(); + (loginUser.getUserSeq(), "/counterIntelligence/ciaEduList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - + cia.setWrtUserSeq(loginUser.getUserSeq()); cia.setDownOrganCdList(loginUser.getDownOrganCdList()); cia.setQueryInfo(); @@ -305,39 +219,69 @@ public class CounterIntelligenceController { mav.addObject("searchParams", cia); return mav; } - - @GetMapping("/ciaEduEditModal") - public ModelAndView ciaEduEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaEduEditModal"); - if(cia.getCiKey() != null) { - cia = ciService.selectEduInfo(cia); - }else{ - cia.setEduInfo(new EduInfo()); + + + @GetMapping("/ciaEditModal") + public ModelAndView ciaEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = null; + switch (cia.getCiType()){ + case "SDI": + mav = new ModelAndView("counterIntelligence/ciaSafetyDemandEditModal"); + break; + case "MCI": + mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal"); + break; + case "FI": + mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal"); + break; + case "EI": + mav = new ModelAndView("counterIntelligence/ciaEduEditModal"); + break; } - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("cia", cia); + mav.addObject("cia", ciService.selectCiaInfo(cia)); return mav; } - - @GetMapping("/ciaEduViewModal") - public ModelAndView ciaEduViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = new ModelAndView("counterIntelligence/ciaEduViewModal"); - String accessAuth = authMgtService.selectAccessConfigList + + @GetMapping("/ciaViewModal") + public ModelAndView ciaViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = null; + String accessAuth = null; + switch (cia.getCiType()){ + case "SDI": + mav = new ModelAndView("counterIntelligence/ciaSafetyDemandViewModal"); + accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/counterIntelligence/ciaSafetyDemandList").get(0).getAccessAuth(); + break; + case "MCI": + mav = new ModelAndView("counterIntelligence/ciaManageCompanyViewModal"); + accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/counterIntelligence/ciaManageCompanyList").get(0).getAccessAuth(); + break; + case "FI": + mav = new ModelAndView("counterIntelligence/ciaForeignerViewModal"); + accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/counterIntelligence/ciaForeignerList").get(0).getAccessAuth(); + break; + case "EI": + mav = new ModelAndView("counterIntelligence/ciaEduViewModal"); + accessAuth = authMgtService.selectAccessConfigList (loginUser.getUserSeq(), "/counterIntelligence/ciaEduList").get(0).getAccessAuth(); + break; + } mav.addObject("accessAuth", accessAuth); mav.addObject("lineSeparator", '\n'); mav.addObject("viewUserSeq", loginUser.getUserSeq()); - mav.addObject("cia", ciService.selectEduInfo(cia)); + mav.addObject("cia", ciService.selectCiaInfo(cia)); return mav; } - + @PostMapping("/deleteCounterIntelligenceActivity") public void deleteCounterIntelligenceActivity(@AuthenticationPrincipal UserInfo loginUser,@RequestBody CounterIntelligenceActivity cia){ - cia.setContentStatus("DST008"); - ciService.deleteCounterIntelligenceActivity(cia); + cia.setContentStatus("DST008"); + ciService.deleteCounterIntelligenceActivity(cia); } - + @GetMapping("/getCiaForeignerImg") public void getCiaForeignerImg(CiaFile cf , HttpServletResponse response) throws Exception { @@ -372,5 +316,5 @@ public class CounterIntelligenceController { if(in != null){ in.close(); } } } - + } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java index 0719c56c..51f29e91 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java @@ -23,9 +23,9 @@ public interface CounterIntelligenceMapper { List selectCiWorkYearList(); - List selectCiaSaftyDemandList(CounterIntelligenceActivity cia); + List selectCiaSafetyDemandList(CounterIntelligenceActivity cia); - Integer selectCiaSaftyDemandListCnt(CounterIntelligenceActivity cia); + Integer selectCiaSafetyDemandListCnt(CounterIntelligenceActivity cia); List selectCiaManageCompanyList(CounterIntelligenceActivity cia); diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java index f7cf945e..b3925cde 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java @@ -51,7 +51,7 @@ public class CounterIntelligenceActivity extends BaseModel { @Transient private Integer fileCnt; @Transient - private SaftyDemandInfo saftyDemandInfo; + private SafetyDemandInfo safetyDemandInfo; @Transient private ManageCompanyInfo manageCompanyInfo; @Transient diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SafetyDemandInfo.java similarity index 88% rename from src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java rename to src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SafetyDemandInfo.java index 362eb077..bc7076ae 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SafetyDemandInfo.java @@ -16,8 +16,8 @@ import javax.persistence.*; @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "safty_demand_info") -public class SaftyDemandInfo { +@Table(name = "safety_demand_info") +public class SafetyDemandInfo { @Id @Column(name = "ci_key") private Integer ciKey; diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SafetyDemandInfoRepository.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SafetyDemandInfoRepository.java new file mode 100644 index 00000000..440df4ac --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SafetyDemandInfoRepository.java @@ -0,0 +1,10 @@ +package com.dbnt.faisp.main.counterIntelligence.repository; + +import com.dbnt.faisp.main.counterIntelligence.model.SafetyDemandInfo; + +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface SafetyDemandInfoRepository extends JpaRepository { + +} diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SaftyDemandInfoRepository.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SaftyDemandInfoRepository.java deleted file mode 100644 index 5fa383a5..00000000 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/SaftyDemandInfoRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.dbnt.faisp.main.counterIntelligence.repository; - -import com.dbnt.faisp.main.counterIntelligence.model.SaftyDemandInfo; - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.Optional; - - -public interface SaftyDemandInfoRepository extends JpaRepository { - -} diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java index 670e2beb..14ae7549 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java @@ -12,7 +12,7 @@ import com.dbnt.faisp.main.counterIntelligence.model.EduInfo; import com.dbnt.faisp.main.counterIntelligence.model.ForeignerInfo; import com.dbnt.faisp.main.counterIntelligence.model.HashTagLinkCiw; import com.dbnt.faisp.main.counterIntelligence.model.ManageCompanyInfo; -import com.dbnt.faisp.main.counterIntelligence.model.SaftyDemandInfo; +import com.dbnt.faisp.main.counterIntelligence.model.SafetyDemandInfo; import com.dbnt.faisp.main.counterIntelligence.repository.CiaFileRepository; import com.dbnt.faisp.main.counterIntelligence.repository.CiwFileRepository; import com.dbnt.faisp.main.counterIntelligence.repository.CounterIntelligenceActivityRepository; @@ -21,13 +21,14 @@ import com.dbnt.faisp.main.counterIntelligence.repository.EduInfoRepository; import com.dbnt.faisp.main.counterIntelligence.repository.ForeignerInfoRepository; import com.dbnt.faisp.main.counterIntelligence.repository.HashTagLinkCiwRepository; import com.dbnt.faisp.main.counterIntelligence.repository.ManageCompanyInfoRepository; -import com.dbnt.faisp.main.counterIntelligence.repository.SaftyDemandInfoRepository; +import com.dbnt.faisp.main.counterIntelligence.repository.SafetyDemandInfoRepository; import com.dbnt.faisp.main.equip.model.EquipFile; import com.dbnt.faisp.main.hashTag.service.HashTagService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; import java.io.File; import java.util.List; @@ -42,7 +43,7 @@ public class CounterIntelligenceService extends BaseService { private final HashTagLinkCiwRepository hashTagLinkCiwRepository; private final CounterIntelligenceActivityRepository counterIntelligenceActivityRepository; private final CiaFileRepository ciaFileRepository; - private final SaftyDemandInfoRepository saftyDemandInfoRepository; + private final SafetyDemandInfoRepository safetyDemandInfoRepository; private final ManageCompanyInfoRepository manageCompanyInfoRepository; private final ForeignerInfoRepository foreignerInfoRepository; private final EduInfoRepository eduInfoRepository; @@ -148,180 +149,208 @@ public class CounterIntelligenceService extends BaseService { ciWorkStatisticsList.add(totalStatistics); return ciWorkStatisticsList; } - + @Transactional public Integer saveCiActivity(CounterIntelligenceActivity cia, List deleteFileSeq) { - Integer ciKey = counterIntelligenceActivityRepository.save(cia).getCiKey(); - if(deleteFileSeq != null && deleteFileSeq.size()>0){ - deleteCiaFile(ciKey, deleteFileSeq); - } - if(cia.getMultipartFileList()!=null){ - saveCiaUploadFiles(ciKey, cia.getMultipartFileList()); - } - return ciKey; + Integer ciKey = counterIntelligenceActivityRepository.save(cia).getCiKey(); + if(deleteFileSeq != null && deleteFileSeq.size()>0){ + deleteCiaFile(ciKey, deleteFileSeq); + } + if(cia.getMultipartFileList()!=null){ + saveCiaUploadFiles(ciKey, cia.getMultipartFileList()); + } + switch (cia.getCiType()) { + case "SDI": // 치안수요분석 + saveSafetyDemand(cia); + break; + case "MCI": // 해양산업보호관리업체 + saveManageCompany(cia); + break; + case "FI": // 외국인커뮤니티모니터링 + saveForeigner(cia); + break; + case "EI": // 방첩교육실시 + saveEdu(cia); + break; + } + return ciKey; } - + private void deleteCiaFile(Integer ciKey, List deleteFileSeq) { - List ciaFileList = ciaFileRepository.findByCiKey(ciKey); - for(CiaFile file: ciaFileList){ - if(deleteFileSeq.contains(file.getFileSeq())){ - deleteStoredFile(new File(file.getSavePath(), file.getConvNm())); - ciaFileRepository.delete(file); + List ciaFileList = ciaFileRepository.findByCiKey(ciKey); + for(CiaFile file: ciaFileList){ + if(deleteFileSeq.contains(file.getFileSeq())){ + deleteStoredFile(new File(file.getSavePath(), file.getConvNm())); + ciaFileRepository.delete(file); } } } - - private void saveCiaUploadFiles(Integer ciKey, List multipartFileList){ - CiaFile lastFileInfo = ciaFileRepository.findTopByCiKeyOrderByFileSeqDesc(ciKey).orElse(null); - int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); - for(MultipartFile file : multipartFileList){ - String saveName = UUID.randomUUID().toString(); - String path = locationPath+ciwPath; - saveFile(file, new File(path+File.separator+saveName)); - String originalFilename = file.getOriginalFilename(); - int extnIdx = originalFilename.lastIndexOf("."); - CiaFile fileInfo = new CiaFile(); - fileInfo.setCiKey(ciKey); - fileInfo.setFileSeq(fileSeq++); - fileInfo.setOrigNm(originalFilename.substring(0, extnIdx)); - fileInfo.setFileExtn(originalFilename.substring(extnIdx+1)); - fileInfo.setConvNm(saveName); - fileInfo.setFileSize(calculationSize(file.getSize())); - fileInfo.setSavePath(path); - ciaFileRepository.save(fileInfo); - } - } - + private void saveCiaUploadFiles(Integer ciKey, List multipartFileList){ + CiaFile lastFileInfo = ciaFileRepository.findTopByCiKeyOrderByFileSeqDesc(ciKey).orElse(null); + int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); + for(MultipartFile file : multipartFileList){ + String saveName = UUID.randomUUID().toString(); + String path = locationPath+ciwPath; + saveFile(file, new File(path+File.separator+saveName)); + + String originalFilename = file.getOriginalFilename(); + int extnIdx = originalFilename.lastIndexOf("."); + CiaFile fileInfo = new CiaFile(); + fileInfo.setCiKey(ciKey); + fileInfo.setFileSeq(fileSeq++); + fileInfo.setOrigNm(originalFilename.substring(0, extnIdx)); + fileInfo.setFileExtn(originalFilename.substring(extnIdx+1)); + fileInfo.setConvNm(saveName); + fileInfo.setFileSize(calculationSize(file.getSize())); + fileInfo.setSavePath(path); + ciaFileRepository.save(fileInfo); + } + } + @Transactional - public void saveSaftyDemand(CounterIntelligenceActivity cia) { - SaftyDemandInfo sdi = new SaftyDemandInfo(); - sdi.setCiKey(cia.getCiKey()); - sdi.setLocalInfo(cia.getLocalInfo()); - sdi.setOutlookProblem(cia.getOutlookProblem()); - saftyDemandInfoRepository.save(sdi); + public void saveSafetyDemand(CounterIntelligenceActivity cia) { + SafetyDemandInfo sdi = new SafetyDemandInfo(); + sdi.setCiKey(cia.getCiKey()); + sdi.setLocalInfo(cia.getLocalInfo()); + sdi.setOutlookProblem(cia.getOutlookProblem()); + safetyDemandInfoRepository.save(sdi); } - - public List selectCiaSaftyDemandList(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaSaftyDemandList(cia); + + public List selectCiaSafetyDemandList(CounterIntelligenceActivity cia) { + return ciMapper.selectCiaSafetyDemandList(cia); } - - public Integer selectCiaSaftyDemandListCnt(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaSaftyDemandListCnt(cia); + + public Integer selectCiaSafetyDemandListCnt(CounterIntelligenceActivity cia) { + return ciMapper.selectCiaSafetyDemandListCnt(cia); } - - public CounterIntelligenceActivity selectSaftyDemandInfo(CounterIntelligenceActivity cia) { - CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); - if(dbCia!=null){ - dbCia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); - dbCia.setSaftyDemandInfo(saftyDemandInfoRepository.findById(cia.getCiKey()).orElse(null)); - } - return dbCia; - } - + @Transactional public void saveManageCompany(CounterIntelligenceActivity cia) { - ManageCompanyInfo mci = new ManageCompanyInfo(); - mci.setCiKey(cia.getCiKey()); - mci.setMgtOrgan(cia.getMgtOrgan()); - mci.setCompanyNm(cia.getCompanyNm()); - mci.setCompanyLocation(cia.getCompanyLocation()); - mci.setRelatedField(cia.getRelatedField()); - mci.setDescription(cia.getDescription()); - mci.setCellPhone(cia.getCellPhone()); - mci.setDepartment(cia.getDepartment()); - mci.setName(cia.getName()); - manageCompanyInfoRepository.save(mci); + ManageCompanyInfo mci = new ManageCompanyInfo(); + mci.setCiKey(cia.getCiKey()); + mci.setMgtOrgan(cia.getMgtOrgan()); + mci.setCompanyNm(cia.getCompanyNm()); + mci.setCompanyLocation(cia.getCompanyLocation()); + mci.setRelatedField(cia.getRelatedField()); + mci.setDescription(cia.getDescription()); + mci.setCellPhone(cia.getCellPhone()); + mci.setDepartment(cia.getDepartment()); + mci.setName(cia.getName()); + manageCompanyInfoRepository.save(mci); } - + public List selectCiaManageCompanyList(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaManageCompanyList(cia); + return ciMapper.selectCiaManageCompanyList(cia); } - + public Integer selectCiaManageCompanyListCnt(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaManageCompanyListCnt(cia); + return ciMapper.selectCiaManageCompanyListCnt(cia); } - - public CounterIntelligenceActivity selectManageCompanyInfo(CounterIntelligenceActivity cia) { - CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); - if(dbCia!=null){ - dbCia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); - dbCia.setManageCompanyInfo(manageCompanyInfoRepository.findById(cia.getCiKey()).orElse(null)); - } - return dbCia; - } - + @Transactional public void saveForeigner(CounterIntelligenceActivity cia) { - ForeignerInfo fi = new ForeignerInfo(); - fi.setCiKey(cia.getCiKey()); - fi.setMgtOrgan(cia.getMgtOrgan()); - fi.setManager(cia.getManager()); - fi.setCommuLocation(cia.getCommuLocation()); - fi.setCommuNational(cia.getCommuNational()); - fi.setCommuAddress(cia.getCommuAddress()); - fi.setSelectReason(cia.getSelectReason()); - fi.setMonitoringInfo(cia.getMonitoringInfo()); - fi.setFixDate(cia.getFixDate()); - foreignerInfoRepository.save(fi); + ForeignerInfo fi = new ForeignerInfo(); + fi.setCiKey(cia.getCiKey()); + fi.setMgtOrgan(cia.getMgtOrgan()); + fi.setManager(cia.getManager()); + fi.setCommuLocation(cia.getCommuLocation()); + fi.setCommuNational(cia.getCommuNational()); + fi.setCommuAddress(cia.getCommuAddress()); + fi.setSelectReason(cia.getSelectReason()); + fi.setMonitoringInfo(cia.getMonitoringInfo()); + fi.setFixDate(cia.getFixDate()); + foreignerInfoRepository.save(fi); } - + public List selectCiaForeignerList(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaForeignerList(cia); + return ciMapper.selectCiaForeignerList(cia); } - + public Integer selectCiaForeignerListCnt(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaForeignerListCnt(cia); + return ciMapper.selectCiaForeignerListCnt(cia); } - - public CounterIntelligenceActivity selectForeignerInfo(CounterIntelligenceActivity cia) { - CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); - if(dbCia!=null){ - dbCia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); - dbCia.setForeignerInfo(foreignerInfoRepository.findById(cia.getCiKey()).orElse(null)); - } - return dbCia; - } - + @Transactional public void saveEdu(CounterIntelligenceActivity cia) { - EduInfo ei = new EduInfo(); - ei.setCiKey(cia.getCiKey()); - ei.setMgtOrgan(cia.getMgtOrgan()); - ei.setEduType(cia.getEduType()); - ei.setEduDate(cia.getEduDate()); - ei.setPeopleCnt(cia.getPeopleCnt()); - ei.setDescription(cia.getDescription()); - eduInfoRepository.save(ei); + EduInfo ei = new EduInfo(); + ei.setCiKey(cia.getCiKey()); + ei.setMgtOrgan(cia.getMgtOrgan()); + ei.setEduType(cia.getEduType()); + ei.setEduDate(cia.getEduDate()); + ei.setPeopleCnt(cia.getPeopleCnt()); + ei.setDescription(cia.getDescription()); + eduInfoRepository.save(ei); } - + public List selectCiaEduList(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaEduList(cia); + return ciMapper.selectCiaEduList(cia); } - + public Integer selectCiaEduListCnt(CounterIntelligenceActivity cia) { - return ciMapper.selectCiaEduListCnt(cia); + return ciMapper.selectCiaEduListCnt(cia); } - + public CounterIntelligenceActivity selectEduInfo(CounterIntelligenceActivity cia) { - CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); - if(dbCia!=null){ - dbCia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); - dbCia.setEduInfo(eduInfoRepository.findById(cia.getCiKey()).orElse(null)); - } - return dbCia; + CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); + if(dbCia!=null){ + dbCia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); + dbCia.setEduInfo(eduInfoRepository.findById(cia.getCiKey()).orElse(null)); + } + return dbCia; } - + public CiaFile selectCiaForeignerFile(Integer ciKey,Integer fileSeq) { - return ciaFileRepository.findByCiKeyAndFileSeq(ciKey,fileSeq); + return ciaFileRepository.findByCiKeyAndFileSeq(ciKey,fileSeq); } - + @Transactional public void deleteCounterIntelligenceActivity(CounterIntelligenceActivity cia) { - CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); - dbCia.setContentStatus(cia.getContentStatus()); - counterIntelligenceActivityRepository.save(dbCia); + CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); + dbCia.setContentStatus(cia.getContentStatus()); + counterIntelligenceActivityRepository.save(dbCia); } - + + public CounterIntelligenceActivity selectCiaInfo(CounterIntelligenceActivity cia) { + switch (cia.getCiType()){ + case "SDI": + if(cia.getCiKey() != null){ + cia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(new CounterIntelligenceActivity()); + cia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); + cia.setSafetyDemandInfo(safetyDemandInfoRepository.findById(cia.getCiKey()).orElse(new SafetyDemandInfo())); + }else{ + cia.setSafetyDemandInfo(new SafetyDemandInfo()); + } + break; + case "MCI": + if(cia.getCiKey() != null){ + cia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(new CounterIntelligenceActivity()); + cia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); + cia.setManageCompanyInfo(manageCompanyInfoRepository.findById(cia.getCiKey()).orElse(new ManageCompanyInfo())); + }else{ + cia.setManageCompanyInfo(new ManageCompanyInfo()); + } + break; + case "FI": + if(cia.getCiKey() != null){ + cia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(new CounterIntelligenceActivity()); + cia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); + cia.setForeignerInfo(foreignerInfoRepository.findById(cia.getCiKey()).orElse(new ForeignerInfo())); + }else{ + cia.setForeignerInfo(new ForeignerInfo()); + } + break; + case "EI": + if(cia.getCiKey() != null){ + cia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(new CounterIntelligenceActivity()); + cia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); + cia.setEduInfo(eduInfoRepository.findById(cia.getCiKey()).orElse(new EduInfo())); + }else{ + cia.setEduInfo(new EduInfo()); + } + break; + } + return cia; + } } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 6ba53c5f..490b22b0 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -26,7 +26,7 @@ file.dir.affair.result=/affairResult file.dir.editor=/editor file.dir.sri=/sri file.dir.ciw=/ciw -file.dir.cia.safty=/cia/safty +file.dir.cia.safety=/cia/safety file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu diff --git a/src/main/resources/application-test1.properties b/src/main/resources/application-test1.properties index 2ab61b1d..4e7e9c0a 100644 --- a/src/main/resources/application-test1.properties +++ b/src/main/resources/application-test1.properties @@ -37,7 +37,7 @@ file.dir.affair.result=/affairResult file.dir.editor=/editor file.dir.sri=/sri file.dir.ciw=/ciw -file.dir.cia.safty=/cia/safty +file.dir.cia.safety=/cia/safety file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu diff --git a/src/main/resources/application-test2.properties b/src/main/resources/application-test2.properties index 1c1ecc4a..ad0174b7 100644 --- a/src/main/resources/application-test2.properties +++ b/src/main/resources/application-test2.properties @@ -37,7 +37,7 @@ file.dir.affair.result=/affairResult file.dir.editor=/editor file.dir.sri=/sri file.dir.ciw=/ciw -file.dir.cia.safty=/cia/safty +file.dir.cia.safety=/cia/safety file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu diff --git a/src/main/resources/application-was1.properties b/src/main/resources/application-was1.properties index 8219df28..7c55f44d 100644 --- a/src/main/resources/application-was1.properties +++ b/src/main/resources/application-was1.properties @@ -33,7 +33,7 @@ file.dir.affair.result=/affairResult file.dir.editor=/editor file.dir.sri=/sri file.dir.ciw=/ciw -file.dir.cia.safty=/cia/safty +file.dir.cia.safety=/cia/safety file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu diff --git a/src/main/resources/application-was2.properties b/src/main/resources/application-was2.properties index d86d3bc3..38c344b6 100644 --- a/src/main/resources/application-was2.properties +++ b/src/main/resources/application-was2.properties @@ -33,7 +33,7 @@ file.dir.affair.result=/affairResult file.dir.editor=/editor file.dir.sri=/sri file.dir.ciw=/ciw -file.dir.cia.safty=/cia/safty +file.dir.cia.safety=/cia/safety file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml index b6e0adf1..2670df41 100644 --- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml +++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml @@ -148,7 +148,7 @@ - select cia.ci_key, (select item_value from code_mgt where item_cd = cia.content_status) as content_status, cia.ci_type, @@ -160,7 +160,7 @@ cia.wrt_user_nm, cia.wrt_dt from counter_intelligence_activity cia, - safty_demand_info sdi + safety_demand_info sdi where cia.ci_key = sdi.ci_key and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') @@ -184,7 +184,7 @@ LIMIT #{rowCnt} OFFSET #{firstIndex} - select count(*) from( select cia.ci_key, @@ -198,7 +198,7 @@ cia.wrt_user_nm, cia.wrt_dt from counter_intelligence_activity cia, - safty_demand_info sdi + safety_demand_info sdi where cia.ci_key = sdi.ci_key and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') diff --git a/src/main/resources/static/js/counterIntelligence/ciaEdu.js b/src/main/resources/static/js/counterIntelligence/ciaEdu.js index 960f2ef1..6af0b834 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaEdu.js +++ b/src/main/resources/static/js/counterIntelligence/ciaEdu.js @@ -12,8 +12,8 @@ $(document).on('click', '#addBtn', function (){ function getCiaEduEditModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaEduEditModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaEditModal', + data: {ciKey: ciKey, ciType: "EI"}, type: 'GET', dataType:"html", success: function(html){ @@ -78,8 +78,8 @@ $(document).on('click', '.eiTr', function (){ function getCiaEduViewModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaEduViewModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaViewModal', + data: {ciKey: ciKey, ciType: "EI"}, type: 'GET', dataType:"html", success: function(html){ diff --git a/src/main/resources/static/js/counterIntelligence/ciaForeigner.js b/src/main/resources/static/js/counterIntelligence/ciaForeigner.js index 1d9f4bbe..590f9c07 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaForeigner.js +++ b/src/main/resources/static/js/counterIntelligence/ciaForeigner.js @@ -12,8 +12,8 @@ $(document).on('click', '#addBtn', function (){ function getCiaForeignerEditModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaForeignerEditModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaEditModal', + data: {ciKey: ciKey, ciType: "FI"}, type: 'GET', dataType:"html", success: function(html){ @@ -81,8 +81,8 @@ $(document).on('click', '.fiTr', function (){ function getCiaForeignerViewModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaForeignerViewModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaViewModal', + data: {ciKey: ciKey, ciType: "FI"}, type: 'GET', dataType:"html", success: function(html){ diff --git a/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js b/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js index a73c5621..abcc7444 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js +++ b/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js @@ -12,8 +12,8 @@ $(document).on('click', '#addBtn', function (){ function getCiaManageCompanyEditModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaManageCompanyEditModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaEditModal', + data: {ciKey: ciKey, ciType: "MCI"}, type: 'GET', dataType:"html", success: function(html){ @@ -73,8 +73,8 @@ $(document).on('click', '.mciTr', function (){ function getCiaManageCompanyViewModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaManageCompanyViewModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaViewModal', + data: {ciKey: ciKey, ciType: "MCI"}, type: 'GET', dataType:"html", success: function(html){ diff --git a/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js b/src/main/resources/static/js/counterIntelligence/ciaSafetyDemand.js similarity index 73% rename from src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js rename to src/main/resources/static/js/counterIntelligence/ciaSafetyDemand.js index 7f3d78a6..fe6ac82f 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js +++ b/src/main/resources/static/js/counterIntelligence/ciaSafetyDemand.js @@ -7,19 +7,19 @@ $(function(){ }) $(document).on('click', '#addBtn', function (){ - getCiaSaftyDemandEditModal(null); + getCiaSafetyDemandEditModal(null); }) -function getCiaSaftyDemandEditModal(ciKey){ +function getCiaSafetyDemandEditModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaSaftyDemandEditModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaEditModal', + data: {ciKey: ciKey, ciType: "SDI"}, type: 'GET', dataType:"html", success: function(html){ - $("#ciaSaftyDemandEditModalContent").empty().append(html) + $("#ciaSafetyDemandEditModalContent").empty().append(html) setUploadDiv(); - $("#ciaSaftyDemandEditModal").modal('show'); + $("#ciaSafetyDemandEditModal").modal('show'); }, error:function(e){ ajaxErrorAction(e); @@ -29,18 +29,18 @@ function getCiaSaftyDemandEditModal(ciKey){ $(document).on('click', '#saveBtn', function (){ if(confirm("저장하시겠습니까?")){ - save('DST007'); + saveCia('DST007'); } }) $(document).on('click', '#saveTempBtn', function (){ if(confirm("임시저장 하시겠습니까?")){ - save('DST001'); + saveCia('DST001'); } }) -function save(contentStatus){ - const formData = new FormData($("#ciaSaftyDemandEditForm")[0]); +function saveCia(contentStatus){ + const formData = new FormData($("#ciaSafetyDemandEditForm")[0]); for(const file of files) { if(!file.isDelete) formData.append('uploadFiles', file, file.name); @@ -90,18 +90,18 @@ $(document).on('click', '#deleteBtn', function (){ }) $(document).on('click', '.sdiTr', function (){ - getCiaSaftyDemandViewModal($(this).find(".ciKey").val()); + getCiaSafetyDemandViewModal($(this).find(".ciKey").val()); }) -function getCiaSaftyDemandViewModal(ciKey){ +function getCiaSafetyDemandViewModal(ciKey){ $.ajax({ - url: '/counterIntelligence/ciaSaftyDemandViewModal', - data: {ciKey: ciKey}, + url: '/counterIntelligence/ciaViewModal', + data: {ciKey: ciKey, ciType: "SDI"}, type: 'GET', dataType:"html", success: function(html){ - $("#ciaSaftyDemandViewModalBody").empty().append(html) - $("#ciaSaftyDemandViewModal").modal('show'); + $("#ciaSafetyDemandViewModalBody").empty().append(html) + $("#ciaSafetyDemandViewModal").modal('show'); }, error:function(e){ ajaxErrorAction(e); @@ -110,8 +110,8 @@ function getCiaSaftyDemandViewModal(ciKey){ } $(document).on('click', '#editBtn', function (){ - $("#ciaSaftyDemandViewModal").modal('hide'); - getCiaSaftyDemandEditModal($(this).attr("data-cikey")); + $("#ciaSafetyDemandViewModal").modal('hide'); + getCiaSafetyDemandEditModal($(this).attr("data-cikey")); }) $(document).on('click', '#excelDown', function (){ diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandEditModal.html similarity index 93% rename from src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html rename to src/main/resources/templates/counterIntelligence/ciaSafetyDemandEditModal.html index 019488db..21ddd41f 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html +++ b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandEditModal.html @@ -5,7 +5,7 @@
-
+ @@ -29,13 +29,13 @@
- +
- +
diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html similarity index 93% rename from src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html rename to src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html index f2c38984..e7c0b69c 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html +++ b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandList.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +
@@ -23,7 +23,7 @@
- +
@@ -142,16 +142,16 @@
-