localnet/localhost-back
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'khj' into main

Browse Source
This commit is contained in:
khj0414 2025-03-17 10:55:14 +09:00
commit 920af2adfe
9 changed files with 96 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/io/company/localhost/controller/api/worddictController.java
View File

@ -53,10 +53,10 @@ public class worddictController {
@Member
@ParameterCheck
@GetMapping("getWordList")
public ApiResponse<MapDto> getWordList(@ReqMap MapDto map) {
public ApiResponse<MapDto> selectWordList(@ReqMap MapDto map) {
int total = worddictyservice.getTotal(map);
List<MapDto> wordList = worddictyservice.getWordList(map);
List<MapDto> wordList = worddictyservice.selectWordList(map);
MapDto OutData = new MapDto();
OutData.put("total", total);
@ -73,7 +73,7 @@ public class worddictController {
@Member
@ParameterCheck
@GetMapping("getWordCategory")
public ApiResponse<List<MapDto>> getWordCategory() {
public ApiResponse<List<MapDto>> selectWordCategory() {
List<MapDto> WordCategoryList = commoncodservice.selectWordCategory();
return ApiResponse.ok(WordCategoryList);
}
@ -97,8 +97,8 @@ public class worddictController {
@Member
@ParameterCheck
@GetMapping("getWordDetail")
public ApiResponse<MapDto> getWordDetail(@ReqMap MapDto map) {
return ApiResponse.ok( worddictyservice.getWordDetail(map));
public ApiResponse<MapDto> selectWordDetail(@ReqMap MapDto map) {
return ApiResponse.ok( worddictyservice.selectWordDetail(map));
}
/**
* 용어 등록 - 카테고리 등록
@ -125,7 +125,6 @@ public class worddictController {
@PatchMapping("updateWord")
public ApiResponse<Long> updateWord(@ReqMap MapDto map) {
//userId
Long userId = AuthUtil.getUser().getId();
map.put("userId", userId);
Long result = worddictyservice.updateWord(map);

14
src/main/java/io/company/localhost/mapper/VotDetailMapper.java
View File

@ -1,3 +1,17 @@
/************************************************************
*
* @packageName : io.company.localhost.mapper
* @fileName : VotDetailMapper.java
* @author : 공현지
* @date : 25.01.07
* @description :
*
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 24.12.06 공현지 최초 생성
*
*************************************************************/
package io.company.localhost.mapper;
import java.util.List;

18
src/main/java/io/company/localhost/mapper/VotMemberMapper.java
View File

@ -1,3 +1,17 @@
/************************************************************
*
* @packageName : io.company.localhost.mapper
* @fileName : VotMemberMapper.java
* @author : 공현지
* @date : 25.01.07
* @description :
*
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 24.12.06 공현지 최초 생성
*
*************************************************************/
package io.company.localhost.mapper;
import java.util.List;
@ -13,8 +27,4 @@ public interface VotMemberMapper {
List<MapDto> selectVoteMember(Integer locvotSeq);
}

14
src/main/java/io/company/localhost/mapper/VotRecordMapper.java
View File

@ -1,3 +1,17 @@
/************************************************************
*
* @packageName : io.company.localhost.mapper
* @fileName : VotRecordMapper.java
* @author : 공현지
* @date : 25.01.07
* @description :
*
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 24.12.06 공현지 최초 생성
*
*************************************************************/
package io.company.localhost.mapper;
import org.apache.ibatis.annotations.Mapper;

15
src/main/java/io/company/localhost/mapper/VotchoiceMapper.java
View File

@ -1,3 +1,17 @@
/************************************************************
*
* @packageName : io.company.localhost.mapper
* @fileName : VotchoiceMapper.java
* @author : 공현지
* @date : 25.01.07
* @description :
*
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 24.12.06 공현지 최초 생성
*
*************************************************************/
package io.company.localhost.mapper;
import org.apache.ibatis.annotations.Mapper;
@ -9,5 +23,4 @@ public interface VotchoiceMapper {
void insertChoice(MapDto map);
}

14
src/main/java/io/company/localhost/mapper/localvoteMapper.java
View File

@ -1,3 +1,17 @@
/************************************************************
*
* @packageName : io.company.localhost.mapper
* @fileName : localvoteMapper.java
* @author : 공현지
* @date : 25.01.07
* @description :
*
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 24.12.06 공현지 최초 생성
*
*************************************************************/
package io.company.localhost.mapper;
import java.util.List;

4
src/main/java/io/company/localhost/mapper/worddictyMapper.java
View File

@ -23,13 +23,13 @@ import io.company.localhost.common.dto.MapDto;
@Mapper
public interface worddictyMapper {
List<MapDto> getWordList(MapDto map);
List<MapDto> selectWordList(MapDto map);
Long insertWord(MapDto map);
Long updateWord(MapDto map);
MapDto getWordDetail(MapDto map);
MapDto selectWordDetail(MapDto map);
int getTotal(MapDto map);

16
src/main/java/io/company/localhost/service/localvoteService.java
View File

@ -1,3 +1,17 @@
/************************************************************
*
* @packageName : io.company.localhost.service
* @fileName : localvoteService.java
* @author : 공현지
* @date : 25.01.07
* @description :
*
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 24.12.06 공현지 최초 생성
*
*************************************************************/
package io.company.localhost.service;
import java.util.ArrayList;
@ -63,8 +77,8 @@ public class localvoteService {
MapDto voteMap = new MapDto();
voteMap.put("localVote", vote);
Integer locvotSeq = (Integer) vote.get("LOCVOTSEQ");
//투표 항목조회 + 결과 조회 + 투표여부
map.put("locvotSeq", locvotSeq);
//투표 항목조회 + 결과 조회 + 투표여부
List<MapDto> voteDetails = votdetailmapper.selectVoteDetailsResult(map);
//투표 가능 멤버 조회
List<MapDto> voteMembers = votmembermapper.selectVoteMember(locvotSeq);

8
src/main/java/io/company/localhost/service/worddictyService.java
View File

@ -33,8 +33,8 @@ public class worddictyService {
private final worddictyMapper worddictymapper;
private final commoncodMapper commoncodmapper;
public List<MapDto> getWordList(MapDto map) {
List<MapDto> wordList = worddictymapper.getWordList(map);
public List<MapDto> selectWordList(MapDto map) {
List<MapDto> wordList = worddictymapper.selectWordList(map);
for (MapDto word : wordList) {
Object content = word.get("WRDDICCON");
// BlobUtil.procBlobToString으로 content 변환
@ -80,8 +80,8 @@ public class worddictyService {
public Long updateWord(MapDto map) {
return worddictymapper.updateWord(map);
}
public MapDto getWordDetail(MapDto map) {
return worddictymapper.getWordDetail(map);
public MapDto selectWordDetail(MapDto map) {
return worddictymapper.selectWordDetail(map);
}
public int getTotal(MapDto map) {
return worddictymapper.getTotal(map);