DBNT
/
kcscDev
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev into thkim

thkim
thkim 2024-03-11 09:39:57 +09:00
parent 4d60a15104 bfef1ce1a8
commit 11ca97d87c
17 changed files with 453 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
egovframe-template-simple-react-contribution/src/components/EgovHeader.jsx
View File

@ -1,4 +1,4 @@
import React, {useState} from 'react';
import React, {useEffect, useState} from 'react';
import { Link, NavLink, useNavigate } from 'react-router-dom';
import * as EgovNet from 'api/egovFetch';
@ -64,6 +64,9 @@ function EgovHeader({ loginUser, onChangeLogin }) {
console.log("------------------------------EgovHeader [End]");
console.groupEnd("EgovHeader");
useEffect(() => {
setMenuDiv(false);
}, [navigate]);
return (

104
egovframe-template-simple-react-contribution/src/pages/admin/board/AdminPostMgtEdit.jsx
View File

@ -1,4 +1,4 @@
import React, {useState, useEffect, useRef} from 'react';
import React, {useState, useEffect, useRef, useCallback} from 'react';
import {Link, useNavigate, useLocation, useParams} from 'react-router-dom';
import Modal from "react-bootstrap/Modal";
@ -9,6 +9,7 @@ import CODE from 'constants/code';
import {default as EgovLeftNav} from 'components/leftmenu/EgovLeftNavAdmin';
import EgovRadioButtonGroup from 'components/EgovRadioButtonGroup';
import {Form} from "react-bootstrap";
import RichTextEditor from "../../../components/editor/RichTextEditor";
function AdminPostMgtEdit({props, reloadFunction}) {
@ -30,7 +31,33 @@ function AdminPostMgtEdit({props, reloadFunction}) {
const [boardDetail, setBoardDetail] = useState({});
console.log("@@@ mode : " + modeInfo.mode);
const [categoryList, setCategoryList] = useState([]);
const retrieveList = useCallback(() => {
const retrieveListURL = '/admin/boards/get-category-list';
const requestOptions = {
method: "GET",
headers: {
'Content-type': 'application/json',
},
body: JSON.stringify()
}
EgovNet.requestFetch(retrieveListURL,
requestOptions,
(resp) => {
setCategoryList(resp.result.categoryList);
console.log("@@@ categoryList : " + JSON.stringify(resp.result.categoryList));
},
function (resp) {
console.log("err response : ", resp);
}
);
},[]);
useEffect(() => {
retrieveList();
initMode();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
@ -41,22 +68,24 @@ function AdminPostMgtEdit({props, reloadFunction}) {
}
}
function editPartnerSite(e) {
function editPost(e) {
e.preventDefault();
e.stopPropagation();
const form = e.target;
const info = {
siteTitle: form.siteTitle.value,
siteUrl: form.siteUrl.value,
fixedYn: defaultFixedYn,
secretYn: defaultSecretYn,
bbsId: form.bbsId.value,
bbsSeq: selectedBbsSeq,
bbsContTitle: form.bbsContTitle.value,
fileGrpId: form.fileGrpId.value,
siteOrder: form.siteOrder.value,
useYn: form.useYn.value
bbsContents: text
}
if (modeInfo.mode === CODE.MODE_MODIFY) {
info.siteSeq = props.siteSeq;
info.bbsContSeq = props.bbsContSeq;
}
EgovNet.requestFetch(
'/admin/config/partner-site-mgt',
'/admin/boards/post-mgt',
{
method: "PUT",
headers: {
@ -77,16 +106,16 @@ function AdminPostMgtEdit({props, reloadFunction}) {
)
}
function deletePartnerSite(partnerSite){
function deletePost(post){
if(window.confirm("삭제하시겠습니까?")) {
EgovNet.requestFetch(
'/admin/config/partner-site-mgt',
'/admin/boards/post-mgt',
{
method: "DELETE",
headers: {
'Content-type': 'application/json'
},
body: JSON.stringify(partnerSite)
body: JSON.stringify(post)
},
(resp) => {
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
@ -106,9 +135,25 @@ function AdminPostMgtEdit({props, reloadFunction}) {
console.groupEnd("AdminPostMgtEdit");
const [defaultFixedYn, setDefaultFixedYn] = useState(props?.fixedYn || "N");
const [defaultSecretYn, setDefaultSecretYn] = useState(props?.secretYn || "N");
const [text, setText] = useState(props?.bbsContents);
const [selectedBbsSeq, setSelectedBbsSeq] = useState(null);
const handleSelectChange = (e) => {
const selectedBbsId = e.target.value;
const selectedOption = categoryList.find((item) => item.bbsId === selectedBbsId);
setSelectedBbsSeq(selectedOption.bbsSeq);
}
return (
<>
<style>
{`
.modal-dialog {
max-width: 50%;
}
`}
</style>
{/* <!-- 본문 --> */}
<Modal.Header closeButton>
<Modal.Title>
@ -119,13 +164,13 @@ function AdminPostMgtEdit({props, reloadFunction}) {
<Modal.Body>
<div className="board_view2">
<Form onSubmit={(e) => {editPartnerSite(e)}} noValidate>
<Form onSubmit={(e) => {editPost(e)}} noValidate>
<dl>
<dt><label htmlFor="siteTitle">상단고정</label><span className="req">필수</span></dt>
<dd>
<Form.Check
type="checkbox"
id="siteTitleCheckbox"
id="fixedYnCheckbox"
label="상단고정"
checked={defaultFixedYn === 'Y'}
onChange={(e) => setDefaultFixedYn(e.target.checked ? 'Y' : 'N')}
@ -135,29 +180,44 @@ function AdminPostMgtEdit({props, reloadFunction}) {
<dl>
<dt><label htmlFor="siteTitle">비밀글</label><span className="req">필수</span></dt>
<dd>
<Form.Control className="f_input2 w_full" type="text" name="siteTitle" placeholder="비밀글" required
defaultValue={props?.siteTitle} readOnly={props!==undefined}/>
<Form.Check
type="checkbox"
id="secretYnCheckbox"
label="비밀글"
checked={defaultSecretYn === 'Y'}
onChange={(e) => setDefaultSecretYn(e.target.checked ? 'Y' : 'N')}
/>
</dd>
</dl>
<dl>
<dt><label htmlFor="siteTitle">카테고리</label><span className="req">필수</span></dt>
<dd>
<Form.Select id="select1" name="bbsId" onChange={handleSelectChange}>
<option value="">선택</option>
{categoryList.map((item) => (
<option key={item.bbsSeq} value={item.bbsId} selected={props?.bbsId === item.bbsId}>{item.bbsTitle}</option>
))}
</Form.Select>
</dd>
</dl>
<dl>
<dt><label htmlFor="siteTitle">제목</label><span className="req">필수</span></dt>
<dd>
<Form.Control className="f_input2 w_full" type="text" name="siteTitle" placeholder="제목" required
defaultValue={props?.siteTitle} readOnly={props!==undefined}/>
<Form.Control className="f_input2 w_full" type="text" name="bbsContTitle" placeholder="제목" required
defaultValue={props?.bbsContTitle}/>
</dd>
</dl>
<dl>
<dt><label htmlFor="siteUrl">파일</label><span className="req">필수</span></dt>
<dd>
<Form.Control className="f_input2 w_full" type="text" name="siteUrl" placeholder="파일" required
defaultValue={props?.siteUrl}/>
<Form.Control className="f_input2 w_full" type="text" name="fileGrpId" placeholder="파일" required
defaultValue={props?.fileGrpId}/>
</dd>
</dl>
<dl>
<dt><label htmlFor="fileGrpId">내용</label><span className="req">필수</span></dt>
<dd>
<Form.Control className="f_txtar w_full" type="text" name="fileGrpId" placeholder="내용" required
defaultValue={props?.fileGrpId}/>
<RichTextEditor item={text} setText={setText}/>
</dd>
</dl>
@ -167,7 +227,7 @@ function AdminPostMgtEdit({props, reloadFunction}) {
<button type="submit" className="btn btn_skyblue_h46 w_100">저장
</button>
{modeInfo.mode === CODE.MODE_MODIFY &&
<button type={"button"} className="btn btn_skyblue_h46 w_100" onClick={()=>{deletePartnerSite(props)}}>삭제</button>
<button type={"button"} className="btn btn_skyblue_h46 w_100" onClick={()=>{deletePost(props)}}>삭제</button>
}
</div>

18
egovframe-template-simple-react-contribution/src/pages/admin/board/AdminPostMgtList.jsx
View File

@ -12,6 +12,7 @@ import CODE from "../../../constants/code";
import AboutSiteModal from "../config/aboutSiteMgt/AboutSiteModal";
import AdminPostMgtEdit from "./AdminPostMgtEdit";
import Modal from "react-bootstrap/Modal";
import {format} from "date-fns";
function AdminPostMgtList(props) {
console.group("EgovAdminPostList");
@ -36,6 +37,7 @@ function AdminPostMgtList(props) {
const handleShow = () => setShow(true);
const retrieveList = useCallback(() => {
handleClose();
console.groupCollapsed("EgovAdminPostList.retrieveList()");
const retrieveListURL = '/admin/boards/post-list';
@ -60,15 +62,18 @@ function AdminPostMgtList(props) {
// 리스트 항목 구성
resp.result.postList.forEach(function (item, index) {
if (index === 0) mutListTag = []; // 목록 초기화
const finalModifiedDate = item.lastChgDt ? item.lastChgDt : item.frstCrtDt;
const formattedDate = finalModifiedDate ? format(finalModifiedDate, "yyyy-MM-dd HH:mm") : "";
mutListTag.push(
<div className="list_item">
<div>{item.bbsContSeq}</div>
<div>{item.bbsSeq}</div>
<div></div>
<div>{item.bbsContTitle}</div>
<div>{item.bbsContents}</div>
<div>{item.frstCrtId}</div>
<div>{formattedDate}</div>
<div>{item.bbsReadCnt}</div>
<div>{item.bbsContLevel}</div>
<div>{item.fileGrpId}</div>
<div><button className={"btn btn_blue_h31 px-1"} onClick={()=>{editPost(item)}}>수정</button></div>
</div>
);
});
@ -153,9 +158,6 @@ function AdminPostMgtList(props) {
}}>조회</button>
</span>
</li>
<li>
<Link to={URL.ADMIN_BOARD_CREATE} className="btn btn_blue_h46 pd35">등록</Link>
</li>
</ul>
</div>
{/* <!--// 검색조건 --> */}
@ -166,7 +168,7 @@ function AdminPostMgtList(props) {
<span></span>
<span>제목</span>
<span>작성자</span>
<span>작성일</span>
<span>최종수정일</span>
<span>조회수</span>
<span>파일</span>
<span><button className={"btn btn_blue_h31 px-1"} onClick={()=>{editPost(undefined)}}>추가</button></span>

6
egovframe-template-simple-react-contribution/src/pages/admin/board/EgovAdminBoardEdit.jsx
View File

@ -191,7 +191,7 @@ function EgovAdminBoardEdit({props, reloadFunction}) {
<dd>
<Form.Check
type="checkbox"
id="siteTitleCheckbox"
id="bbsAnsYnCheckbox"
label="사용"
checked={bbsAnsYn === 'Y'}
onChange={(e) => setBbsAnsYn(e.target.checked ? 'Y' : 'N')}
@ -203,7 +203,7 @@ function EgovAdminBoardEdit({props, reloadFunction}) {
<dd>
<Form.Check
type="checkbox"
id="siteTitleCheckbox"
id="bbsReplYnCheckbox"
label="사용"
checked={bbsReplYn === 'Y'}
onChange={(e) => setBbsReplYn(e.target.checked ? 'Y' : 'N')}
@ -215,7 +215,7 @@ function EgovAdminBoardEdit({props, reloadFunction}) {
<dd>
<Form.Check
type="checkbox"
id="siteTitleCheckbox"
id="useYnCheckbox"
label="사용"
checked={useYn === 'Y'}
onChange={(e) => setUseYn(e.target.checked ? 'Y' : 'N')}

35
egovframe-template-simple-react-contribution/src/pages/admin/contents/Survey.jsx
View File

@ -1,13 +1,13 @@
import React, {useCallback, useEffect, useState} from 'react';
import { Link } from 'react-router-dom';
import URL from 'constants/url';
import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin';
import * as EgovNet from "../../../api/egovFetch";
import * as EgovNet from "api/egovFetch";
import Modal from "react-bootstrap/Modal";
import Form from "react-bootstrap/Form";
import SurveyModal from "./survey/SurveyModal";
import QuestionModal from "./survey/QuestionModal";
import CODE from "../../../constants/code";
function Survey({}) {
@ -38,15 +38,12 @@ function Survey({}) {
<div>{item.svyTitle}</div>
<div>{item.svyStartDt}~{item.svyEndDt}</div>
<div><button className={"btn btn_blue_h31 px-1"} onClick={()=>{editSurveyQt(item)}}>질문관리</button></div>
<div></div>
<div><Form.Check type={"switch"} defaultChecked={item.useYn==="Y"} onChange={()=>editUseYn(item.svySeq)}/></div>
<div><button className={"btn btn_blue_h31 px-1"}>설문지 보기</button></div>
<div><button className={"btn btn_blue_h31 px-1"}>통계 보기</button></div>
<div>
<button className={"btn btn_blue_h31 px-1"} onClick={()=>{editSurvey(item)}}>수정</button>
</div>
<div>
<button className={"btn btn_red_h31 px-1"} onClick={()=>{editSurvey(item)}}>삭제</button>
</div>
</div>
);
});
@ -59,6 +56,29 @@ function Survey({}) {
);
},[]);
function editUseYn(svySeq){
EgovNet.requestFetch(
'/admin/survey/info-use-yn',
{
method: "PUT",
headers: {
'Content-type': 'application/json'
},
body: JSON.stringify({svySeq:svySeq})
},
(resp) => {
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
alert("저장되었습니다.")
retrieveList();
}else{
alert(resp.resultMessage)
}
}
)
}
function editSurvey(item){
handleShow();
setModalSize("md")
@ -103,7 +123,6 @@ function Survey({}) {
<span>사용여부</span>
<span>설문지 보기</span>
<span>통계 보기</span>
<span></span>
<span><button className={"btn btn_blue_h31 px-1"} onClick={()=>{editSurvey(undefined)}}>추가</button></span>
</div>
<div className="result">

47
egovframe-template-simple-react-contribution/src/pages/admin/contents/survey/QuestionModal.jsx
View File

@ -10,10 +10,11 @@ function QuestionModal({svySeq}){
const [qtList, setQtList] = useState([]);
const [selectedQt, setSelectedQt] = useState(null);
const [tempSeq, setTempSeq] = useState(1);
function getSurveyQt(){
EgovNet.requestFetch(
'/admin/survey/edit-qt?svySeq='+svySeq,
'/admin/survey/info-qt?svySeq='+svySeq,
{
method: "GET"
},
@ -27,7 +28,20 @@ function QuestionModal({svySeq}){
}
function addQt(){
const temp = [...qtList]
temp.push({
qtSeq: null,
tempSeq: tempSeq,
svySeq: svySeq,
qtTitle: '',
qtDesc: '',
qtType: '',
maxNo: '',
etcYn: '',
itemList:[]
})
setQtList(temp);
setTempSeq(tempSeq+1);
}
function addItem(){
@ -42,6 +56,20 @@ function QuestionModal({svySeq}){
getSurveyQt()
}, []);
useEffect(() => {
const tempQt = [...qtList];
tempQt.forEach(function (qt, index){
if(qt.qtSeq === null){
if(qt.tempSeq === selectedQt.tempSeq){
qt = selectedQt;
}
}else if(qt.qtSeq === selectedQt.qtSeq){
qt = selectedQt;
}
})
setQtList(tempQt);
}, [selectedQt]);
return (
<>
<Modal.Header closeButton>
@ -76,7 +104,7 @@ function QuestionModal({svySeq}){
</tfoot>
</Table>
</Col>
<Col xs={7}>
<Col xs={7} className={selectedQt?"":"d-none"}>
<Form.Group as={Row} className="mb-3">
<Form.Label column sm={3}>
질문유형
@ -93,13 +121,13 @@ function QuestionModal({svySeq}){
최대 선택 개수
</Form.Label>
<Col sm={3}>
<Form.Control type="text" name="maxNo" defaultValue={selectedQt?.maxNo}/>
<Form.Control type="text" name="maxNo" defaultValue={selectedQt?.maxNo} onChange={(e)=>{setSelectedQt({...selectedQt, maxNo:e.target.value})}}/>
</Col>
<Form.Label column sm={'auto'}>
기타 여부
</Form.Label>
<Col sm={3} className={'my-auto'}>
<Form.Check type="checkbox" name="mandatoryYn" checked={selectedQt?.mandatoryYn==='Y'}/>
<Form.Check type="checkbox" name="etcYn" checked={selectedQt?.etcYn==='Y'} onClick={(e)=>{setSelectedQt({...selectedQt, etcYn:e.target.checked?'Y':'N'})}}/>
</Col>
</Form.Group>
<Table>
@ -109,11 +137,16 @@ function QuestionModal({svySeq}){
</tr>
</thead>
<tbody>
{selectedQt?.itemList.map(item=>{
{selectedQt?.itemList.map((item, index)=>{
return (
<tr>
<td>
<Form.Control type={"text"} defaultValue={item.itemNm}/>
<Form.Control type={"text"} defaultValue={item.itemNm} value={item.itemNm}
onChange={(e)=>{
const qt = {...selectedQt}
qt.itemList[index].itemNm = e.target.value
setSelectedQt(qt);
}}/>
</td>
</tr>
);

90
egovframe-template-simple-react-contribution/src/pages/admin/contents/survey/SurveyModal.jsx
View File

@ -1,41 +1,61 @@
import React from "react";
import React, {useEffect, useState} from "react";
import Modal from "react-bootstrap/Modal";
import Form from "react-bootstrap/Form";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import * as EgovNet from "api/egovFetch";
import CODE from "constants/code";
import DatePicker from "react-datepicker";
function SurveyModal({savedInfo, reloadFunction}){
const [survey, setSurvey] = useState({
svySeq: savedInfo?savedInfo.svySeq:null,
svyTitle: savedInfo?savedInfo.svyTitle:'',
svyDesc: savedInfo?savedInfo.svyDesc:'',
svyStartDt: savedInfo?new Date(savedInfo.svyStartDt):new Date(),
svyEndDt: savedInfo?new Date(savedInfo.svyEndDt):new Date(),
})
function editSurvey(e){
e.preventDefault();
e.stopPropagation();
const form = e.target;
const info = {
menuId: form.menuId.value,
menuTitle: form.menuTitle.value,
menuGroup: form.menuGroup.value,
menuLevel: form.menuLevel.value,
menuSort: form.menuSort.value,
menuUrl: form.menuUrl.value,
menuTypeCd: form.menuTypeCd.value,
}
EgovNet.requestFetch(
'/admin/config/menu-mgt',
'/admin/survey/info',
{
method: "PUT",
headers: {
'Content-type': 'application/json'
},
body: JSON.stringify(info)
body: JSON.stringify(survey)
},
(resp) => {
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
alert("저장되었습니다.")
reloadFunction();
}else if(Number(resp.resultCode) === Number(CODE.RCV_ERROR_AUTH)){
console.log("토큰 갱신중.")
}else{
alert(resp.resultMessage)
}
}
)
}
function deleteSurvey(e,svySeq){
e.preventDefault();
e.stopPropagation();
EgovNet.requestFetch(
'/admin/survey/info',
{
method: "DELETE",
headers: {
'Content-type': 'application/json'
},
body: JSON.stringify({svySeq:svySeq})
},
(resp) => {
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
alert("삭제되었습니다.")
reloadFunction();
}else{
alert(resp.resultMessage)
}
@ -57,7 +77,8 @@ function SurveyModal({savedInfo, reloadFunction}){
제목
</Form.Label>
<Col sm={9}>
<Form.Control type="email" name="svyTitle" required defaultValue={savedInfo?.svyTitle} />
<Form.Control type="email" name="svyTitle" required defaultValue={survey.svyTitle}
onChange={(e)=>{setSurvey({...survey, svyTitle:e.target.value})}}/>
</Col>
</Form.Group>
<Form.Group as={Row} className="mb-3">
@ -65,37 +86,38 @@ function SurveyModal({savedInfo, reloadFunction}){
설명
</Form.Label>
<Col sm={9}>
<Form.Control as={"textarea"} name="svyDesc" rows={3} defaultValue={savedInfo?.svyDesc}/>
<Form.Control as={"textarea"} name="svyDesc" rows={3} defaultValue={survey.svyDesc}
onChange={(e)=>{setSurvey({...survey, svyDesc:e.target.value})}}/>
</Col>
</Form.Group>
<Form.Group as={Row} className="mb-3">
<Form.Label column sm={3}>
시작일
설문기간
</Form.Label>
<Col sm={9}>
<Form.Control type="text" name="svyStartDt" required defaultValue={savedInfo?.svyStartDt} />
<DatePicker selectsRange inline format={"yyyy-MM-dd"}
selected={survey.svyEndDt} minDate={new Date()}
startDate={survey.svyStartDt} endDate={survey.svyEndDt}
onChange={(dates)=>{
const [start, end] = dates;
setSurvey({...survey, svyStartDt:start, svyEndDt: end})
}}/>
</Col>
</Form.Group>
<Form.Group as={Row} className="mb-3">
<Form.Label column sm={3}>
종료일
<Form.Label column sm={12}>
* 목록에서 사용 여부를 변경해야 설문이 노출됩니다.
</Form.Label>
<Col sm={9}>
<Form.Control type="text" name="svyEndDt" required defaultValue={savedInfo?.svyEndDt} />
</Col>
</Form.Group>
<Form.Group as={Row} className="mb-3">
<Form.Label column sm={3}>
첨부파일
</Form.Label>
<Col sm={9}>
<Form.Control type="text" name="fileGrpId" selectedValue={savedInfo?.fileGrpId}/>
</Col>
</Form.Group>
<Row className="mb-3">
<Col xs={10}></Col>
{survey.svySeq?
<Col xs={2}>
<button type="submit" className={"btn btn_blue_h31 px-3"}>저장</button>
<button className={"btn btn_red_h31"} onClick={(e)=>{deleteSurvey(e, survey.svySeq)}}>삭제</button>
</Col>
:''}
<Col xs={survey.svySeq?8:10}></Col>
<Col xs={2}>
<button type="submit" className={"btn btn_blue_h31"}>저장</button>
</Col>
</Row>
</Form>

85
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/AdminBoardsController.java
View File

@ -1,6 +1,7 @@
package com.dbnt.kcscbackend.admin.boards;
import com.dbnt.kcscbackend.admin.boards.entity.TnBbs;
import com.dbnt.kcscbackend.admin.boards.entity.TnBbsContents;
import com.dbnt.kcscbackend.admin.boards.service.AdminBoardsService;
import com.dbnt.kcscbackend.admin.config.entity.TcMenu;
import com.dbnt.kcscbackend.auth.entity.LoginVO;
@ -9,6 +10,7 @@ import com.dbnt.kcscbackend.commonCode.service.CommonCodeService;
import com.dbnt.kcscbackend.config.common.BaseController;
import com.dbnt.kcscbackend.config.common.ResponseCode;
import com.dbnt.kcscbackend.config.common.ResultVO;
import com.dbnt.kcscbackend.config.util.ClientUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
@ -23,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.HashMap;
import java.util.Map;
@ -118,7 +122,7 @@ public class AdminBoardsController extends BaseController {
@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
})
@RequestMapping(method = RequestMethod.DELETE, value = "/board-mgt")
public ResultVO removeBoardMgt(@RequestBody TnBbs bbs, @AuthenticationPrincipal LoginVO user) {
public ResultVO deleteBoardMgt(@RequestBody TnBbs bbs, @AuthenticationPrincipal LoginVO user) {
ResultVO resultVO = new ResultVO();
if (user == null) {
resultVO.setResultCode(ResponseCode.TOKEN_EXPIRED.getCode());
@ -154,4 +158,83 @@ public class AdminBoardsController extends BaseController {
return resultVO;
}
@Operation(
summary = "게시물 카테고리 셀렉트박스 옵션 조회",
description = "게시물 카테고리 셀렉트박스 옵션 조회",
tags = {"AdminBoardsController"}
)
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "조회 성공"),
@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
})
@RequestMapping(method = RequestMethod.GET, value = "/get-category-list", consumes = MediaType.APPLICATION_JSON_VALUE)
public ResultVO getCategoryList() throws Exception {
ResultVO resultVO = new ResultVO();
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("categoryList", adminBoardsService.selectBoardList());
resultVO.setResult(resultMap);
return resultVO;
}
@Operation(
summary = "게시물 저장",
description = "게시물 저장",
tags = {"AdminBoardsController"}
)
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "저장 성공"),
@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
})
@RequestMapping(method = RequestMethod.PUT, value = "/post-mgt")
public ResultVO savePostMgt(@RequestBody @Valid TnBbsContents contents, HttpServletRequest request, Errors errors, @AuthenticationPrincipal LoginVO user) {
ResultVO resultVO = new ResultVO();
if (user == null) {
resultVO.setResultCode(ResponseCode.TOKEN_EXPIRED.getCode());
} else {
if (errors.hasErrors()) {
StringBuilder msg = new StringBuilder();
for (FieldError error : errors.getFieldErrors()) {
msg.append(error.getDefaultMessage());
msg.append("\n");
}
resultVO.setResultCode(ResponseCode.INPUT_CHECK_ERROR.getCode());
resultVO.setResultMessage(msg.toString());
} else {
System.out.println("@@@ contents.getBbsSeq() : " + contents.getBbsContSeq());
contents.setIpAddress(ClientUtils.getRemoteIP(request));
adminBoardsService.savePost(contents, user.getId());
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
}
}
return resultVO;
}
@Operation(
summary = "게시물 삭제",
description = "게시물 삭제",
tags = {"AdminBoardsController"}
)
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "삭제 성공"),
@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
})
@RequestMapping(method = RequestMethod.DELETE, value = "/post-mgt")
public ResultVO deletePostMgt(@RequestBody TnBbsContents contents, HttpServletRequest request, @AuthenticationPrincipal LoginVO user) {
ResultVO resultVO = new ResultVO();
if (user == null) {
resultVO.setResultCode(ResponseCode.TOKEN_EXPIRED.getCode());
} else {
contents.setIpAddress(ClientUtils.getRemoteIP(request));
String result = adminBoardsService.deletePost(contents, user.getId());
if (result == null) {
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
} else if (result.equals("notFind")) {
resultVO.setResultCode(ResponseCode.SAVE_ERROR.getCode());
resultVO.setResultMessage("대상이 존재하지 않습니다.");
}
}
return resultVO;
}
}

21
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/entity/TnBbsContents.java
View File

@ -19,10 +19,10 @@ public class TnBbsContents {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "bbs_cont_seq")
private Integer bbsContSeq;
private Long bbsContSeq;
@Column(name = "bbs_seq", nullable = false)
private Integer bbsSeq;
private Long bbsSeq;
@Column(name = "bbs_cont_title")
private String bbsContTitle;
@ -31,22 +31,22 @@ public class TnBbsContents {
private String bbsContents;
@Column(name = "bbs_cont_seq_group")
private Integer bbsContSeqGroup;
private Long bbsContSeqGroup;
@Column(name = "bbs_cont_seq_parent")
private Integer bbsContSeqParent;
private Long bbsContSeqParent;
@Column(name = "bbs_cont_level", nullable = false)
private Integer bbsContLevel;
private Long bbsContLevel;
@Column(name = "bbs_cont_sort")
private Integer bbsContSort;
private Long bbsContSort;
@Column(name = "file_grp_id")
private String fileGrpId;
@Column(name = "bbs_read_cnt", nullable = false)
private Integer bbsReadCnt;
private Long bbsReadCnt;
@Column(name = "fixed_yn", nullable = false)
private String fixedYn;
@ -58,7 +58,7 @@ public class TnBbsContents {
private String secretPwd;
@Column(name = "doc_info_seq")
private Integer docInfoSeq;
private Long docInfoSeq;
@Column(name = "ip_address", nullable = false)
private String ipAddress;
@ -79,5 +79,8 @@ public class TnBbsContents {
private String useYn;
@Column(name = "old_seq")
private Integer oldSeq;
private Long oldSeq;
@Column(name = "bbs_id")
private String bbsId;
}

10
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/repository/TnBbsContentsRepository.java
View File

@ -2,7 +2,17 @@ package com.dbnt.kcscbackend.admin.boards.repository;
import com.dbnt.kcscbackend.admin.boards.entity.TnBbsContents;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface TnBbsContentsRepository extends JpaRepository<TnBbsContents, Long> {
@Query(value = "SELECT entity FROM TnBbsContents entity " +
"WHERE entity.useYn = 'Y' " +
"AND entity.bbsId = :bbsId " +
"ORDER BY entity.bbsContSeq DESC")
List<TnBbsContents> findByBbsId(@Param("bbsId") String bbsId);
}

2
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/repository/TnBbsRepository.java
View File

@ -2,13 +2,11 @@ package com.dbnt.kcscbackend.admin.boards.repository;
import com.dbnt.kcscbackend.admin.boards.entity.TnBbs;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
public interface TnBbsRepository extends JpaRepository<TnBbs, Long> {
@Query(value = "SELECT * FROM tn_bbs ORDER BY bbs_seq DESC", nativeQuery = true)
List<TnBbs> findAllByOrderByBbsSeqDesc();
}

45
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/boards/service/AdminBoardsService.java
View File

@ -25,10 +25,6 @@ public class AdminBoardsService extends EgovAbstractServiceImpl {
return tnBbsRepository.findAllByOrderByBbsSeqDesc();
}
public Optional<TnBbs> selectBoard(Long bbsSeq) {
return tnBbsRepository.findById(bbsSeq);
}
@Transactional
public void saveBoard(TnBbs bbs, String userId) {
if (bbs.getBbsSeq() == null) {
@ -70,4 +66,45 @@ public class AdminBoardsService extends EgovAbstractServiceImpl {
return tnBbsContentsRepository.findAll();
}
@Transactional
public void savePost(TnBbsContents contents, String userId) {
if (contents.getBbsContSeq() == null) {
// TODO 하드코딩
contents.setBbsContLevel(1L);
contents.setBbsReadCnt(0L);
contents.setUseYn("Y");
contents.setFrstCrtDt(LocalDateTime.now());
contents.setFrstCrtId(userId);
tnBbsContentsRepository.save(contents);
} else {
TnBbsContents savedPost = tnBbsContentsRepository.findById(contents.getBbsContSeq()).orElse(null);
savedPost.setFixedYn(contents.getFixedYn());
savedPost.setSecretYn(contents.getSecretYn());
savedPost.setBbsId(contents.getBbsId());
savedPost.setBbsContTitle(contents.getBbsContTitle());
savedPost.setFileGrpId(contents.getFileGrpId());
savedPost.setBbsContents(contents.getBbsContents());
savedPost.setIpAddress(contents.getIpAddress());
savedPost.setUseYn("Y");
savedPost.setLastChgId(userId);
savedPost.setLastChgDt(LocalDateTime.now());
tnBbsContentsRepository.save(savedPost);
}
}
@Transactional
public String deletePost(TnBbsContents contents, String userId) {
TnBbsContents savedPost = tnBbsContentsRepository.findById(contents.getBbsContSeq()).orElse(null);
if (savedPost == null) {
return "notFind";
} else {
savedPost.setIpAddress(contents.getIpAddress());
savedPost.setUseYn("N");
savedPost.setLastChgDt(LocalDateTime.now());
savedPost.setLastChgId(userId);
tnBbsContentsRepository.save(savedPost);
return null;
}
}
}

46
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/survey/AdminSurveyController.java
View File

@ -3,15 +3,20 @@ package com.dbnt.kcscbackend.admin.contents.survey;
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurvey;
import com.dbnt.kcscbackend.admin.contents.survey.service.AdminSurveyService;
import com.dbnt.kcscbackend.auth.entity.LoginVO;
import com.dbnt.kcscbackend.config.common.ResponseCode;
import com.dbnt.kcscbackend.config.common.ResultVO;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.validation.Errors;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.HashMap;
import java.util.Map;
@ -32,17 +37,44 @@ public class AdminSurveyController {
return resultVO;
}
@RequestMapping(method = RequestMethod.GET, value = "/edit")
public ResultVO surveyEdit(TnSurvey survey) throws Exception{
@RequestMapping(method = RequestMethod.PUT, value = "/info")
public ResultVO surveyEdit(@RequestBody @Valid TnSurvey survey, Errors errors, @AuthenticationPrincipal LoginVO user) throws Exception{
ResultVO resultVO = new ResultVO();
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("survey", adminSurveyService.selectSurvey(survey));
resultVO.setResult(resultMap);
if(errors.hasErrors()){
StringBuilder msg = new StringBuilder();
for(FieldError error: errors.getFieldErrors()){
msg.append(error.getDefaultMessage());
msg.append("\n");
}
resultVO.setResultCode(ResponseCode.INPUT_CHECK_ERROR.getCode());
resultVO.setResultMessage(msg.toString());
}else {
adminSurveyService.insertSurvey(survey, user.getId());
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
resultVO.setResultMessage("저장 되었습니다.");
}
return resultVO;
}
@RequestMapping(method = RequestMethod.GET, value = "/edit-qt")
@RequestMapping(method = RequestMethod.DELETE, value = "/info")
public ResultVO surveyDelete(@RequestBody TnSurvey survey, @AuthenticationPrincipal LoginVO user) throws Exception{
ResultVO resultVO = new ResultVO();
adminSurveyService.deleteSurvey(survey.getSvySeq());
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
resultVO.setResultMessage("저장 되었습니다.");
return resultVO;
}
@RequestMapping(method = RequestMethod.PUT, value = "/info-use-yn")
public ResultVO surveyUseYn(@RequestBody TnSurvey survey, @AuthenticationPrincipal LoginVO user) throws Exception{
ResultVO resultVO = new ResultVO();
adminSurveyService.updateSurveyUseYn(survey.getSvySeq(), user.getId());
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
resultVO.setResultMessage("저장 되었습니다.");
return resultVO;
}
@RequestMapping(method = RequestMethod.GET, value = "/info-qt")
public ResultVO surveyEditQt(TnSurvey survey) throws Exception{
ResultVO resultVO = new ResultVO();

11
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/survey/entity/TnSurvey.java
View File

@ -5,11 +5,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.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -22,16 +21,20 @@ import java.time.LocalDateTime;
@Table(name = "tn_survey")
public class TnSurvey {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "svy_seq")
private Integer svySeq;
@Column(name = "svy_title")
@NotBlank(message = "설문 제목을 입력해주세요.")
private String svyTitle;
@Column(name = "svy_desc")
private String svyDesc;
@Column(name = "svy_start_dt")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate svyStartDt;
@Column(name = "svy_end_dt")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate svyEndDt;
@Column(name = "file_grp_id")
private String fileGrpId;

1
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/survey/entity/TnSurveyQt.java
View File

@ -21,6 +21,7 @@ import java.util.List;
@Table(name = "tn_survey_qt")
public class TnSurveyQt {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "qt_seq")
private Integer qtSeq;

6
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/survey/entity/TnSurveyQtItem.java
View File

@ -6,10 +6,7 @@ import lombok.Setter;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
@Getter
@Setter
@ -20,6 +17,7 @@ import javax.persistence.Table;
@Table(name = "tn_survey_qt_item")
public class TnSurveyQtItem {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "qt_item_seq")
private Integer qtItemSeq;

34
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/survey/service/AdminSurveyService.java
View File

@ -8,7 +8,9 @@ import com.dbnt.kcscbackend.admin.contents.survey.repository.TnSurveyQtRepositor
import com.dbnt.kcscbackend.admin.contents.survey.repository.TnSurveyRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@ -43,4 +45,36 @@ public class AdminSurveyService {
}
return qtList;
}
@Transactional
public void insertSurvey(TnSurvey survey, String insertUser) {
if(survey.getSvySeq()==null){
survey.setFrstCrtId(insertUser);
survey.setFrstCrtDt(LocalDateTime.now());
survey.setUseYn("N");
surveyRepository.save(survey);
}else{
TnSurvey savedInfo = surveyRepository.findById(survey.getSvySeq()).orElse(null);
savedInfo.setSvyTitle(survey.getSvyTitle());
savedInfo.setSvyDesc(survey.getSvyDesc());
savedInfo.setSvyStartDt(survey.getSvyStartDt());
savedInfo.setSvyEndDt(survey.getSvyEndDt());
savedInfo.setLastChgId(insertUser);
savedInfo.setLastChgDt(LocalDateTime.now());
surveyRepository.save(savedInfo);
}
}
@Transactional
public void updateSurveyUseYn(Integer svySeq, String updateUser) {
TnSurvey savedInfo = surveyRepository.findById(svySeq).orElse(null);
savedInfo.setUseYn(savedInfo.getUseYn().equals("Y")?"N":"Y");
savedInfo.setLastChgId(updateUser);
savedInfo.setLastChgDt(LocalDateTime.now());
}
@Transactional
public void deleteSurvey(Integer svySeq) {
surveyRepository.deleteById(svySeq);
}
}