From 5f72e43ca1b09d38e68c5f5744a44075b1f17d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 2 Jan 2024 18:02:31 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EC=BD=94=EB=93=9C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/config/BaseCodeMgt.jsx | 6 +- .../admin/config/baseCode/ParentCodeDiv.jsx | 32 +++++++++- .../admin/config/AdminConfigController.java | 63 +++++++++++++++++++ .../admin/config/entity/TcCodeGrp.java | 40 ++++++++++++ .../admin/config/entity/TcCodeItem.java | 52 +++++++++++++++ .../config/mapper/AdminConfigMapper.java | 7 +++ .../repository/TcCodeGrpRepository.java | 7 +++ .../repository/TcCodeItemRepository.java | 10 +++ .../config/service/AdminConfigService.java | 29 +++++++++ .../config/security/SecurityConfig.java | 1 + .../service/StandardCodeService.java | 1 - .../mybatisMapper/AdminConfigMapper.xml | 6 ++ 12 files changed, 246 insertions(+), 8 deletions(-) create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeGrp.java create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeItem.java create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/mapper/AdminConfigMapper.java create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeGrpRepository.java create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeItemRepository.java create mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java create mode 100644 kcsc-back-end/src/main/resources/mybatisMapper/AdminConfigMapper.xml diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/BaseCodeMgt.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/BaseCodeMgt.jsx index 4098489..b0e2b36 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/config/BaseCodeMgt.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/BaseCodeMgt.jsx @@ -28,10 +28,9 @@ function BaseCodeMgt(props) { {/* */}
-

사이트관리

+

기본 코드 관리

-

기본 코드 관리

@@ -40,9 +39,6 @@ function BaseCodeMgt(props) { -
- -
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx index 0bd736b..ea01938 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx @@ -1,10 +1,38 @@ +import React, { useState, useEffect, useCallback } from 'react'; import {Container} from "react-bootstrap"; import Row from "react-bootstrap/Row"; import Col from "react-bootstrap/Col"; import Form from 'react-bootstrap/Form' import Button from "react-bootstrap/Button"; +import * as EgovNet from "api/egovFetch"; + +function ParentCodeDiv(props){ + + const [codeGrpRow, setCodeGrpRow] = useState(); + + function getCodeGrp(){ + EgovNet.requestFetch( + '/admin/config/code-grp', + { + method: "GET", + headers: { + 'Content-type': 'application/json' + }, + body: JSON.stringify({}) + }, + (resp) => { + debugger + }, + function (resp) { + console.log("err response : ", resp); + } + ); + } + + useEffect(() => { + getCodeGrp(); + }, []); -function ParentCodeDiv(){ return ( @@ -13,7 +41,7 @@ function ParentCodeDiv(){ 삭제 수정 - {} + {codeGrpRow} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java new file mode 100644 index 0000000..abbe984 --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/AdminConfigController.java @@ -0,0 +1,63 @@ +package com.dbnt.kcscbackend.admin.config; + +import com.dbnt.kcscbackend.admin.config.entity.TcCodeGrp; +import com.dbnt.kcscbackend.admin.config.service.AdminConfigService; +import com.dbnt.kcscbackend.config.common.BaseController; +import com.dbnt.kcscbackend.config.common.ResultVO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/config") +@Tag(name="AdminConfigController", description = "사이트관리 환결설정 메뉴 컨트롤러") +public class AdminConfigController extends BaseController { + + private final AdminConfigService adminConfigService; + + @Operation( + summary = "기본코드 그룹 조회", + description = "기본코드 그룹 조회", + tags = {"AdminConfigController"} + ) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "조회 성공"), + @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님") + }) + @RequestMapping(method = RequestMethod.GET, value = "/code-grp", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResultVO getCodeGrp() throws Exception{ + ResultVO resultVO = new ResultVO(); + Map resultMap = new HashMap<>(); + resultMap.put("codeGrpList", adminConfigService.selectCodeGrpList()); + resultVO.setResult(resultMap); + return resultVO; + } + + @Operation( + summary = "기본코드 아이템 조회", + description = "기본코드 아이템 조회", + tags = {"AdminConfigController"} + ) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "조회 성공"), + @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님") + }) + @RequestMapping(method = RequestMethod.GET, value = "/code-item", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResultVO getCodeItem(TcCodeGrp param) throws Exception{ + ResultVO resultVO = new ResultVO(); + Map resultMap = new HashMap<>(); + resultMap.put("codeItemList", adminConfigService.selectCodeItemList(param.getGrpCd())); + resultVO.setResult(resultMap); + return resultVO; + } +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeGrp.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeGrp.java new file mode 100644 index 0000000..b3255b3 --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeGrp.java @@ -0,0 +1,40 @@ +package com.dbnt.kcscbackend.admin.config.entity; + +import lombok.Getter; +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.time.LocalDateTime; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "tc_code_grp") +public class TcCodeGrp { + @Id + @Column(name = "grp_cd") + private String grpCd; + @Column(name = "grp_cd_nm") + private String grpCdNm; + @Column(name = "grp_cd_desc") + private String grpCdDesc; + @Column(name = "frst_crt_id") + private String frstCrtId; + @Column(name = "frst_crt_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime frstCrtDt; + @Column(name = "last_chg_id") + private String lastChgId; + @Column(name = "last_chg_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime lastChgDt; + @Column(name = "use_yn") + private String useYn; +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeItem.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeItem.java new file mode 100644 index 0000000..f263d04 --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcCodeItem.java @@ -0,0 +1,52 @@ +package com.dbnt.kcscbackend.admin.config.entity; + +import lombok.*; +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.LocalDateTime; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "tc_code_item") +@IdClass(TcCodeItem.TcCodeItemId.class) +public class TcCodeItem { + @Id + @Column(name = "item_cd") + private String itemCd; + @Id + @Column(name = "grp_cd") + private String grpCd; + @Column(name = "item_nm") + private String itemNm; + @Column(name = "frst_crt_id") + private String frstCrtId; + @Column(name = "frst_crt_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime frstCrtDt; + @Column(name = "last_chg_id") + private String lastChgId; + @Column(name = "last_chg_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime lastChgDt; + @Column(name = "use_yn") + private String useYn; + @Column(name = "grp_order") + private Integer grpOrder; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class TcCodeItemId implements Serializable { + private String itemCd; + private String grpCd; + } +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/mapper/AdminConfigMapper.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/mapper/AdminConfigMapper.java new file mode 100644 index 0000000..42b97a3 --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/mapper/AdminConfigMapper.java @@ -0,0 +1,7 @@ +package com.dbnt.kcscbackend.admin.config.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdminConfigMapper { +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeGrpRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeGrpRepository.java new file mode 100644 index 0000000..6f9598b --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeGrpRepository.java @@ -0,0 +1,7 @@ +package com.dbnt.kcscbackend.admin.config.repository; + +import com.dbnt.kcscbackend.admin.config.entity.TcCodeGrp; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TcCodeGrpRepository extends JpaRepository { +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeItemRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeItemRepository.java new file mode 100644 index 0000000..5a4744e --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TcCodeItemRepository.java @@ -0,0 +1,10 @@ +package com.dbnt.kcscbackend.admin.config.repository; + +import com.dbnt.kcscbackend.admin.config.entity.TcCodeItem; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface TcCodeItemRepository extends JpaRepository { + List findByGrpCdOrderByGrpOrder(String grpCd); +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java new file mode 100644 index 0000000..d7833d0 --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java @@ -0,0 +1,29 @@ +package com.dbnt.kcscbackend.admin.config.service; + +import com.dbnt.kcscbackend.admin.config.entity.TcCodeGrp; +import com.dbnt.kcscbackend.admin.config.entity.TcCodeItem; +import com.dbnt.kcscbackend.admin.config.mapper.AdminConfigMapper; +import com.dbnt.kcscbackend.admin.config.repository.TcCodeGrpRepository; +import com.dbnt.kcscbackend.admin.config.repository.TcCodeItemRepository; +import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class AdminConfigService extends EgovAbstractServiceImpl { + + private final TcCodeGrpRepository codeGrpRepository; + private final TcCodeItemRepository codeItemRepository; + private final AdminConfigMapper adminConfigMapper; + + public List selectCodeGrpList(){ + return codeGrpRepository.findAll(); + } + + public List selectCodeItemList(String grpCd){ + return codeItemRepository.findByGrpCdOrderByGrpOrder(grpCd); + } +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/SecurityConfig.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/SecurityConfig.java index 7cf7951..267ccf7 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/SecurityConfig.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/SecurityConfig.java @@ -66,6 +66,7 @@ public class SecurityConfig { "/auth/join",//회원가입 "/auth/findId", // id 찾기 "/auth/findPw", // pw 찾기 + "/cmm/main/**.do", // 메인페이지 "/cmm/fms/FileDown.do", //파일 다운로드 "/cmm/fms/getImage.do", //갤러리 이미지보기 diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java index e76b145..8857d2e 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java @@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service -@Transactional @RequiredArgsConstructor public class StandardCodeService extends EgovAbstractServiceImpl { diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/AdminConfigMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/AdminConfigMapper.xml new file mode 100644 index 0000000..ec20005 --- /dev/null +++ b/kcsc-back-end/src/main/resources/mybatisMapper/AdminConfigMapper.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file