Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

# Conflicts:
#	src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java
#	src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java

build.gradle

@@ -28,13 +28,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web:2.7.2'
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.7.2'
+
     implementation 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16'
+    runtimeOnly 'org.postgresql:postgresql:42.3.6'
+    implementation 'com.oracle.database.jdbc:ojdbc8:21.7.0.0'
+
+
     //엑셀다운
     implementation 'org.apache.poi:poi:4.1.0'
     implementation 'org.apache.poi:poi-ooxml:4.1.0'
 
-    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.7.2'
-    runtimeOnly 'org.postgresql:postgresql:42.3.6'
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:2.7.2'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
 }

src/main/java/com/dbnt/faisp/config/BaseController.java

@@ -1,11 +1,11 @@
 package com.dbnt.faisp.config;
 
-import com.dbnt.faisp.menuMgt.service.MenuMgtService;
+import com.dbnt.faisp.main.menuMgt.service.MenuMgtService;
-import com.dbnt.faisp.organMgt.service.OrganConfigService;
+import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
 
-import com.dbnt.faisp.userInfo.service.UserInfoService;
+import com.dbnt.faisp.main.userInfo.service.UserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +39,7 @@ public class BaseController {
     ModelAndView mav = new ModelAndView("login/login");
     mav.addObject("OgList", codeMgtService.selectCodeMgtList("OG"));
     mav.addObject("OfcList", codeMgtService.selectCodeMgtList("OFC"));
+    mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
     return mav;
   }
 
@@ -47,6 +48,7 @@ public class BaseController {
     ModelAndView mav = new ModelAndView("login/login");
     mav.addObject("OgList", codeMgtService.selectCodeMgtList("OG"));
     mav.addObject("OfcList", codeMgtService.selectCodeMgtList("OFC"));
+    mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
     mav.addObject("loginError", true);
     return mav;
   }

src/main/java/com/dbnt/faisp/config/FileController.java

@@ -1,11 +1,11 @@
 package com.dbnt.faisp.config;
 
-import com.dbnt.faisp.faRpt.service.FaRptService;
+import com.dbnt.faisp.main.faRpt.service.FaRptService;
-import com.dbnt.faisp.fpiMgt.affair.service.AffairService;
+import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService;
-import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService;
-import com.dbnt.faisp.fpiMgt.affairResult.service.ResultService;
+import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService;
-import com.dbnt.faisp.ivsgtMgt.boardInvestigation.service.BoardInvestigationService;
+import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService;
-import com.dbnt.faisp.publicBoard.service.PublicBoardService;
+import com.dbnt.faisp.main.publicBoard.service.PublicBoardService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java

@@ -0,0 +1,59 @@
+package com.dbnt.faisp.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+
+@Configuration
+@EnableJpaRepositories(
+    basePackages = "com.dbnt.faisp.kwms.repository",
+    entityManagerFactoryRef = "kwmsEntityManager",
+    transactionManagerRef = "kwmsTransactionManager"
+)
+public class KwmsDatabaseConfig {
+  @Autowired
+  private Environment env;
+
+  @Bean
+  public LocalContainerEntityManagerFactoryBean kwmsEntityManager(){
+    LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+    em.setDataSource(kwmsDataSource());
+
+    //Entity 패키지 경로
+    em.setPackagesToScan(new String[] { "com.dbnt.faisp.kwms.model" });
+
+    HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+    em.setJpaVendorAdapter(vendorAdapter);
+
+    //Hibernate 설정
+    HashMap<String, Object> properties = new HashMap<>();
+    properties.put("hibernate.hbm2ddl.auto", "none");
+    properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
+    em.setJpaPropertyMap(properties);
+    return em;
+  }
+
+  @Bean
+  @ConfigurationProperties(prefix="spring.datasource-kwms")
+  public DataSource kwmsDataSource() {
+    return DataSourceBuilder.create().build();
+  }
+
+  @Bean
+  public PlatformTransactionManager kwmsTransactionManager() {
+    JpaTransactionManager transactionManager = new JpaTransactionManager();
+    transactionManager.setEntityManagerFactory(kwmsEntityManager().getObject());
+    return transactionManager;
+  }
+}

src/main/java/com/dbnt/faisp/config/MainDatabaseConfig.java

@@ -0,0 +1,64 @@
+package com.dbnt.faisp.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+
+@Configuration
+@EnableJpaRepositories(
+    basePackages = "com.dbnt.faisp.main.**.repository",
+    entityManagerFactoryRef = "masterEntityManager",
+    transactionManagerRef = "masterTransactionManager"
+)
+public class MainDatabaseConfig {
+  @Autowired
+  private Environment env;
+
+  @Bean
+  @Primary
+  public LocalContainerEntityManagerFactoryBean masterEntityManager(){
+    LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+    em.setDataSource(masterDataSource());
+
+    //Entity 패키지 경로
+    em.setPackagesToScan(new String[] { "com.dbnt.faisp.main.**.model" });
+
+    HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+    em.setJpaVendorAdapter(vendorAdapter);
+
+    //Hibernate 설정
+    HashMap<String, Object> properties = new HashMap<>();
+    properties.put("hibernate.hbm2ddl.auto", "none");
+    properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
+    em.setJpaPropertyMap(properties);
+    return em;
+  }
+
+  @Primary
+  @Bean
+  @ConfigurationProperties(prefix="spring.datasource-main")
+  public DataSource masterDataSource() {
+    return DataSourceBuilder.create().build();
+  }
+
+  @Primary
+  @Bean
+  public PlatformTransactionManager masterTransactionManager() {
+    JpaTransactionManager transactionManager = new JpaTransactionManager();
+    transactionManager.setEntityManagerFactory(masterEntityManager().getObject());
+    return transactionManager;
+  }
+}

src/main/java/com/dbnt/faisp/config/ModalController.java

@@ -1,10 +1,10 @@
 package com.dbnt.faisp.config;
 
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
-import com.dbnt.faisp.menuMgt.model.MenuMgt;
+import com.dbnt.faisp.main.menuMgt.model.MenuMgt;
-import com.dbnt.faisp.menuMgt.service.MenuMgtService;
+import com.dbnt.faisp.main.menuMgt.service.MenuMgtService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
-import com.dbnt.faisp.userInfo.service.UserInfoService;
+import com.dbnt.faisp.main.userInfo.service.UserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/dbnt/faisp/config/SecurityConfig.java

@@ -1,6 +1,6 @@
 package com.dbnt.faisp.config;
 
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,7 +8,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -34,11 +33,6 @@ public class SecurityConfig{
     return new Pbkdf2PasswordEncoder();
   }
 
-  @Bean
-  public WebSecurityCustomizer webSecurityCustomizer() {
-    return (web) -> web.ignoring().antMatchers("/css/**", "/img/**", "/js/**", "/vendor/**");
-  }
-
   @Bean
   public AccessDeniedHandler accessDeniedHandler() {
     log.warn("accessDeniedHandler");
@@ -101,7 +95,13 @@ public class SecurityConfig{
               "/codeMgt/**",
               "/menuMgt/**"
           ).hasRole(Role.ADMIN.name()) // ADMIN 접근 허용
-          .antMatchers("/login").permitAll() // 로그인 페이지는 권한 없이 접근 허용
+          .antMatchers(
+              "/login",
+              "/css/**",
+              "/img/**",
+              "/js/**",
+              "/vendor/**"
+          ).permitAll() // 로그인 페이지는 권한 없이 접근 허용
         .and() // 로그인 설정
           .formLogin().loginPage("/login") // Custom login form 사용
           .failureUrl("/login-error") // 로그인 실패 시 이동

src/main/java/com/dbnt/faisp/kwms/KwmsController.java

@@ -0,0 +1,21 @@
+package com.dbnt.faisp.kwms;
+
+import com.dbnt.faisp.kwms.model.VEmployee;
+import com.dbnt.faisp.kwms.service.KwmsService;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/kwms")
+public class KwmsController {
+  private final KwmsService kwmsService;
+
+  @GetMapping("/getEmpInfo")
+  public UserInfo getEmpInfo(VEmployee empInfo){
+    return kwmsService.selectEmpInfo(empInfo.getDicCode());
+  }
+}

src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java

@@ -0,0 +1,44 @@
+package com.dbnt.faisp.kwms.model;
+
+import com.dbnt.faisp.config.BaseModel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "V_EMPLOYEE")
+public class VEmployee extends BaseModel{
+  @Id
+  @Column(name = "DIC_CODE")
+  private String dicCode;
+  @Column(name = "EMP_NM")
+  private String empNm;
+  @Column(name = "BIRTH_DATE")
+  private String birthDate;
+  @Column(name = "SEX")
+  private String sex;
+  @Column(name = "POLICE_BMNG_IL")
+  private String policeBmngIl;
+  @Column(name = "JIKGEUP")
+  private String jikgeup;
+  @Column(name = "HN_JIKGEUP_IMYNGIL")
+  private String hnJikgeupImyngil;
+  @Column(name = "CALL_BUSEO_NM")
+  private String callBuseoNm;
+  @Column(name = "SAYONG_YN")
+  private String sayongYn;
+  @Column(name = "GYUNGGWA")
+  private String gyunggwa;
+  @Column(name = "JIKBYUL")
+  private String jikbyul;
+
+}

src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java

@@ -0,0 +1,12 @@
+package com.dbnt.faisp.kwms.repository;
+
+import com.dbnt.faisp.kwms.model.VEmployee;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+
+public interface VEmployeeRepository extends JpaRepository<VEmployee, String> {
+
+  Optional<VEmployee> findByDicCode(String dicCode);
+}

src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java

@@ -0,0 +1,40 @@
+package com.dbnt.faisp.kwms.service;
+
+import com.dbnt.faisp.kwms.model.VEmployee;
+import com.dbnt.faisp.kwms.repository.VEmployeeRepository;
+import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class KwmsService {
+  private final VEmployeeRepository vEmployeeRepository;
+  private final CodeMgtService codeMgtService;
+
+  public UserInfo selectEmpInfo(String dicCode) {
+    VEmployee empInfo = vEmployeeRepository.findByDicCode(dicCode).orElse(null);
+    return convertVEmployeeToUserInfo(empInfo);
+  }
+
+  private UserInfo convertVEmployeeToUserInfo(VEmployee empInfo){
+    UserInfo userInfo = new UserInfo();
+    userInfo.setDicCode(empInfo.getDicCode());
+    userInfo.setUserNm(empInfo.getEmpNm());
+    userInfo.setSex(empInfo.getSex());
+    String[] positionAry = empInfo.getCallBuseoNm().split(" ");
+    userInfo.setOgCd(codeMgtService.searchCode("OG", positionAry[0]));
+    if (positionAry.length>1){
+      userInfo.setOfcCd(codeMgtService.searchCode("OFC", positionAry[1]));
+    }
+    userInfo.setTitleCd(codeMgtService.searchCode("JT", empInfo.getJikgeup()));
+    userInfo.setOutturnCd(codeMgtService.searchCode("OTC", empInfo.getGyunggwa()));
+    userInfo.setSeriesCd(codeMgtService.searchCode("SRC", empInfo.getJikbyul()));
+
+    return userInfo;
+  }
+}

src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java

@@ -1,16 +1,13 @@
-package com.dbnt.faisp.authMgt;
+package com.dbnt.faisp.main.authMgt;
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.authMgt.model.AuthMgt;
+import com.dbnt.faisp.main.authMgt.model.AuthMgt;
-import com.dbnt.faisp.userInfo.service.UserInfoService;
+import com.dbnt.faisp.main.userInfo.service.UserInfoService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.HashMap;
-import java.util.Map;
-
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/dbnt/faisp/main/authMgt/mapper/AuthMgtMapper.java

@@ -1,8 +1,7 @@
-package com.dbnt.faisp.authMgt.mapper;
+package com.dbnt.faisp.main.authMgt.mapper;
 
-import com.dbnt.faisp.authMgt.model.AccessConfig;
+import com.dbnt.faisp.main.authMgt.model.AccessConfig;
-import com.dbnt.faisp.authMgt.model.ApprovalConfig;
+import com.dbnt.faisp.main.authMgt.model.ApprovalConfig;
-import com.dbnt.faisp.userInfo.model.UserInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/authMgt/model/AccessConfig.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.authMgt.model;
+package com.dbnt.faisp.main.authMgt.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/authMgt/model/ApprovalConfig.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.authMgt.model;
+package com.dbnt.faisp.main.authMgt.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/authMgt/model/AuthMgt.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.authMgt.model;
+package com.dbnt.faisp.main.authMgt.model;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.authMgt.repository;
+package com.dbnt.faisp.main.authMgt.repository;
 
-import com.dbnt.faisp.authMgt.model.AccessConfig;
+import com.dbnt.faisp.main.authMgt.model.AccessConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 

src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.authMgt.repository;
+package com.dbnt.faisp.main.authMgt.repository;
 
-import com.dbnt.faisp.authMgt.model.ApprovalConfig;
+import com.dbnt.faisp.main.authMgt.model.ApprovalConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 

src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java

@@ -1,12 +1,11 @@
-package com.dbnt.faisp.authMgt.service;
+package com.dbnt.faisp.main.authMgt.service;
 
-import com.dbnt.faisp.authMgt.mapper.AuthMgtMapper;
+import com.dbnt.faisp.main.authMgt.mapper.AuthMgtMapper;
-import com.dbnt.faisp.authMgt.model.AccessConfig;
+import com.dbnt.faisp.main.authMgt.model.AccessConfig;
-import com.dbnt.faisp.authMgt.model.ApprovalConfig;
+import com.dbnt.faisp.main.authMgt.model.ApprovalConfig;
-import com.dbnt.faisp.authMgt.model.AuthMgt;
+import com.dbnt.faisp.main.authMgt.model.AuthMgt;
-import com.dbnt.faisp.authMgt.repository.AccessConfigRepository;
+import com.dbnt.faisp.main.authMgt.repository.AccessConfigRepository;
-import com.dbnt.faisp.authMgt.repository.ApprovalConfigRepository;
+import com.dbnt.faisp.main.authMgt.repository.ApprovalConfigRepository;
-import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/dbnt/faisp/main/codeMgt/CodeMgtController.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.codeMgt;
+package com.dbnt.faisp.main.codeMgt;
 
-import com.dbnt.faisp.codeMgt.model.CodeCatg;
+import com.dbnt.faisp.main.codeMgt.model.CodeCatg;
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;

src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeCatg.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.codeMgt.model;
+package com.dbnt.faisp.main.codeMgt.model;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.codeMgt.model;
+package com.dbnt.faisp.main.codeMgt.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeCatgRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.codeMgt.repository;
+package com.dbnt.faisp.main.codeMgt.repository;
 
-import com.dbnt.faisp.codeMgt.model.CodeCatg;
+import com.dbnt.faisp.main.codeMgt.model.CodeCatg;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 

src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.codeMgt.repository;
+package com.dbnt.faisp.main.codeMgt.repository;
 
-import com.dbnt.faisp.codeMgt.model.CodeMgt;
+import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java

@@ -1,9 +1,9 @@
-package com.dbnt.faisp.codeMgt.service;
+package com.dbnt.faisp.main.codeMgt.service;
 
-import com.dbnt.faisp.codeMgt.model.CodeCatg;
+import com.dbnt.faisp.main.codeMgt.model.CodeCatg;
-import com.dbnt.faisp.codeMgt.model.CodeMgt;
+import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
-import com.dbnt.faisp.codeMgt.repository.CodeCatgRepository;
+import com.dbnt.faisp.main.codeMgt.repository.CodeCatgRepository;
-import com.dbnt.faisp.codeMgt.repository.CodeMgtRepository;
+import com.dbnt.faisp.main.codeMgt.repository.CodeMgtRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,4 +63,13 @@ public class CodeMgtService{
   public List<CodeMgt> selectCodeMgtList(String categoryCd) {
     return codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T");
   }
+  public String searchCode(String categoryCd, String value){
+    List<CodeMgt> codeList = selectCodeMgtList(categoryCd);
+    for(CodeMgt code: codeList){
+      if(code.getItemValue().equals(value)){
+        return code.getItemCd();
+      }
+    }
+    return null;
+  }
 }

src/main/java/com/dbnt/faisp/main/equip/EquipController.java

@@ -1,15 +1,15 @@
-package com.dbnt.faisp.equip;
+package com.dbnt.faisp.main.equip;
 
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.equip.model.CellPhone;
+import com.dbnt.faisp.main.equip.model.CellPhone;
-import com.dbnt.faisp.equip.model.Equip;
+import com.dbnt.faisp.main.equip.model.Equip;
-import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.main.equip.model.EquipLog;
-import com.dbnt.faisp.equip.model.UseList;
+import com.dbnt.faisp.main.equip.model.UseList;
-import com.dbnt.faisp.equip.service.EquipService;
+import com.dbnt.faisp.main.equip.service.EquipService;
-import com.dbnt.faisp.organMgt.service.OrganConfigService;
+import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
-import com.dbnt.faisp.userInfo.service.UserInfoService;
+import com.dbnt.faisp.main.userInfo.service.UserInfoService;
 import com.dbnt.faisp.util.ParamMap;
 import com.dbnt.faisp.util.Utils;
 

src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java

@@ -1,9 +1,9 @@
-package com.dbnt.faisp.equip.mapper;
+package com.dbnt.faisp.main.equip.mapper;
 
-import com.dbnt.faisp.equip.model.CellPhone;
+import com.dbnt.faisp.main.equip.model.CellPhone;
-import com.dbnt.faisp.equip.model.Equip;
+import com.dbnt.faisp.main.equip.model.Equip;
-import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.main.equip.model.EquipLog;
-import com.dbnt.faisp.equip.model.UseList;
+import com.dbnt.faisp.main.equip.model.UseList;
 import com.dbnt.faisp.util.ParamMap;
 
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.equip.model;
+package com.dbnt.faisp.main.equip.model;
 
 import com.dbnt.faisp.config.BaseModel;
 

src/main/java/com/dbnt/faisp/main/equip/model/Equip.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.equip.model;
+package com.dbnt.faisp.main.equip.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -9,14 +9,11 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 
 @Getter

src/main/java/com/dbnt/faisp/main/equip/model/EquipFile.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.equip.model;
+package com.dbnt.faisp.main.equip.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -9,14 +9,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 
 @Getter

src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.equip.model;
+package com.dbnt.faisp.main.equip.model;
 
 
 import com.dbnt.faisp.config.BaseModel;

src/main/java/com/dbnt/faisp/main/equip/model/UseList.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.equip.model;
+package com.dbnt.faisp.main.equip.model;
 
 import com.dbnt.faisp.config.BaseModel;
 

src/main/java/com/dbnt/faisp/main/equip/repository/CellPhoneRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.equip.repository;
+package com.dbnt.faisp.main.equip.repository;
 
-import com.dbnt.faisp.equip.model.CellPhone;
+import com.dbnt.faisp.main.equip.model.CellPhone;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/dbnt/faisp/main/equip/repository/EquipFileRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.equip.repository;
+package com.dbnt.faisp.main.equip.repository;
 
-import com.dbnt.faisp.equip.model.EquipFile;
+import com.dbnt.faisp.main.equip.model.EquipFile;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/dbnt/faisp/main/equip/repository/EquipLogRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.equip.repository;
+package com.dbnt.faisp.main.equip.repository;
 
-import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.main.equip.model.EquipLog;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/dbnt/faisp/main/equip/repository/EquipRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.equip.repository;
+package com.dbnt.faisp.main.equip.repository;
 
-import com.dbnt.faisp.equip.model.Equip;
+import com.dbnt.faisp.main.equip.model.Equip;
 
 import java.util.List;
 

src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.equip.repository;
+package com.dbnt.faisp.main.equip.repository;
 
-import com.dbnt.faisp.equip.model.UseList;
+import com.dbnt.faisp.main.equip.model.UseList;
 
 import java.util.List;
 

src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java

@@ -1,21 +1,21 @@
-package com.dbnt.faisp.equip.service;
+package com.dbnt.faisp.main.equip.service;
 
 
-import com.dbnt.faisp.equip.mapper.EquipMapper;
+import com.dbnt.faisp.main.equip.mapper.EquipMapper;
-import com.dbnt.faisp.equip.model.CellPhone;
+import com.dbnt.faisp.main.equip.model.CellPhone;
-import com.dbnt.faisp.equip.model.Equip;
+import com.dbnt.faisp.main.equip.model.Equip;
-import com.dbnt.faisp.equip.model.Equip.EquipId;
+import com.dbnt.faisp.main.equip.model.Equip.EquipId;
-import com.dbnt.faisp.equip.model.EquipFile;
+import com.dbnt.faisp.main.equip.model.EquipFile;
-import com.dbnt.faisp.equip.model.EquipFile.EquipFileId;
+import com.dbnt.faisp.main.equip.model.EquipFile.EquipFileId;
-import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.main.equip.model.EquipLog;
-import com.dbnt.faisp.equip.model.UseList;
+import com.dbnt.faisp.main.equip.model.UseList;
-import com.dbnt.faisp.equip.model.UseList.UseListId;
+import com.dbnt.faisp.main.equip.model.UseList.UseListId;
-import com.dbnt.faisp.equip.repository.CellPhoneRepository;
+import com.dbnt.faisp.main.equip.repository.CellPhoneRepository;
-import com.dbnt.faisp.equip.repository.EquipFileRepository;
+import com.dbnt.faisp.main.equip.repository.EquipFileRepository;
-import com.dbnt.faisp.equip.repository.EquipLogRepository;
+import com.dbnt.faisp.main.equip.repository.EquipLogRepository;
-import com.dbnt.faisp.equip.repository.EquipRepository;
+import com.dbnt.faisp.main.equip.repository.EquipRepository;
-import com.dbnt.faisp.equip.repository.UseListRepository;
+import com.dbnt.faisp.main.equip.repository.UseListRepository;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import com.dbnt.faisp.util.ParamMap;
 import com.dbnt.faisp.util.Utils;
 

src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java

@@ -1,12 +1,11 @@
-package com.dbnt.faisp.faRpt;
+package com.dbnt.faisp.main.faRpt;
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
-import com.dbnt.faisp.faRpt.model.FaRptBoard;
+import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
-import com.dbnt.faisp.faRpt.model.FaRptReadUser;
+import com.dbnt.faisp.main.faRpt.model.FaRptReadUser;
-import com.dbnt.faisp.faRpt.service.FaRptService;
+import com.dbnt.faisp.main.faRpt.service.FaRptService;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
-import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/dbnt/faisp/main/faRpt/mapper/FaRptMapper.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faRpt.mapper;
+package com.dbnt.faisp.main.faRpt.mapper;
 
-import com.dbnt.faisp.faRpt.model.FaRptBoard;
+import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptBoard.java

@@ -1,8 +1,6 @@
-package com.dbnt.faisp.faRpt.model;
+package com.dbnt.faisp.main.faRpt.model;
 
 import com.dbnt.faisp.config.BaseModel;
-import com.dbnt.faisp.publicBoard.model.PublicComment;
-import com.dbnt.faisp.publicBoard.model.PublicFile;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptFile.java

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

src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptReadUser.java

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

src/main/java/com/dbnt/faisp/main/faRpt/model/HashTagLinkFaRpt.java

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

src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java

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

src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptFileRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faRpt.repository;
+package com.dbnt.faisp.main.faRpt.repository;
 
-import com.dbnt.faisp.faRpt.model.FaRptFile;
+import com.dbnt.faisp.main.faRpt.model.FaRptFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptReadUserRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faRpt.repository;
+package com.dbnt.faisp.main.faRpt.repository;
 
-import com.dbnt.faisp.faRpt.model.FaRptReadUser;
+import com.dbnt.faisp.main.faRpt.model.FaRptReadUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/faRpt/repository/HashTagLinkFaRptRepository.java

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

src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java

@@ -1,17 +1,17 @@
-package com.dbnt.faisp.faRpt.service;
+package com.dbnt.faisp.main.faRpt.service;
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
-import com.dbnt.faisp.faRpt.mapper.FaRptMapper;
+import com.dbnt.faisp.main.faRpt.mapper.FaRptMapper;
-import com.dbnt.faisp.faRpt.model.FaRptBoard;
+import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
-import com.dbnt.faisp.faRpt.model.FaRptFile;
+import com.dbnt.faisp.main.faRpt.model.FaRptFile;
-import com.dbnt.faisp.faRpt.model.FaRptReadUser;
+import com.dbnt.faisp.main.faRpt.model.FaRptReadUser;
-import com.dbnt.faisp.faRpt.model.HashTagLinkFaRpt;
+import com.dbnt.faisp.main.faRpt.model.HashTagLinkFaRpt;
-import com.dbnt.faisp.faRpt.repository.FaRptBoardRepository;
+import com.dbnt.faisp.main.faRpt.repository.FaRptBoardRepository;
-import com.dbnt.faisp.faRpt.repository.FaRptFileRepository;
+import com.dbnt.faisp.main.faRpt.repository.FaRptFileRepository;
-import com.dbnt.faisp.faRpt.repository.FaRptReadUserRepository;
+import com.dbnt.faisp.main.faRpt.repository.FaRptReadUserRepository;
-import com.dbnt.faisp.faRpt.repository.HashTagLinkFaRptRepository;
+import com.dbnt.faisp.main.faRpt.repository.HashTagLinkFaRptRepository;
-import com.dbnt.faisp.hashTag.service.HashTagService;
+import com.dbnt.faisp.main.hashTag.service.HashTagService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java

@@ -1,14 +1,14 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest;
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.codeMgt.model.CodeMgt;
+import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService;
-import com.dbnt.faisp.organMgt.model.OrganConfig;
+import com.dbnt.faisp.main.organMgt.model.OrganConfig;
-import com.dbnt.faisp.organMgt.service.OrganConfigService;
+import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import com.dbnt.faisp.util.Excel;
 import com.dbnt.faisp.util.ParamMap;
 import com.dbnt.faisp.util.Utils;

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java

@@ -1,6 +1,8 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper;
+
+
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
 
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
 import com.dbnt.faisp.util.ParamMap;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.*;

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository;
 
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface InternationalCrimeArrestRepository extends JpaRepository<InternationalCrimeArrest, Integer> {

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository;
 
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java

@@ -1,12 +1,12 @@
-package com.dbnt.faisp.faStatistics.internationalCrimeArrest.service;
+package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service;
 
 
 import com.dbnt.faisp.config.BaseService;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.InternationalCrimeArrestRepository;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.InternationalCrimeArrestRepository;
-import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository;
 import com.dbnt.faisp.util.ParamMap;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java

@@ -1,18 +1,19 @@
-package com.dbnt.faisp.fipTarget;
+package com.dbnt.faisp.main.fipTarget;
 
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.fipTarget.model.PartInfo;
-import com.dbnt.faisp.fipTarget.model.PartInfoFile;
-import com.dbnt.faisp.fipTarget.model.PartWork;
-import com.dbnt.faisp.fipTarget.model.PartWorkFile;
 import com.dbnt.faisp.fipTarget.model.ShipInfo;
-import com.dbnt.faisp.fipTarget.model.VulnFile;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.fipTarget.model.Vulnerable;
+import com.dbnt.faisp.main.fipTarget.model.PartInfo;
-import com.dbnt.faisp.fipTarget.service.FipTargetService;
+import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;
-import com.dbnt.faisp.organMgt.service.OrganConfigService;
+import com.dbnt.faisp.main.fipTarget.model.PartWork;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.fipTarget.model.PartWorkFile;
-import com.dbnt.faisp.userInfo.service.UserInfoService;
+import com.dbnt.faisp.main.fipTarget.model.VulnFile;
+import com.dbnt.faisp.main.fipTarget.model.Vulnerable;
+import com.dbnt.faisp.main.fipTarget.service.FipTargetService;
+import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.service.UserInfoService;
+
 import com.dbnt.faisp.util.ParamMap;
 import com.dbnt.faisp.util.Utils;
 
@@ -470,7 +471,7 @@ public class FipTargetController {
   //외사취약지 끝 
   //국제여객선 시작
   @GetMapping("/ipShipList")
-  public ModelAndView ipShipList(@AuthenticationPrincipal UserInfo loginUser,ShipInfo shipInfo, HttpServletResponse response) {
+  public ModelAndView ipShipList(@AuthenticationPrincipal UserInfo loginUser, ShipInfo shipInfo, HttpServletResponse response) {
     ModelAndView mav = new ModelAndView("fipTarget/ipShipList");
     shipInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
     //메뉴권한 확인

src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java

@@ -1,9 +1,9 @@
-package com.dbnt.faisp.fipTarget.mapper;
+package com.dbnt.faisp.main.fipTarget.mapper;
 
-import com.dbnt.faisp.fipTarget.model.PartInfo;
+import com.dbnt.faisp.main.fipTarget.model.PartInfo;
-import com.dbnt.faisp.fipTarget.model.PartInfoFile;
+import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;
-import com.dbnt.faisp.fipTarget.model.PartWork;
+import com.dbnt.faisp.main.fipTarget.model.PartWork;
-import com.dbnt.faisp.fipTarget.model.Vulnerable;
+import com.dbnt.faisp.main.fipTarget.model.Vulnerable;
 import com.dbnt.faisp.util.ParamMap;
 
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -15,9 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 

src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfoFile.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -9,14 +9,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 
 @Getter

src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 

src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWorkFile.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -9,14 +9,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 
 @Getter

src/main/java/com/dbnt/faisp/main/fipTarget/model/VulnFile.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -9,14 +9,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 
 @Getter

src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 

src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoFileRepository.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fipTarget.repository;
+package com.dbnt.faisp.main.fipTarget.repository;
 
 
-import com.dbnt.faisp.fipTarget.model.PartInfoFile;
+import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;
 
 import java.util.List;
 

src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fipTarget.repository;
+package com.dbnt.faisp.main.fipTarget.repository;
 
 
-import com.dbnt.faisp.fipTarget.model.PartInfo;
+import com.dbnt.faisp.main.fipTarget.model.PartInfo;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkFileRepository.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fipTarget.repository;
+package com.dbnt.faisp.main.fipTarget.repository;
 
 
-import com.dbnt.faisp.fipTarget.model.PartWorkFile;
+import com.dbnt.faisp.main.fipTarget.model.PartWorkFile;
 
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fipTarget.repository;
+package com.dbnt.faisp.main.fipTarget.repository;
 
 
-import com.dbnt.faisp.fipTarget.model.PartWork;
+import com.dbnt.faisp.main.fipTarget.model.PartWork;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnFileRepository.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fipTarget.repository;
+package com.dbnt.faisp.main.fipTarget.repository;
 
 
-import com.dbnt.faisp.fipTarget.model.VulnFile;
+import com.dbnt.faisp.main.fipTarget.model.VulnFile;
 
 import java.util.List;
 

src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnRepository.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fipTarget.repository;
+package com.dbnt.faisp.main.fipTarget.repository;
 
 
-import com.dbnt.faisp.fipTarget.model.Vulnerable;
+import com.dbnt.faisp.main.fipTarget.model.Vulnerable;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java

@@ -1,27 +1,26 @@
-package com.dbnt.faisp.fipTarget.service;
+package com.dbnt.faisp.main.fipTarget.service;
 
 
 
 import com.dbnt.faisp.config.BaseService;
-import com.dbnt.faisp.fipTarget.mapper.FipTargetMapper;
+import com.dbnt.faisp.main.fipTarget.mapper.FipTargetMapper;
-import com.dbnt.faisp.fipTarget.model.PartInfo;
+import com.dbnt.faisp.main.fipTarget.model.PartInfo;
-import com.dbnt.faisp.fipTarget.model.PartInfo.PartInfoId;
+import com.dbnt.faisp.main.fipTarget.model.PartInfo.PartInfoId;
-import com.dbnt.faisp.fipTarget.model.PartInfoFile;
+import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;
-import com.dbnt.faisp.fipTarget.model.PartInfoFile.PartInfoFileId;
+import com.dbnt.faisp.main.fipTarget.model.PartInfoFile.PartInfoFileId;
-import com.dbnt.faisp.fipTarget.model.PartWork;
+import com.dbnt.faisp.main.fipTarget.model.PartWork;
-import com.dbnt.faisp.fipTarget.model.PartWork.PartWorkId;
+import com.dbnt.faisp.main.fipTarget.model.PartWork.PartWorkId;
-import com.dbnt.faisp.fipTarget.model.PartWorkFile;
+import com.dbnt.faisp.main.fipTarget.model.PartWorkFile;
-import com.dbnt.faisp.fipTarget.model.PartWorkFile.PartWorkFileId;
+import com.dbnt.faisp.main.fipTarget.model.PartWorkFile.PartWorkFileId;
-import com.dbnt.faisp.fipTarget.model.VulnFile;
+import com.dbnt.faisp.main.fipTarget.model.VulnFile;
-import com.dbnt.faisp.fipTarget.model.VulnFile.VulnFileId;
+import com.dbnt.faisp.main.fipTarget.model.VulnFile.VulnFileId;
-import com.dbnt.faisp.fipTarget.model.Vulnerable;
+import com.dbnt.faisp.main.fipTarget.model.Vulnerable;
-import com.dbnt.faisp.fipTarget.repository.PartInfoFileRepository;
+import com.dbnt.faisp.main.fipTarget.repository.PartInfoFileRepository;
-import com.dbnt.faisp.fipTarget.repository.PartInfoRepository;
+import com.dbnt.faisp.main.fipTarget.repository.PartInfoRepository;
-import com.dbnt.faisp.fipTarget.repository.PartWorkFileRepository;
+import com.dbnt.faisp.main.fipTarget.repository.PartWorkFileRepository;
-import com.dbnt.faisp.fipTarget.repository.PartWorkRepository;
+import com.dbnt.faisp.main.fipTarget.repository.PartWorkRepository;
-import com.dbnt.faisp.fipTarget.repository.VulnFileRepository;
+import com.dbnt.faisp.main.fipTarget.repository.VulnFileRepository;
-import com.dbnt.faisp.fipTarget.repository.VulnRepository;
+import com.dbnt.faisp.main.fipTarget.repository.VulnRepository;
-import com.dbnt.faisp.publicBoard.model.PublicFile;
 import com.dbnt.faisp.util.ParamMap;
 
 import lombok.RequiredArgsConstructor;

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java

@@ -1,12 +1,12 @@
-package com.dbnt.faisp.fpiMgt.affair;
+package com.dbnt.faisp.main.fpiMgt.affair;
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
-import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
-import com.dbnt.faisp.fpiMgt.affair.model.AffairRating;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairRating;
-import com.dbnt.faisp.fpiMgt.affair.model.TypeStatistics;
+import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics;
-import com.dbnt.faisp.fpiMgt.affair.service.AffairService;
+import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fpiMgt.affair.mapper;
+package com.dbnt.faisp.main.fpiMgt.affair.mapper;
 
-import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
-import com.dbnt.faisp.fpiMgt.affair.model.TypeStatistics;
+import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics;
 
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affair.model;
+package com.dbnt.faisp.main.fpiMgt.affair.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairFile.java

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

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affair.model;
+package com.dbnt.faisp.main.fpiMgt.affair.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/HashTagLink.java

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

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affair.model;
+package com.dbnt.faisp.main.fpiMgt.affair.model;
 
 import com.dbnt.faisp.config.BaseModel;
 

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairBoardRepository.java

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

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairFileRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.affair.repository;
+package com.dbnt.faisp.main.fpiMgt.affair.repository;
 
-import com.dbnt.faisp.fpiMgt.affair.model.AffairFile;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairRatingRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.affair.repository;
+package com.dbnt.faisp.main.fpiMgt.affair.repository;
 
-import com.dbnt.faisp.fpiMgt.affair.model.AffairRating;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairRating;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/HashTagLinkRepository.java

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

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java

@@ -1,13 +1,13 @@
-package com.dbnt.faisp.fpiMgt.affair.service;
+package com.dbnt.faisp.main.fpiMgt.affair.service;
 
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
-import com.dbnt.faisp.fpiMgt.affair.mapper.AffairMapper;
+import com.dbnt.faisp.main.fpiMgt.affair.mapper.AffairMapper;
-import com.dbnt.faisp.fpiMgt.affair.model.*;
+import com.dbnt.faisp.main.fpiMgt.affair.model.*;
-import com.dbnt.faisp.fpiMgt.affair.repository.*;
+import com.dbnt.faisp.main.fpiMgt.affair.repository.*;
-import com.dbnt.faisp.hashTag.service.HashTagService;
+import com.dbnt.faisp.main.hashTag.service.HashTagService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java

@@ -1,10 +1,10 @@
-package com.dbnt.faisp.fpiMgt.affairPlan;
+package com.dbnt.faisp.main.fpiMgt.affairPlan;
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard;
-import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -12,9 +12,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/mapper/PlanMapper.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.mapper;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.mapper;
 
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.model;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.model;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanFile.java

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

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanMainInfo.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.model;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanApprvRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.repository;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java

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

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanFileRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.repository;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.repository;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanMainInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java

@@ -1,18 +1,17 @@
-package com.dbnt.faisp.fpiMgt.affairPlan.service;
+package com.dbnt.faisp.main.fpiMgt.affairPlan.service;
 
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
-import com.dbnt.faisp.fpiMgt.affairPlan.mapper.PlanMapper;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.mapper.PlanMapper;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanFile;
-import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanMainInfo;
-import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanApprvRepository;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanApprvRepository;
-import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanBoardRepository;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanBoardRepository;
-import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanFileRepository;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanFileRepository;
-import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanMainInfoRepository;
+import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanMainInfoRepository;
-import com.dbnt.faisp.fpiMgt.affairResult.repository.ClearInfoRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java

@@ -1,15 +1,15 @@
-package com.dbnt.faisp.fpiMgt.affairResult;
+package com.dbnt.faisp.main.fpiMgt.affairResult;
 
-import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.codeMgt.service.CodeMgtService;
+import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
-import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
-import com.dbnt.faisp.fpiMgt.affair.service.AffairService;
+import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService;
-import com.dbnt.faisp.fpiMgt.affairResult.model.ResultApprv;
+import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultApprv;
-import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard;
+import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard;
-import com.dbnt.faisp.fpiMgt.affairResult.model.ClearInfo;
+import com.dbnt.faisp.main.fpiMgt.affairResult.model.ClearInfo;
-import com.dbnt.faisp.fpiMgt.affairResult.model.ResultInfo;
+import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultInfo;
-import com.dbnt.faisp.fpiMgt.affairResult.service.ResultService;
+import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService;
-import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java

@@ -1,8 +1,7 @@
-package com.dbnt.faisp.fpiMgt.affairResult.mapper;
+package com.dbnt.faisp.main.fpiMgt.affairResult.mapper;
 
-import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
-import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard;
+import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard;
-import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToAffair;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ClearInfo.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affairResult.model;
+package com.dbnt.faisp.main.fpiMgt.affairResult.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
@@ -6,7 +6,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 @Getter
 @Setter

src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultApprv.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.affairResult.model;
+package com.dbnt.faisp.main.fpiMgt.affairResult.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java

@@ -1,7 +1,7 @@
-package com.dbnt.faisp.fpiMgt.affairResult.model;
+package com.dbnt.faisp.main.fpiMgt.affairResult.model;
 
 import com.dbnt.faisp.config.BaseModel;
-import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultFile.java

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