diff --git a/src/main/java/com/dbnt/faisp/config/BaseService.java b/src/main/java/com/dbnt/faisp/config/BaseService.java index e36d5ac4..81f5a068 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseService.java +++ b/src/main/java/com/dbnt/faisp/config/BaseService.java @@ -14,6 +14,38 @@ public class BaseService { @Value("${spring.servlet.multipart.location}") protected String locationPath; + @Value("${file.dir.publicBoard}") + protected String publicBoardPath; + @Value("${file.dir.faRpt}") + protected String faRptPath; + @Value("${file.dir.vulnerable}") + protected String vulnerablePath; + @Value("${file.dir.part}") + protected String partPath; + @Value("${file.dir.equip}") + protected String equipPath; + @Value("${file.dir.sailor}") + protected String sailorPath; + @Value("${file.dir.affair}") + protected String affairPath; + @Value("${file.dir.affair.plan}") + protected String affairPlanPath; + @Value("${file.dir.affair.result}") + protected String affairResultPath; + @Value("${file.dir.editor}") + protected String editorPath; + @Value("${file.dir.sri}") + protected String sriPath; + @Value("${file.dir.ciw}") + protected String ciwPath; + @Value("${file.dir.cia.safty}") + protected String ciaSaftyPath; + @Value("${file.dir.cia.company}") + protected String ciaCompanyPath; + @Value("${file.dir.cia.foreigner}") + protected String ciaForeignerPath; + @Value("${file.dir.cia.edu}") + protected String ciaEduPath; protected String calculationSize(double fileSize){ String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"}; @@ -25,11 +57,11 @@ public class BaseService { } } - public void deleteStoredFile(File deleteFile){ + protected void deleteStoredFile(File deleteFile){ deleteFile.delete(); } - public void saveFile(MultipartFile file, File saveFile){ + protected void saveFile(MultipartFile file, File saveFile){ if(file.getSize()!=0){ // 저장될 파일 확인 if(!saveFile.exists()){ // 저장될 경로 확인 if(saveFile.getParentFile().mkdirs()){ diff --git a/src/main/java/com/dbnt/faisp/config/EditorController.java b/src/main/java/com/dbnt/faisp/config/EditorController.java index bf73f24e..11f8dcfc 100644 --- a/src/main/java/com/dbnt/faisp/config/EditorController.java +++ b/src/main/java/com/dbnt/faisp/config/EditorController.java @@ -35,17 +35,11 @@ import javax.servlet.http.HttpSession; @RestController @RequiredArgsConstructor -public class EditorController { +public class EditorController extends BaseService{ @Value("${site.domain}") protected String siteDomain; - @Value("${file.dir}") - protected String fileDir; - - @Value("${file.dir.editor}") - protected String editorPath; - @Value("${editor.img.view}") protected String imgView; @@ -71,7 +65,7 @@ public class EditorController { String extNm = attach_file_Name.substring( attach_file_Name.lastIndexOf( "." ) + 1); if("jpg,png,jpeg".contains(extNm.toLowerCase())) { - File dir = new File(fileDir+File.separator+editorPath); + File dir = new File(locationPath+editorPath); if (!dir.exists()) { try{ @@ -90,7 +84,7 @@ public class EditorController { System.out.println("Directory already exists"); } - File file = new File(fileDir+File.separator+editorPath, attach_save_Name +"."+ extNm); + File file = new File(locationPath+editorPath, attach_save_Name +"."+ extNm); FileCopyUtils.copy(mFile.getBytes(), file); InputStream is = new FileInputStream(file); BufferedImage input = ImageIO.read(is); diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index ae16c01e..7d6b0aeb 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -32,7 +32,7 @@ import java.nio.file.Paths; @RestController @RequiredArgsConstructor @RequestMapping("/file") -public class FileController { +public class FileController extends BaseService{ private final FaRptService faRptService; private final PlanService planService; @@ -43,17 +43,12 @@ public class FileController { private final FishingBoatService fishingBoatService; private final SriService sriService; - @Value("${file.dir}") - protected String fileDir; - @Value("${file.dir.editor}") - protected String editorPath; - @GetMapping("/editorFileDisplay") public ResponseEntity editorFileDisplay(HttpServletRequest request, HttpServletResponse response, String fileNm) { - String pathStr = fileDir+File.separator+editorPath+File.separator+fileNm; + String pathStr = locationPath+editorPath+File.separator+fileNm; Resource resource = new FileSystemResource(pathStr); if(!resource.exists()){ return new ResponseEntity<>(HttpStatus.NOT_FOUND); 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 7fe9baea..e0ec52b9 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -7,13 +7,12 @@ import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceServic import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; -import java.util.ArrayList; +import java.util.List; @RestController @RequiredArgsConstructor @@ -32,11 +31,13 @@ public class CounterIntelligenceController { mav.addObject("accessAuth", accessAuth); if(accessAuth.equals("ACC003")){ mav.addObject("downOrganCdList", loginUser.getDownOrganCdList()); + }else{ + ciWork.setWrtUserSeq(loginUser.getUserSeq()); } ciWork.setQueryInfo(); - mav.addObject("faRptList", new ArrayList()); - ciWork.setContentCnt(0); + mav.addObject("ciWorkList", ciService.selectCounterIntelligenceWorkList(ciWork)); + ciWork.setContentCnt(ciService.selectCounterIntelligenceWorkCnt(ciWork)); ciWork.setPaginationInfo(); mav.addObject("searchParams", ciWork); return mav; @@ -63,4 +64,18 @@ public class CounterIntelligenceController { mav.addObject("ciWork", ciWork); return mav; } + + @GetMapping("/ciWorkViewModal") + public ModelAndView ciWorkViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceWork ciWork){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciWorkViewModal"); + mav.addObject("ciWork", ciService.selectCounterIntelligenceWork(ciWork.getCiwKey())); + return mav; + } + @PostMapping("/saveCiWork") + public Integer saveCiWork(CounterIntelligenceWork ciWork, + MultipartHttpServletRequest request, + @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ + ciWork.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); + return ciService.saveCiWork(ciWork, deleteFileSeq); + } } 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 45ccad15..062983a5 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 @@ -1,5 +1,6 @@ package com.dbnt.faisp.main.counterIntelligence.mapper; +import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; import com.dbnt.faisp.main.faRpt.model.FaRptBoard; import org.apache.ibatis.annotations.Mapper; @@ -9,6 +10,9 @@ import java.util.List; @Mapper public interface CounterIntelligenceMapper { - String selectHashTags(Integer ciwKey); + List selectCounterIntelligenceWorkList(CounterIntelligenceWork ciWork); + Integer selectCounterIntelligenceWorkCnt(CounterIntelligenceWork ciWork); + + String selectHashTags(Integer ciwKey); } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceWork.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceWork.java index af0f13aa..f9c58b02 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceWork.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceWork.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.multipart.MultipartFile; import javax.persistence.*; @@ -30,12 +31,16 @@ public class CounterIntelligenceWork extends BaseModel { @Column(name = "work_rating") private String workRating; @Column(name = "work_start_date") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate workStartDate; @Column(name = "work_end_date") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate workEndDate; @Column(name = "re_rating_date1") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate reRatingDate1; @Column(name = "re_rating_date2") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate reRatingDate2; @Column(name = "arrest_type1") private String arrestType1; @@ -58,6 +63,7 @@ public class CounterIntelligenceWork extends BaseModel { @Column(name = "wrt_user_nm") private String wrtUserNm; @Column(name = "wrt_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; @Transient @@ -68,4 +74,6 @@ public class CounterIntelligenceWork extends BaseModel { private List fileList; @Transient private List multipartFileList; + @Transient + private List tagLinkList; } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/CiwFileRepository.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/CiwFileRepository.java index 20569d88..2a9de68b 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/CiwFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/CiwFileRepository.java @@ -9,6 +9,6 @@ import java.util.Optional; public interface CiwFileRepository extends JpaRepository { List findByCiwKey(Integer ciwKey); - Optional findTopByCiwKeyOrderByFileSeq(Integer ciwKey); + Optional findTopByCiwKeyOrderByFileSeqDesc(Integer ciwKey); } 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 3e652fc0..9937741e 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 @@ -1,21 +1,38 @@ package com.dbnt.faisp.main.counterIntelligence.service; +import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.main.counterIntelligence.mapper.CounterIntelligenceMapper; +import com.dbnt.faisp.main.counterIntelligence.model.CiwFile; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; +import com.dbnt.faisp.main.counterIntelligence.model.HashTagLinkCiw; import com.dbnt.faisp.main.counterIntelligence.repository.CiwFileRepository; import com.dbnt.faisp.main.counterIntelligence.repository.CounterIntelligenceWorkRepository; import com.dbnt.faisp.main.counterIntelligence.repository.HashTagLinkCiwRepository; +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 java.io.File; +import java.util.List; +import java.util.UUID; @Service @RequiredArgsConstructor -public class CounterIntelligenceService { - private final CounterIntelligenceMapper ciMapper; +public class CounterIntelligenceService extends BaseService { + private final HashTagService hashTagService; private final CounterIntelligenceWorkRepository ciwRepository; private final CiwFileRepository ciwFileRepository; private final HashTagLinkCiwRepository hashTagLinkCiwRepository; + private final CounterIntelligenceMapper ciMapper; + public List selectCounterIntelligenceWorkList(CounterIntelligenceWork ciWork){ + return ciMapper.selectCounterIntelligenceWorkList(ciWork); + } + public Integer selectCounterIntelligenceWorkCnt(CounterIntelligenceWork ciWork){ + return ciMapper.selectCounterIntelligenceWorkCnt(ciWork); + } public CounterIntelligenceWork selectCounterIntelligenceWork(Integer ciwKey) { CounterIntelligenceWork ciw = ciwRepository.findById(ciwKey).orElse(null); if(ciw!=null){ @@ -24,4 +41,62 @@ public class CounterIntelligenceService { } return ciw; } + + @Transactional + public Integer saveCiWork(CounterIntelligenceWork ciWork, List deleteFileSeq) { + Integer ciwKey = ciwRepository.save(ciWork).getCiwKey(); + if(!ciWork.getHashTags().isEmpty()){ + saveHashTagLink(ciwKey, ciWork.getHashTags().split(" ")); + } + if(deleteFileSeq != null && deleteFileSeq.size()>0){ + deleteCiWorkFile(ciwKey, deleteFileSeq); + } + if(ciWork.getMultipartFileList()!=null){ + saveUploadFiles(ciwKey, ciWork.getMultipartFileList()); + } + + return ciwKey; + } + + + private void saveHashTagLink(Integer ciwKey, String[] hashTagAry){ + hashTagLinkCiwRepository.deleteByCiwKey(ciwKey); + for(String tagNm : hashTagAry){ + HashTagLinkCiw hashTagLink = new HashTagLinkCiw(); + hashTagLink.setCiwKey(ciwKey); + hashTagLink.setTagKey(hashTagService.selectTagKey(tagNm)); + hashTagLinkCiwRepository.save(hashTagLink); + } + } + private void deleteCiWorkFile(Integer ciwKey, List deleteFileSeq) { + List ciwFileList = ciwFileRepository.findByCiwKey(ciwKey); + for(CiwFile file: ciwFileList){ + if(deleteFileSeq.contains(file.getFileSeq())){ + deleteStoredFile(new File(file.getSavePath(), file.getConvNm())); + ciwFileRepository.delete(file); + } + } + } + + private void saveUploadFiles(Integer ciwKey, List multipartFileList){ + CiwFile lastFileInfo = ciwFileRepository.findTopByCiwKeyOrderByFileSeqDesc(ciwKey).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("."); + CiwFile fileInfo = new CiwFile(); + fileInfo.setCiwKey(ciwKey); + 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); + ciwFileRepository.save(fileInfo); + } + } } 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 b9f8527a..52a9d15b 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 @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.equip.service; +import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.main.equip.mapper.EquipMapper; import com.dbnt.faisp.main.equip.model.CellPhone; import com.dbnt.faisp.main.equip.model.Equip; @@ -35,11 +36,7 @@ import java.util.*; @Service @RequiredArgsConstructor -public class EquipService { - @Value("${file.dir}") - protected String fileDir; - @Value("${file.dir.equip}") - protected String equ; +public class EquipService extends BaseService { private final EquipRepository equipRepository; private final EquipFileRepository equipFileRepository; @@ -83,7 +80,7 @@ public class EquipService { public void saveFile(Equip equip, MultipartHttpServletRequest mRequest) throws Exception { try { - String path = fileDir+equ; + String path = locationPath+equipPath; String FileSize; File dir = new File(path); if(!dir.exists()) dir.mkdir(); @@ -126,17 +123,6 @@ public class EquipService { } } - - 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 List selectEquipStatus(Equip equip) { return equipMapper.selectEquipStatus(equip); } @@ -192,7 +178,7 @@ public class EquipService { public void updateFile(Equip equip, Equip equipTmp, MultipartHttpServletRequest mRequest) throws Exception { try { - String path = fileDir+equ; + String path = locationPath+equipPath; String FileSize; File dir = new File(path); if(!dir.exists()) dir.mkdir(); diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java index 93f77003..04a302a7 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java @@ -105,7 +105,7 @@ public class FaRptService extends BaseService { int fileSeq = lastFile==null?1:(lastFile.getFileSeq()+1); for(MultipartFile file: multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"faRpt"; + String path = locationPath+faRptPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index 4d892126..980c8e3f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -211,9 +211,6 @@ public class FishingBoatService extends BaseService { return crackdownStatus; } - @Value("${file.dir.sailor}") - protected String sailorPath; - private void saveCaptainPhoto(Integer sailorKey, Integer versionNo, List fileList){ int fileSeq = 1; for(MultipartFile file : fileList){ diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index 57859734..ebd2a078 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -41,12 +41,6 @@ import java.util.*; @Service @RequiredArgsConstructor public class FipTargetService extends BaseService { - @Value("${file.dir}") - protected String fileDir; - @Value("${file.dir.vulnerable}") - protected String vulnerable; - @Value("${file.dir.part}") - protected String part; private final PartInfoRepository partInfoRepository; private final PartInfoFileRepository partInfoFileRepository; @@ -72,7 +66,7 @@ public class FipTargetService extends BaseService { saveUploadFiles(partInfo.getPiSeq(),partInfo.getVersionNo(), partInfo.getMultipartFileList()); } - private void saveUploadFiles(Integer piSeq,Integer versionNo, List multipartFileList) { + private void saveUploadFiles(Integer piSeq, Integer versionNo, List multipartFileList) { PartInfoFile lastFileInfo = partInfoFileRepository.findTopByPiSeqAndVersionNoOrderByFileSeqDesc(piSeq,versionNo); int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); if(multipartFileList == null || multipartFileList.isEmpty()) { @@ -87,7 +81,7 @@ public class FipTargetService extends BaseService { } else { for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = fileDir+part; + String path = locationPath+partPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); @@ -253,7 +247,7 @@ public class FipTargetService extends BaseService { int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = fileDir+part; + String path = locationPath+partPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); @@ -353,7 +347,7 @@ public class FipTargetService extends BaseService { int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = fileDir+vulnerable; + String path = locationPath+vulnerablePath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index 949f8f34..d8250003 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -22,6 +22,7 @@ import java.util.UUID; @Service @RequiredArgsConstructor public class AffairService extends BaseService { // 견문보고 + private final UserAlarmService userAlarmService; private final HashTagService hashTagService; private final AffairBoardRepository affairBoardRepository; @@ -99,7 +100,7 @@ public class AffairService extends BaseService { // 견문보고 int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"affair"; + String path = locationPath+affairPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java index 825569c2..ad078251 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java @@ -121,7 +121,7 @@ public class PlanService extends BaseService { // 월간계획 int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"monthPlan"; + String path = locationPath+affairPlanPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index 6cdf8570..c7e3b006 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -112,7 +112,7 @@ public class ResultService extends BaseService { // 월간계획 int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"affairResult"; + String path = locationPath+affairResultPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java index 42f2e30b..bf8823ce 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java @@ -35,11 +35,6 @@ public class SriService extends BaseService { private final SriFileRepository sriFileRepository; private final SriMapper sriMapper; - @Value("${file.dir}") - protected String fileDir; - @Value("${file.dir.sri}") - protected String sriDir; - public List selectSriList(Sri sri) { return sriMapper.selectSriList(sri); @@ -104,7 +99,7 @@ public class SriService extends BaseService { int fileSeq = lastFile==null?1:(lastFile.getFileSeq()+1); for(MultipartFile file: multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = fileDir+sriDir; + String path = locationPath+sriPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java index 8a46e7ae..a3f010d2 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java @@ -63,7 +63,7 @@ public class PublicBoardService extends BaseService { int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - String path = locationPath+File.separator+"publicFile"; + String path = locationPath+publicBoardPath; saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index c1b1614d..78cf95c0 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -9,14 +9,22 @@ spring.servlet.multipart.max-request-size=500MB site.domain=http://localhost:8080 #file -file.dir=C:\\faispUploadFiles +file.dir.publicBoard=/publicBoard +file.dir.faRpt=/faRpt file.dir.vulnerable=/vulnerable file.dir.part=/part file.dir.equip=/equip -file.dir.sailor=sailor -file.dir.affair=affair -file.dir.editor=editor +file.dir.sailor=/sailor +file.dir.affair=/affair +file.dir.affair.plan=/affairPlan +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.company=/cia/company +file.dir.cia.foreigner=/cia/foreigner +file.dir.cia.edu=/cia/edu editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 767b53e8..a374b82e 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -6,17 +6,25 @@ spring.servlet.multipart.location=/backup/faisp/uploadFiles spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=500MB -site.domain=10.187.58.15 +site.domain=10.187.58.12 #file -file.dir=/backup/faisp/uploadFiles +file.dir.publicBoard=/publicBoard +file.dir.faRpt=/faRpt file.dir.vulnerable=/vulnerable file.dir.part=/part file.dir.equip=/equip -file.dir.sailor=sailor -file.dir.affair=affair -file.dir.editor=editor +file.dir.sailor=/sailor +file.dir.affair=/affair +file.dir.affair.plan=/affairPlan +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.company=/cia/company +file.dir.cia.foreigner=/cia/foreigner +file.dir.cia.edu=/cia/edu editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 124978a9..83c77db7 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -8,14 +8,22 @@ spring.servlet.multipart.max-request-size=500MB site.domain=http://118.219.150.34:50580 #file -file.dir=/uploadFiles +file.dir.publicBoard=/publicBoard +file.dir.faRpt=/faRpt file.dir.vulnerable=/vulnerable file.dir.part=/part file.dir.equip=/equip -file.dir.sailor=sailor -file.dir.affair=affair -file.dir.editor=editor +file.dir.sailor=/sailor +file.dir.affair=/affair +file.dir.affair.plan=/affairPlan +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.company=/cia/company +file.dir.cia.foreigner=/cia/foreigner +file.dir.cia.edu=/cia/edu editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml index 53a51370..81fa5916 100644 --- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml +++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml @@ -4,7 +4,111 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + + and (a.wrt_user_seq = #{wrtUserSeq} and a.status = 'DST002') or a.status = 'DST007' + + + and a.work_rating = #{workRating} + + + and a.arrest_type1 = #{arrestType1} + + + and a.arrest_type2 = #{arrestType2} + + + and a.title like '%'||#{title}||'%' + + + and a.wrt_user_nm like '%'||#{wrtUserNm}||'%' + + + and a.wrt_organ = #{wrtOrgan} + + + and a.ciw_key in ( + select aa.ciw_key + from hash_tag_link_ciw aa + inner join hash_tag ab on aa.tag_key = ab.tag_key + where ab.tag_nm like '%'||#{hashTags}||'%' + ) + + + + and a.work_start_date >= #{startDate}::date + + + and a.work_start_date <= #{endDate}::date+1 + + + + + and a.work_end_date >= #{startDate}::date + + + and a.work_end_date <= #{endDate}::date+1 + + + + + and a.re_rating_date1 >= #{startDate}::date + + + and a.re_rating_date1 <= #{endDate}::date+1 + + + + + and a.re_rating_date2 >= #{startDate}::date + + + and a.re_rating_date2 <= #{endDate}::date+1 + + + + + and a.wrt_dt >= #{startDate}::date + + + and a.wrt_dt <= #{endDate}::date+1 + + + + + + -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
- - + +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
분류제목관서부서작성자작성일시첨부파일열람수
+ + + + + + + + +
+
+ + + + +
-
-
-
-
- -
-
- +
+
+
+ +
+
+ +
diff --git a/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html b/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html index ea68e6af..0b81b403 100644 --- a/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html +++ b/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html @@ -90,7 +90,7 @@
- +
@@ -128,6 +128,6 @@
- - + +
\ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index e708a1ba..4fda77d5 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -83,132 +83,128 @@
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
해경서육경서터미널명해경육경담당자임차료공공요금최종수정일
근무방법0명비고근무방법0명비고
무상무상
상주 0개소 0명비상주 0개소 0명폐쇄 0개소 0명상주 0개소 0명비상주 0개소 0명폐쇄 0개소 0명
-
-
-
-
- -
-
- -
-
- -
-
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
해경서육경서터미널명해경육경담당자임차료공공요금최종수정일
근무방법0명비고근무방법0명비고
무상무상
상주 0개소 0명비상주 0개소 0명폐쇄 0개소 0명상주 0개소 0명비상주 0개소 0명폐쇄 0개소 0명
+
+
+
+
+ +
+
+ +
+
+
diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html index dcabe269..60e4d2c8 100644 --- a/src/main/resources/templates/layout/layout.html +++ b/src/main/resources/templates/layout/layout.html @@ -57,9 +57,20 @@
+ + \ No newline at end of file