diff --git a/src/main/java/com/dbnt/faisp/controller/BaseController.java b/src/main/java/com/dbnt/faisp/BaseController.java similarity index 93% rename from src/main/java/com/dbnt/faisp/controller/BaseController.java rename to src/main/java/com/dbnt/faisp/BaseController.java index 6efb270c..2875ace3 100644 --- a/src/main/java/com/dbnt/faisp/controller/BaseController.java +++ b/src/main/java/com/dbnt/faisp/BaseController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp; -import com.dbnt.faisp.model.UserInfo; -import com.dbnt.faisp.service.CodeMgtService; +import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.codeMgt.CodeMgtService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/dbnt/faisp/model/BaseModel.java b/src/main/java/com/dbnt/faisp/BaseModel.java similarity index 97% rename from src/main/java/com/dbnt/faisp/model/BaseModel.java rename to src/main/java/com/dbnt/faisp/BaseModel.java index b74ba72b..52d26944 100644 --- a/src/main/java/com/dbnt/faisp/model/BaseModel.java +++ b/src/main/java/com/dbnt/faisp/BaseModel.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.model; +package com.dbnt.faisp; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java similarity index 79% rename from src/main/java/com/dbnt/faisp/service/CodeMgtService.java rename to src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java index fbe8f219..64ae86d2 100644 --- a/src/main/java/com/dbnt/faisp/service/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java @@ -1,10 +1,9 @@ -package com.dbnt.faisp.service; +package com.dbnt.faisp.codeMgt; -import com.dbnt.faisp.mapper.CodeMgtMapper; -import com.dbnt.faisp.model.CodeCatg; -import com.dbnt.faisp.model.CodeMgt; -import com.dbnt.faisp.repository.CodeCatgRepository; -import com.dbnt.faisp.repository.CodeMgtRepository; +import com.dbnt.faisp.codeMgt.model.CodeCatg; +import com.dbnt.faisp.codeMgt.model.CodeMgt; +import com.dbnt.faisp.codeMgt.repository.CodeCatgRepository; +import com.dbnt.faisp.codeMgt.repository.CodeMgtRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,7 +16,6 @@ public class CodeMgtService{ private final CodeMgtRepository codeMgtRepository; private final CodeCatgRepository codeCatgRepository; - private final CodeMgtMapper codeMgtMapper; @Transactional public String saveCode(List codeMgtList){ diff --git a/src/main/java/com/dbnt/faisp/model/CodeCatg.java b/src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java similarity index 94% rename from src/main/java/com/dbnt/faisp/model/CodeCatg.java rename to src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java index dfdb1835..e719bc81 100644 --- a/src/main/java/com/dbnt/faisp/model/CodeCatg.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.model; +package com.dbnt.faisp.codeMgt.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/model/CodeMgt.java b/src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java similarity index 95% rename from src/main/java/com/dbnt/faisp/model/CodeMgt.java rename to src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java index 90b38b83..7c5c07c1 100644 --- a/src/main/java/com/dbnt/faisp/model/CodeMgt.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.model; +package com.dbnt.faisp.codeMgt.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/repository/CodeCatgRepository.java b/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java similarity index 62% rename from src/main/java/com/dbnt/faisp/repository/CodeCatgRepository.java rename to src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java index 8164489f..55c94e7f 100644 --- a/src/main/java/com/dbnt/faisp/repository/CodeCatgRepository.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.repository; +package com.dbnt.faisp.codeMgt.repository; -import com.dbnt.faisp.model.CodeCatg; +import com.dbnt.faisp.codeMgt.model.CodeCatg; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java b/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java rename to src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java index b9f33ba4..b3c10ed0 100644 --- a/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java @@ -1,10 +1,9 @@ -package com.dbnt.faisp.repository; +package com.dbnt.faisp.codeMgt.repository; -import com.dbnt.faisp.model.CodeMgt; +import com.dbnt.faisp.codeMgt.model.CodeMgt; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -import java.util.Optional; public interface CodeMgtRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java b/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java index b55f39a4..b0a2d3ee 100644 --- a/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java +++ b/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java @@ -1,7 +1,7 @@ package com.dbnt.faisp.controller; -import com.dbnt.faisp.model.CodeCatg; -import com.dbnt.faisp.service.CodeMgtService; +import com.dbnt.faisp.codeMgt.model.CodeCatg; +import com.dbnt.faisp.codeMgt.CodeMgtService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -16,9 +16,8 @@ public class CodeMgtController { private final CodeMgtService codeMgtService; @GetMapping("/codeMgtPage") - public ModelAndView loginError() { + public ModelAndView codeMgtPage() { ModelAndView mav = new ModelAndView("/adminPage/codeMgt/codeMgt"); - return mav; } diff --git a/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java b/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java new file mode 100644 index 00000000..3880a672 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java @@ -0,0 +1,23 @@ +package com.dbnt.faisp.controller; + +import com.dbnt.faisp.menuMgt.MenuMgtService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + + +@RestController +@RequiredArgsConstructor +@RequestMapping("/menuMgt") +public class MenuMgtController { + + private final MenuMgtService menuMgtService; + + @GetMapping("/menuMgtPage") + public ModelAndView menuMgtPage() { + ModelAndView mav = new ModelAndView("/adminPage/menuMgt/menuMgt"); + + return mav; + } + +} diff --git a/src/main/java/com/dbnt/faisp/controller/UserInfoController.java b/src/main/java/com/dbnt/faisp/controller/UserInfoController.java index 841a59da..68a662ab 100644 --- a/src/main/java/com/dbnt/faisp/controller/UserInfoController.java +++ b/src/main/java/com/dbnt/faisp/controller/UserInfoController.java @@ -1,7 +1,7 @@ package com.dbnt.faisp.controller; -import com.dbnt.faisp.model.UserInfo; -import com.dbnt.faisp.service.UserInfoService; +import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.userInfo.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/dbnt/faisp/mapper/CodeMgtMapper.java b/src/main/java/com/dbnt/faisp/mapper/CodeMgtMapper.java deleted file mode 100644 index e23d6fbe..00000000 --- a/src/main/java/com/dbnt/faisp/mapper/CodeMgtMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dbnt.faisp.mapper; - -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface CodeMgtMapper { - -} diff --git a/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtService.java b/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtService.java new file mode 100644 index 00000000..8725f65c --- /dev/null +++ b/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtService.java @@ -0,0 +1,16 @@ +package com.dbnt.faisp.menuMgt; + +import com.dbnt.faisp.menuMgt.mapper.MenuMgtMapper; +import com.dbnt.faisp.menuMgt.repository.MenuMgtRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MenuMgtService { + + private final MenuMgtRepository menuMgtRepository; + private final MenuMgtMapper menuMgtMapper; + + +} diff --git a/src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java b/src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java new file mode 100644 index 00000000..d07bb22d --- /dev/null +++ b/src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java @@ -0,0 +1,8 @@ +package com.dbnt.faisp.menuMgt.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MenuMgtMapper { + +} diff --git a/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java b/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java new file mode 100644 index 00000000..4d2de64c --- /dev/null +++ b/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java @@ -0,0 +1,31 @@ +package com.dbnt.faisp.menuMgt.model; + +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 = "menu_mgt") +public class MenuMgt { + @Id + @Column(name = "menu_key") + private String menuKey; + @Column(name = "cat1_nm", nullable = false) + private String cat1Nm; + @Column(name = "cat2_nm", nullable = false) + private String cat2Nm; + @Column(name = "cat3_nm", nullable = false) + private String cat3Nm; + @Column(name = "menu_url", nullable = false) + private String menuUrl; + +} diff --git a/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java b/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java new file mode 100644 index 00000000..e5ec789b --- /dev/null +++ b/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java @@ -0,0 +1,9 @@ +package com.dbnt.faisp.menuMgt.repository; + +import com.dbnt.faisp.menuMgt.model.MenuMgt; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface MenuMgtRepository extends JpaRepository { + +} diff --git a/src/main/java/com/dbnt/faisp/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java similarity index 93% rename from src/main/java/com/dbnt/faisp/service/UserInfoService.java rename to src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java index fe8db34b..6876e3b8 100644 --- a/src/main/java/com/dbnt/faisp/service/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java @@ -1,9 +1,9 @@ -package com.dbnt.faisp.service; +package com.dbnt.faisp.userInfo; import com.dbnt.faisp.config.Role; -import com.dbnt.faisp.mapper.UserInfoMapper; -import com.dbnt.faisp.model.UserInfo; -import com.dbnt.faisp.repository.UserInfoRepository; +import com.dbnt.faisp.userInfo.mapper.UserInfoMapper; +import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.userInfo.repository.UserInfoRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/dbnt/faisp/mapper/UserInfoMapper.java b/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java similarity index 72% rename from src/main/java/com/dbnt/faisp/mapper/UserInfoMapper.java rename to src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java index 647d131c..bb17b3c3 100644 --- a/src/main/java/com/dbnt/faisp/mapper/UserInfoMapper.java +++ b/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.mapper; +package com.dbnt.faisp.userInfo.mapper; -import com.dbnt.faisp.model.UserInfo; +import com.dbnt.faisp.userInfo.model.UserInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/model/UserInfo.java b/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java similarity index 96% rename from src/main/java/com/dbnt/faisp/model/UserInfo.java rename to src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java index 92f209d9..d9f35aa6 100644 --- a/src/main/java/com/dbnt/faisp/model/UserInfo.java +++ b/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java @@ -1,5 +1,6 @@ -package com.dbnt.faisp.model; +package com.dbnt.faisp.userInfo.model; +import com.dbnt.faisp.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -10,7 +11,6 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import javax.persistence.*; -import java.time.LocalDateTime; import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/dbnt/faisp/repository/UserInfoRepository.java b/src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java similarity index 71% rename from src/main/java/com/dbnt/faisp/repository/UserInfoRepository.java rename to src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java index 770ab596..bd5e4594 100644 --- a/src/main/java/com/dbnt/faisp/repository/UserInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.repository; +package com.dbnt.faisp.userInfo.repository; -import com.dbnt.faisp.model.UserInfo; +import com.dbnt.faisp.userInfo.model.UserInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index b656aa34..9e76c4ff 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -3,7 +3,7 @@ - + + +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + + + + + +
분류코드분류명설명
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + +
하위코드사용
분류를 선택해주세요.
+
+ +
+
+
+
+
+
+
+ + + \ No newline at end of file