From 9020ee17e34d0b6da51a01d873e6b3ff17c06615 Mon Sep 17 00:00:00 2001 From: "DESKTOP-NQTA8OG\\lcks0" Date: Tue, 6 Sep 2022 18:01:45 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=EC=9A=B4=EC=98=81=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=20=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 41f86bc8fa971ca7ddde3d3d9c72a23f57d0b0e9. --- .../java/com/dbnt/faisp/config/BaseBoard.java | 24 ------- .../com/dbnt/faisp/config/SecurityConfig.java | 3 +- .../faisp/controller/FpiMgtController.java | 29 +------- .../fpiMgt/monthPlan/MonthPlanService.java | 17 +---- .../fpiMgt/monthPlan/model/BoardPlan.java | 40 +++++------ .../fpiMgt/monthPlan/model/PlanFile.java | 50 +++++++------ .../fpiMgt/monthPlan/model/PlanMainInfo.java | 44 +++++++----- .../repository/BoardPlanRepository.java | 9 --- .../repository/PlanFileRepository.java | 11 --- .../repository/PlanMainInfoRepository.java | 11 --- .../js/igActivities/fpiMgt/monthPlan.js | 72 ------------------- .../fpiMgt/monthPlan/monthPlan.html | 57 +++++++++++---- .../fpiMgt/monthPlan/planEditModal.html | 46 ------------ .../resources/templates/layout/layout.html | 2 +- 14 files changed, 117 insertions(+), 298 deletions(-) delete mode 100644 src/main/java/com/dbnt/faisp/config/BaseBoard.java delete mode 100644 src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/BoardPlanRepository.java delete mode 100644 src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanFileRepository.java delete mode 100644 src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanMainInfoRepository.java delete mode 100644 src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js delete mode 100644 src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html diff --git a/src/main/java/com/dbnt/faisp/config/BaseBoard.java b/src/main/java/com/dbnt/faisp/config/BaseBoard.java deleted file mode 100644 index 8b0c8a43..00000000 --- a/src/main/java/com/dbnt/faisp/config/BaseBoard.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.dbnt.faisp.config; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Transient; -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -public class BaseBoard extends BaseModel { - - @Column(name = "wrt_organ") - private String wrtOrgan; - @Column(name = "wrt_nm") - private String wrtNm; - @Column(name = "wrt_dt") - private LocalDateTime wrtDt; - -} diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 0acc055d..e6a58aef 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -61,8 +61,7 @@ public class SecurityConfig{ http.authorizeRequests() // 페이지 권한 설정 .antMatchers( "/dashboard", - "/refreshSession", - "/fpiMgt/**" + "/refreshSession" ).hasRole(Role.USER.name()) // USER, ADMIN 접근 허용 .antMatchers( "/codeMgt/**", diff --git a/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java b/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java index 8f54df4d..47b18356 100644 --- a/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java +++ b/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java @@ -5,13 +5,11 @@ import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - @RestController @RequiredArgsConstructor @RequestMapping("/fpiMgt") @@ -29,25 +27,4 @@ public class FpiMgtController { // 외사경찰견문관리 mav.addObject("searchParams", boardPlan); return mav; } - - @GetMapping("/planEditModal") - public ModelAndView planEditModal(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/planEditModal"); - if(boardPlan.getPlanKey()!=null){ - boardPlan = monthPlanService.selectBoardPlan(boardPlan.getPlanKey()); - }else{ - boardPlan.setWrtOrgan(loginUser.getOgCd()); - boardPlan.setWrtNm(loginUser.getUserNm()); - boardPlan.setWrtDt(LocalDateTime.now()); - } - mav.addObject("plan", boardPlan); - return mav; - } - - @PostMapping("/savePlan") - public Integer savePlan(BoardPlan boardPlan, - @RequestParam(value = "planInfos", required = false) List planInfos, - @RequestParam(value = "detailPlanInfos", required = false)List detailPlanInfos){ - return 0; - } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java index bb4e0ec5..e5616b3e 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java @@ -1,25 +1,10 @@ package com.dbnt.faisp.fpiMgt.monthPlan; -import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; -import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanFile; -import com.dbnt.faisp.fpiMgt.monthPlan.repository.BoardPlanRepository; -import com.dbnt.faisp.fpiMgt.monthPlan.repository.PlanFileRepository; -import com.dbnt.faisp.fpiMgt.monthPlan.repository.PlanMainInfoRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor -public class MonthPlanService { - private final BoardPlanRepository boardPlanRepository; - private final PlanFileRepository planFileRepository; - private final PlanMainInfoRepository planMainInfoRepository; - - public BoardPlan selectBoardPlan(Integer planKey) { - BoardPlan savedPlan = boardPlanRepository.findById(planKey).orElse(null); - savedPlan.setFileList(planFileRepository.findByPlanKey(planKey)); - savedPlan.setMainInfoList(planMainInfoRepository.findByPlanKey(planKey)); - return savedPlan; - } +public class MonthPlanService { // 월간계획 } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java index 74045e72..36e83225 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java @@ -1,6 +1,6 @@ package com.dbnt.faisp.fpiMgt.monthPlan.model; -import com.dbnt.faisp.config.BaseBoard; +import com.dbnt.faisp.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -8,7 +8,6 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import java.time.LocalDate; import java.util.List; @Getter @@ -18,33 +17,28 @@ import java.util.List; @DynamicInsert @DynamicUpdate @Table(name = "board_plan") -public class BoardPlan extends BaseBoard { +public class BoardPlan extends BaseModel { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "plan_key") private Integer planKey; - @Column(name = "plan_state") - private String planState; - @Column(name = "content_title") - private String contentTitle; - @Column(name = "plan_dt") - private LocalDate planDt; - @Column(name = "section_nm") - private String sectionNm; - @Column(name = "section_apprv") - private String sectionApprv; - @Column(name = "section_etc") - private String sectionEtc; - @Column(name = "head_nm") - private String headNm; - @Column(name = "head_apprv") - private String headApprv; - @Column(name = "head_etc") - private String headEtc; + @Column(name = "cat1_cd") + private String cat1Cd; + @Column(name = "cat2_cd") + private String cat2Cd; + @Column(name = "cat3_cd") + private String cat3Cd; + @Column(name = "menu_url") + private String menuUrl; + @Column(name = "approval_chk") + private String approvalChk; @Transient - private List mainInfoList; + private List childList; + @Transient - private List fileList; + private Integer cat1RowspanCnt; + @Transient + private Integer cat2RowspanCnt; } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanFile.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanFile.java index a412f390..e5635317 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanFile.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanFile.java @@ -1,11 +1,14 @@ package com.dbnt.faisp.fpiMgt.monthPlan.model; -import lombok.*; +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.*; -import java.io.Serializable; +import java.util.List; @Getter @Setter @@ -13,34 +16,29 @@ import java.io.Serializable; @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "plan_file") -@IdClass(PlanFile.PlanFileId.class) -public class PlanFile{ +@Table(name = "board_plan") +public class PlanFile extends BaseModel { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "plan_key") private Integer planKey; - @Id - @Column(name = "file_seq") - private Integer fileSeq; - @Column(name = "orig_nm") - private String origNm; - @Column(name = "conv_nm") - private String convNm; - @Column(name = "file_extn") - private String fileExtn; - @Column(name = "file_size") - private Integer fileSize; - @Column(name = "save_path") - private String savePath; + @Column(name = "cat1_cd") + private String cat1Cd; + @Column(name = "cat2_cd") + private String cat2Cd; + @Column(name = "cat3_cd") + private String cat3Cd; + @Column(name = "menu_url") + private String menuUrl; + @Column(name = "approval_chk") + private String approvalChk; + @Transient + private List childList; - @Embeddable - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class PlanFileId implements Serializable { - private Integer planKey; - private Integer fileSeq; - } + @Transient + private Integer cat1RowspanCnt; + @Transient + private Integer cat2RowspanCnt; } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanMainInfo.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanMainInfo.java index 950b562a..6e793293 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanMainInfo.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanMainInfo.java @@ -1,11 +1,14 @@ package com.dbnt.faisp.fpiMgt.monthPlan.model; -import lombok.*; +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.*; -import java.io.Serializable; +import java.util.List; @Getter @Setter @@ -14,25 +17,28 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "board_plan") -@IdClass(PlanMainInfo.PlanMainInfoId.class) -public class PlanMainInfo { +public class PlanMainInfo extends BaseModel { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "plan_key") private Integer planKey; - @Id - @Column(name = "plan_seq") - private Integer planSeq; - @Column(name = "plan_type") - private String planType; - @Column(name = "plan_info") - private String planInfo; + @Column(name = "cat1_cd") + private String cat1Cd; + @Column(name = "cat2_cd") + private String cat2Cd; + @Column(name = "cat3_cd") + private String cat3Cd; + @Column(name = "menu_url") + private String menuUrl; + @Column(name = "approval_chk") + private String approvalChk; + + @Transient + private List childList; + + @Transient + private Integer cat1RowspanCnt; + @Transient + private Integer cat2RowspanCnt; - @Embeddable - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class PlanMainInfoId implements Serializable { - private Integer planKey; - private Integer planSeq; - } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/BoardPlanRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/BoardPlanRepository.java deleted file mode 100644 index 0c163952..00000000 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/BoardPlanRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.dbnt.faisp.fpiMgt.monthPlan.repository; - -import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; -import org.springframework.data.jpa.repository.JpaRepository; - - -public interface BoardPlanRepository extends JpaRepository { - -} diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanFileRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanFileRepository.java deleted file mode 100644 index 908e11bf..00000000 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanFileRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.dbnt.faisp.fpiMgt.monthPlan.repository; - -import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanFile; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - - -public interface PlanFileRepository extends JpaRepository { - List findByPlanKey(Integer planKey); -} diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanMainInfoRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanMainInfoRepository.java deleted file mode 100644 index 7aeb5f5b..00000000 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanMainInfoRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.dbnt.faisp.fpiMgt.monthPlan.repository; - -import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanMainInfo; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - - -public interface PlanMainInfoRepository extends JpaRepository { - List findByPlanKey(Integer planKey); -} diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js b/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js deleted file mode 100644 index 86bea80a..00000000 --- a/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js +++ /dev/null @@ -1,72 +0,0 @@ - -$(document).on('click', '#addPlanBtn', function (){ - $.ajax({ - url: '/fpiMgt/planEditModal', - data: {planKey: null}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#planEditBody").empty().append(html) - $("#planEditModal").modal('show'); - $("#planDt").datepicker({ - format: "yyyy-mm-dd", - language: "ko" - }); - }, - error:function(){ - - } - }); -}) - -$(document).on('click', '#planAddBtn', function (){ - $("#planDiv").append("") -}) - -$(document).on('click', '#detailPlanAddBtn', function (){ - const detailPlanDiv = $("#detailPlanDiv"); - detailPlanDiv.append(""); - const lastAppendTextarea = detailPlanDiv.children()[detailPlanDiv.children().length-1]; - $(lastAppendTextarea).summernote({ - lang:'ko-KR', - height: 120, - disableDragAndDrop: true, - toolbar: [ - ['style', ['style']], - ['font', ['bold', 'underline', 'clear']], - ['color', ['color']], - ['para', ['ul', 'ol', 'paragraph']], - ['table', ['table']] - ] - }); -}) - -$(document).on('click', '#savePlanBtn', function (){ - savePlan('S') -}) -$(document).on('click', '#saveTempBtn', function (){ - savePlan('T') -}) - -function savePlan(planState){ - if(confirm("저장하시겠습니까?")){ - $("#planState").val(planState); - contentFade("in"); - const formData = new FormData($("#planEditForm")[0]); - $.ajax({ - type : 'POST', - data : formData, - url : "/fpiMgt/savePlan", - processData: false, - contentType: false, - success : function(result) { - debugger - contentFade("out"); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) - } -} \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html index 5cb905b7..57374427 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +
@@ -26,7 +26,7 @@
- +
@@ -49,7 +49,9 @@
-
+
+ +
- +
@@ -88,20 +90,51 @@ -