diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 82286fa3..f0fb61b1 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -60,7 +60,7 @@ public class SecurityConfig{ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http.authorizeRequests() // 페이지 권한 설정 .antMatchers("/dashboard").hasRole(Role.USER.name()) // USER, ADMIN 접근 허용 - .antMatchers("/admin/**").hasRole(Role.ADMIN.name()) // ADMIN만 접근 허용 + .antMatchers("/codeMgt/**", "/menuMgt/**").hasRole(Role.ADMIN.name()) // ADMIN만 접근 허용 .antMatchers("/login").permitAll() // 로그인 페이지는 권한 없이 접근 허용 .and() // 로그인 설정 .formLogin() .loginPage("/login") // Custom login form 사용 diff --git a/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java b/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java new file mode 100644 index 00000000..e6e253e6 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java @@ -0,0 +1,24 @@ +package com.dbnt.faisp.controller; + +import com.dbnt.faisp.service.CodeMgtService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/codeMgt") +public class CodeMgtController { + + private final CodeMgtService codeMgtService; + + @GetMapping("/codeMgtPage") + public ModelAndView loginError() { + ModelAndView mav = new ModelAndView("/adminPage/codeMgt/codeMgt"); + + return mav; + } +} diff --git a/src/main/java/com/dbnt/faisp/mapper/CodeMgtMapper.java b/src/main/java/com/dbnt/faisp/mapper/CodeMgtMapper.java new file mode 100644 index 00000000..e23d6fbe --- /dev/null +++ b/src/main/java/com/dbnt/faisp/mapper/CodeMgtMapper.java @@ -0,0 +1,10 @@ +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/model/CodeCatg.java b/src/main/java/com/dbnt/faisp/model/CodeCatg.java new file mode 100644 index 00000000..7c42173b --- /dev/null +++ b/src/main/java/com/dbnt/faisp/model/CodeCatg.java @@ -0,0 +1,27 @@ +package com.dbnt.faisp.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 = "code_catg") +public class CodeCatg { + @Id + @Column(name = "category_cd") + private String categoryCd; + @Column(name = "category_value", nullable = false) + private String categoryValue; + @Column(name = "description") + private String description; + +} diff --git a/src/main/java/com/dbnt/faisp/model/CodeMgt.java b/src/main/java/com/dbnt/faisp/model/CodeMgt.java new file mode 100644 index 00000000..13b767af --- /dev/null +++ b/src/main/java/com/dbnt/faisp/model/CodeMgt.java @@ -0,0 +1,39 @@ +package com.dbnt.faisp.model; + +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "code_mgt") +@IdClass(CodeMgt.CodeMgtId.class) +public class CodeMgt { + @Id + @Column(name = "category_cd") + private String categoryCd; + @Id + @Column(name = "item_cd") + private String itemCd; + @Column(name = "VALUE", nullable = false) + private String value; + @Column(name = "use_chk") + private String useChk; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class CodeMgtId implements Serializable { + private String categoryCd; + private String itemCd; + } + +} diff --git a/src/main/java/com/dbnt/faisp/repository/CodeCatgRepository.java b/src/main/java/com/dbnt/faisp/repository/CodeCatgRepository.java new file mode 100644 index 00000000..8164489f --- /dev/null +++ b/src/main/java/com/dbnt/faisp/repository/CodeCatgRepository.java @@ -0,0 +1,9 @@ +package com.dbnt.faisp.repository; + +import com.dbnt.faisp.model.CodeCatg; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface CodeCatgRepository extends JpaRepository { + +} diff --git a/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java b/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java new file mode 100644 index 00000000..d83208b2 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java @@ -0,0 +1,11 @@ +package com.dbnt.faisp.repository; + +import com.dbnt.faisp.model.CodeMgt; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + + +public interface CodeMgtRepository extends JpaRepository { + +} diff --git a/src/main/java/com/dbnt/faisp/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/service/CodeMgtService.java new file mode 100644 index 00000000..f749ab39 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/service/CodeMgtService.java @@ -0,0 +1,20 @@ +package com.dbnt.faisp.service; + +import com.dbnt.faisp.mapper.CodeMgtMapper; +import com.dbnt.faisp.repository.CodeCatgRepository; +import com.dbnt.faisp.repository.CodeMgtRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class CodeMgtService{ + + private final CodeMgtRepository codeMgtRepository; + private final CodeCatgRepository codeCatgRepository; + private final CodeMgtMapper codeMgtMapper; + +} diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index c317f6ff..e562fffd 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -15,7 +15,7 @@ $(document).on('click', '#saveBtn', function (){ if(result === "userIdDuplication"){ alert("등록된 아이디입니다.") }else{ - alert("저장되었습니다.") + alert("저장되었습니다.\n담당자 승인 후 로그인 가능합니다.") $("#closeModalBtn").click(); $("#searchBtn").click(); } diff --git a/src/main/resources/templates/adminPage/codeMgt/codeMgt.html b/src/main/resources/templates/adminPage/codeMgt/codeMgt.html new file mode 100644 index 00000000..e6f553b9 --- /dev/null +++ b/src/main/resources/templates/adminPage/codeMgt/codeMgt.html @@ -0,0 +1,73 @@ + + + + + +
+
+

코드 관리

+
+
+
+
+
+
+
+ + + + + + + + + + +
분류코드분류명설명
+
+
+
+
+
+
+ + + + + + + + + + +
+ + 하위코드값사용여부
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 9d7daf72..8200d85c 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -11,7 +11,7 @@
    -
  • 코드관리
    • +
  • 코드관리
  • 메뉴관리
  • 외사경찰관리
  • 권한설정
    • diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index 739ead4c..6df56c1d 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -12,45 +12,219 @@
    -
    +
    +
    +
    +
    목록1
    +
    +
    +
    - 목록1 + + + + + + + + + + + + + + + + + + + + + + + +
    제목12022-08-19
    제목22022-08-19
    제목32022-08-19
    제목42022-08-19
    제목52022-08-19
    -
    +
    +
    +
    +
    목록2
    +
    +
    +
    - 목록2 + + + + + + + + + + + + + + + + + + + + + + + +
    제목12022-08-19
    제목22022-08-19
    제목32022-08-19
    제목42022-08-19
    제목52022-08-19
    -
    +
    +
    +
    +
    목록3
    +
    +
    +
    - 목록3 + + + + + + + + + + + + + + + + + + + + + + + +
    제목12022-08-19
    제목22022-08-19
    제목32022-08-19
    제목42022-08-19
    제목52022-08-19
    -
    +
    +
    +
    +
    목록4
    +
    +
    +
    - 목록4 + + + + + + + + + + + + + + + + + + + + + + + +
    제목12022-08-19
    제목22022-08-19
    제목32022-08-19
    제목42022-08-19
    제목52022-08-19
    -
    +
    +
    +
    +
    목록5
    +
    +
    +
    - 목록5 + + + + + + + + + + + + + + + + + + + + + + + +
    제목12022-08-19
    제목22022-08-19
    제목32022-08-19
    제목42022-08-19
    제목52022-08-19
    -
    +
    +
    +
    +
    목록6
    +
    +
    +
    - 목록6 + + + + + + + + + + + + + + + + + + + + + + + +
    제목12022-08-19
    제목22022-08-19
    제목32022-08-19
    제목42022-08-19
    제목52022-08-19