diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java index 9c63cb50..3a188768 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java @@ -1,15 +1,13 @@ package com.interplug.qcast.biz.commCode; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.interplug.qcast.biz.commCode.dto.CodeReq; import com.interplug.qcast.biz.commCode.dto.CommCodeApiResponse; -import com.interplug.qcast.biz.commCode.dto.CommCodeDetailRequest; -import com.interplug.qcast.biz.commCode.dto.CommCodeHeaderRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -23,31 +21,12 @@ import lombok.extern.slf4j.Slf4j; public class CommCodeController { private final CommCodeService commCodeService; - @Operation(description = "공통코드 COMM_H 정보를 등록/수정 한다.(동기화)") - @PutMapping("/qc-comm-h-update") + @Operation(description = "공통코드 정보를 등록/수정 한다.(동기화)") + @PutMapping("/qc-comm-update") @ResponseStatus(HttpStatus.OK) - public CommCodeApiResponse setQcCommCdYn(@RequestBody List headReqList) { + public CommCodeApiResponse setQcCommCdYn(@RequestBody CodeReq codeReq) { CommCodeApiResponse codeResponse = new CommCodeApiResponse(); - - int resultCnt = commCodeService.setCommHUpdate(headReqList); - if (resultCnt > 0) - codeResponse.setCode("200"); - else - codeResponse.setCode("500"); - - return codeResponse; - - } - - @Operation(description = "공통코드 COMM_L 정보를 등록/수정 한다.(동기화)") - @PutMapping("/qc-comm-l-update") - @ResponseStatus(HttpStatus.OK) - public CommCodeApiResponse setCommLUpdate( - @RequestBody List detailReqList) { - CommCodeApiResponse codeResponse = new CommCodeApiResponse(); - - int resultCnt = commCodeService.setCommLUpdate(detailReqList); - + int resultCnt = commCodeService.setCommHUpdate(codeReq); if (resultCnt > 0) codeResponse.setCode("200"); else diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java index e63b3f45..bddbbbc0 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java @@ -1,14 +1,13 @@ package com.interplug.qcast.biz.commCode; import org.apache.ibatis.annotations.Mapper; -import com.interplug.qcast.biz.commCode.dto.CommCodeDetailRequest; -import com.interplug.qcast.biz.commCode.dto.CommCodeHeaderRequest; +import com.interplug.qcast.biz.commCode.dto.CodeRes; @Mapper public interface CommCodeMapper { - int setCommHUpdate(CommCodeHeaderRequest codeReq); + int setCommHUpdate(CodeRes codeRes); - int setCommLUpdate(CommCodeDetailRequest codeReq); + int setCommLUpdate(CodeRes codeRes); } diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java index 63f62ac3..8c310e69 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java @@ -1,9 +1,8 @@ package com.interplug.qcast.biz.commCode; -import java.util.List; import org.springframework.stereotype.Service; -import com.interplug.qcast.biz.commCode.dto.CommCodeDetailRequest; -import com.interplug.qcast.biz.commCode.dto.CommCodeHeaderRequest; +import com.interplug.qcast.biz.commCode.dto.CodeReq; +import com.interplug.qcast.biz.commCode.dto.CodeRes; import lombok.RequiredArgsConstructor; @Service @@ -12,33 +11,30 @@ public class CommCodeService { private final CommCodeMapper commCodeMapper; - public int setCommHUpdate(List headReqList) { + public int setCommHUpdate(CodeReq codeReq) { int resultCnt = 0; - if (!headReqList.isEmpty()) { - for (CommCodeHeaderRequest headReq : headReqList) { - if ("Y".equals(headReq.getQcCommYn())) { - headReq.setDelFlg(0); + if (!codeReq.getApiHeadCdList1().isEmpty()) { + for (CodeRes codeRes : codeReq.getApiHeadCdList1()) { + if ("Y".equals(codeRes.getQcCommYn())) { + codeRes.setDelFlg(0); } else { - headReq.setDelFlg(1); + codeRes.setDelFlg(1); } - resultCnt += commCodeMapper.setCommHUpdate(headReq); + resultCnt += commCodeMapper.setCommHUpdate(codeRes); } } - return resultCnt; - } - public int setCommLUpdate(List detailReqList) { - int resultCnt = 0; - if (!detailReqList.isEmpty()) { - for (CommCodeDetailRequest detailReq : detailReqList) { - if ("A".equals(detailReq.getClStatCd())) { - detailReq.setClDelFlg(0); + if (!codeReq.getApiCommCdList1().isEmpty()) { + + for (CodeRes codeRes : codeReq.getApiCommCdList1()) { + if ("A".equals(codeRes.getClStatCd())) { + codeRes.setClDelFlg(0); } else { - detailReq.setClDelFlg(1); + codeRes.setClDelFlg(1); } - resultCnt += commCodeMapper.setCommLUpdate(detailReq); - } + resultCnt += commCodeMapper.setCommLUpdate(codeRes); + } } return resultCnt; } diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java new file mode 100644 index 00000000..84a885bd --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java @@ -0,0 +1,15 @@ +package com.interplug.qcast.biz.commCode.dto; + +import java.util.List; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +public class CodeReq { + + private List apiHeadCdList1; + private List apiCommCdList1; +} diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeRequest.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeRes.java similarity index 83% rename from src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeRequest.java rename to src/main/java/com/interplug/qcast/biz/commCode/dto/CodeRes.java index edc633c5..48c3199f 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeRequest.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeRes.java @@ -4,12 +4,14 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Getter @Setter +@ToString @NoArgsConstructor @AllArgsConstructor -public class CommCodeRequest { +public class CodeRes { private String headCd; private String headId; private String headNm; @@ -26,9 +28,7 @@ public class CommCodeRequest { private String refNum4; private String refNum5; private String remarks; - private String delFlg; - // private String regDt; - // private String uptDt; + private Integer delFlg; private String clHeadCd; private String clCode; @@ -48,10 +48,9 @@ public class CommCodeRequest { private Integer clRefNum5; private Integer clPriority; private String clRefCnt; - private String clDelFlg; - // private String clRegDt; - // private String clUptDt; + private String clStatCd; + private Integer clDelFlg; - private String qcGubun; + private String qcCommYn; } diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java deleted file mode 100644 index a1838e40..00000000 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.interplug.qcast.biz.commCode.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@ToString -public class CommCodeDetailRequest { - private String clHeadCd; - private String clCode; - private String clReadCd; - private String clCodeNm; - private String clCodeJp; - private String clCode4Th; - private String clRefChr1; - private String clRefChr2; - private String clRefChr3; - private String clRefChr4; - private String clRefChr5; - private Integer clRefNum1; - private Integer clRefNum2; - private Integer clRefNum3; - private Integer clRefNum4; - private Integer clRefNum5; - private Integer clPriority; - private String clRefCnt; - private Integer clDelFlg; - private String clStatCd; -} diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java deleted file mode 100644 index 9227b3a3..00000000 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.interplug.qcast.biz.commCode.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@ToString -public class CommCodeHeaderRequest { - - private String headCd; - private String headId; - private String headNm; - private String headJp; - private String head4Th; - private String refChr1; - private String refChr2; - private String refChr3; - private String refChr4; - private String refChr5; - private String refNum1; - private String refNum2; - private String refNum3; - private String refNum4; - private String refNum5; - private String remarks; - private String qcCommYn; - private Integer delFlg; - -} diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java deleted file mode 100644 index b4408183..00000000 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.interplug.qcast.biz.commCode.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class CommCodeResponse { - - private String code; - private String message; - - -} diff --git a/src/main/resources/mappers/commCode/commCodeMapper.xml b/src/main/resources/mappers/commCode/commCodeMapper.xml index 775dd0ff..46267370 100644 --- a/src/main/resources/mappers/commCode/commCodeMapper.xml +++ b/src/main/resources/mappers/commCode/commCodeMapper.xml @@ -2,7 +2,7 @@ - + /* sqlid : com.interplug.qcast.commCode.setCommHUpdate */ MERGE M_COMM_H AS A USING @@ -73,7 +73,7 @@ ); - + /* sqlid : com.interplug.qcast.commCode.setCommLUpdate */ MERGE M_COMM_L AS A USING