DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sri 패키지 위치 변경

master
강석 최 2023-02-28 09:42:56 +09:00
parent 9189c0426c
commit d42d215665
11 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/dbnt/faisp/config/FileController.java
View File

@ -9,12 +9,11 @@ import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService;
import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService;
import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService;
import com.dbnt.faisp.main.fpiMgt.monitoring.service.MonitoringService; import com.dbnt.faisp.main.fpiMgt.monitoring.service.MonitoringService;
import com.dbnt.faisp.main.fpiMgt.sri.service.SriService; import com.dbnt.faisp.main.faRpt.service.SriService;
import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService;
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService;
import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; import com.dbnt.faisp.main.publicBoard.service.PublicBoardService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -23,7 +22,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.util.FileCopyUtils; import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
@ -31,7 +29,6 @@ import java.net.URLEncoder;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;

8
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java → src/main/java/com/dbnt/faisp/main/faRpt/SriController.java
View File

@ -1,11 +1,11 @@
package com.dbnt.faisp.main.fpiMgt.sri; package com.dbnt.faisp.main.faRpt;
import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
import com.dbnt.faisp.main.faRpt.model.FaRptReadUser; import com.dbnt.faisp.main.faRpt.model.FaRptReadUser;
import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; import com.dbnt.faisp.main.faRpt.model.Sri;
import com.dbnt.faisp.main.fpiMgt.sri.model.SriReadUser; import com.dbnt.faisp.main.faRpt.model.SriReadUser;
import com.dbnt.faisp.main.fpiMgt.sri.service.SriService; import com.dbnt.faisp.main.faRpt.service.SriService;
import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.userInfo.model.UserInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.annotation.AuthenticationPrincipal;

4
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/mapper/SriMapper.java → src/main/java/com/dbnt/faisp/main/faRpt/mapper/SriMapper.java
View File

@ -1,6 +1,6 @@
package com.dbnt.faisp.main.fpiMgt.sri.mapper; package com.dbnt.faisp.main.faRpt.mapper;
import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; import com.dbnt.faisp.main.faRpt.model.Sri;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

3
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/Sri.java → src/main/java/com/dbnt/faisp/main/faRpt/model/Sri.java
View File

@ -1,4 +1,4 @@
package com.dbnt.faisp.main.fpiMgt.sri.model; package com.dbnt.faisp.main.faRpt.model;
import com.dbnt.faisp.config.BaseModel; import com.dbnt.faisp.config.BaseModel;
import lombok.Getter; import lombok.Getter;
@ -11,7 +11,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.persistence.*; import javax.persistence.*;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;

2
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriFile.java → src/main/java/com/dbnt/faisp/main/faRpt/model/SriFile.java
View File

@ -1,4 +1,4 @@
package com.dbnt.faisp.main.fpiMgt.sri.model; package com.dbnt.faisp.main.faRpt.model;
import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.config.FileInfo;
import lombok.*; import lombok.*;

2
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriReadUser.java → src/main/java/com/dbnt/faisp/main/faRpt/model/SriReadUser.java
View File

@ -1,4 +1,4 @@
package com.dbnt.faisp.main.fpiMgt.sri.model; package com.dbnt.faisp.main.faRpt.model;
import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.config.FileInfo;
import lombok.*; import lombok.*;

4
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriFileRepository.java → src/main/java/com/dbnt/faisp/main/faRpt/repository/SriFileRepository.java
View File

@ -1,8 +1,8 @@
package com.dbnt.faisp.main.fpiMgt.sri.repository; package com.dbnt.faisp.main.faRpt.repository;
import com.dbnt.faisp.main.fpiMgt.sri.model.SriFile; import com.dbnt.faisp.main.faRpt.model.SriFile;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

4
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriReadUserRepository.java → src/main/java/com/dbnt/faisp/main/faRpt/repository/SriReadUserRepository.java
View File

@ -1,6 +1,6 @@
package com.dbnt.faisp.main.fpiMgt.sri.repository; package com.dbnt.faisp.main.faRpt.repository;
import com.dbnt.faisp.main.fpiMgt.sri.model.SriReadUser; import com.dbnt.faisp.main.faRpt.model.SriReadUser;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

4
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriRepository.java → src/main/java/com/dbnt/faisp/main/faRpt/repository/SriRepository.java
View File

@ -1,7 +1,7 @@
package com.dbnt.faisp.main.fpiMgt.sri.repository; package com.dbnt.faisp.main.faRpt.repository;
import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; import com.dbnt.faisp.main.faRpt.model.Sri;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

17
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java → src/main/java/com/dbnt/faisp/main/faRpt/service/SriService.java
View File

@ -1,19 +1,18 @@
package com.dbnt.faisp.main.fpiMgt.sri.service; package com.dbnt.faisp.main.faRpt.service;
import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.BaseService;
import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.config.FileInfo;
import com.dbnt.faisp.main.fpiMgt.sri.mapper.SriMapper; import com.dbnt.faisp.main.faRpt.mapper.SriMapper;
import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; import com.dbnt.faisp.main.faRpt.model.Sri;
import com.dbnt.faisp.main.fpiMgt.sri.model.SriFile; import com.dbnt.faisp.main.faRpt.model.SriFile;
import com.dbnt.faisp.main.fpiMgt.sri.model.SriReadUser; import com.dbnt.faisp.main.faRpt.model.SriReadUser;
import com.dbnt.faisp.main.fpiMgt.sri.repository.SriFileRepository; import com.dbnt.faisp.main.faRpt.repository.SriFileRepository;
import com.dbnt.faisp.main.fpiMgt.sri.repository.SriReadUserRepository; import com.dbnt.faisp.main.faRpt.repository.SriReadUserRepository;
import com.dbnt.faisp.main.fpiMgt.sri.repository.SriRepository; import com.dbnt.faisp.main.faRpt.repository.SriRepository;
import com.dbnt.faisp.main.userInfo.model.UserAlarm; import com.dbnt.faisp.main.userInfo.model.UserAlarm;
import com.dbnt.faisp.main.userInfo.service.UserAlarmService; import com.dbnt.faisp.main.userInfo.service.UserAlarmService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;

2
src/main/resources/mybatisMapper/SriMapper.xml
View File

@ -3,7 +3,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dbnt.faisp.main.fpiMgt.sri.mapper.SriMapper"> <mapper namespace="com.dbnt.faisp.main.faRpt.mapper.SriMapper">
<sql id="selectSriWhere"> <sql id="selectSriWhere">
<where> <where>
<if test='activeTab == "send"'> <if test='activeTab == "send"'>