diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java index 2b89bb1..3d395dd 100644 --- a/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java @@ -40,6 +40,8 @@ public class AcntCstmrRqModel{ private String clncd; private AnctCstmrTermsModel[] terms; + + private String trmnlId; diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java index 01113fb..69bcee2 100644 --- a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java @@ -1,39 +1,24 @@ package com.palnet.biz.api.acnt.cstmr.service; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Persistence; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel; -import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel; -import com.palnet.comn.code.RSErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; -import com.palnet.biz.api.acnt.crtfyhp.service.AcntCrtfyhpService; -import com.palnet.biz.api.acnt.cstmr.controller.AcntCstmrController; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel; import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel; import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; -import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; -import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel; -import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel; -import com.palnet.biz.jpa.entity.PtyCrtfyhpBas; import com.palnet.biz.jpa.entity.PtyCstmrBas; import com.palnet.biz.jpa.entity.PtyCstmrDtl; import com.palnet.biz.jpa.entity.PtyCstmrGroup; @@ -45,13 +30,11 @@ import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository; import com.palnet.biz.jpa.repository.pty.PtyGroupBasRepository; import com.palnet.biz.jpa.repository.pty.PtyTermsAgreeTxnRepository; -import com.palnet.biz.jpa.repository.pty.PtyTermsQueryRepository; import com.palnet.comn.code.ErrorCode; import com.palnet.comn.exception.CustomException; import com.palnet.comn.utils.DateUtils; import com.palnet.comn.utils.EncryptUtils; import com.palnet.comn.utils.HttpUtils; -import com.palnet.comn.utils.JsonUtils; import lombok.extern.log4j.Log4j2; @@ -163,6 +146,7 @@ public class AcntCstmrService { basEntity.setUserPswd(rq.getUserPswd()); basEntity.setJoinDt(DateUtils.nowDate()); basEntity.setJoinIp(HttpUtils.getRequestIp()); + basEntity.setTrmnlId(rq.getTrmnlId()); return ptyCstmrBasRepository.save(basEntity); diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java index ea3c2c0..cf902ce 100644 --- a/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java @@ -13,5 +13,7 @@ public class JwtProfileRsModel { private String userId; private String memberName; + + private String trmnlId; } diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java index e130955..69c2356 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java @@ -32,6 +32,8 @@ public class BasGroupAprvModel { private String groupAuthCd; private String aprvlUserId; + + private String trmnlId; } diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java index 9f0bcf5..f6edc3f 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java @@ -32,5 +32,7 @@ public class BasGroupJoinModel { private Date updateDt; private String myGroupAuthCd; + + private String trmnlId; } diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java index 3dfb328..6630a14 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java @@ -18,5 +18,7 @@ public class BasGroupModel { private Date createDt; private Date updateDt; - + + private String trmnlId; + } diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java index afb4e63..f83dfa1 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java @@ -1,7 +1,5 @@ package com.palnet.biz.api.bas.group.service; -import java.util.ArrayList; -import java.util.List; import java.util.Optional; import org.slf4j.Logger; @@ -82,8 +80,10 @@ public class BasGroupAprvService { entity.setAprvlUserId(rq.getAprvlUserId()); entity.setGroupAuthCd(rq.getGroupAuthCd()); + entity.setTrmnlId(rq.getTrmnlId()); } else { entity.setGroupAuthCd(""); + entity.setTrmnlId(""); } entity.setAprvlYn(rq.getAprvlYn()); diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java index 7b4de62..7135f6f 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java @@ -1,8 +1,6 @@ package com.palnet.biz.api.bas.group.service; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -61,7 +59,7 @@ public class BasGroupService { /** * 나의 그룹 목록 - * @param rq + * @param cstmrSno * @return */ public List mylist(int cstmrSno){ @@ -74,7 +72,7 @@ public class BasGroupService { /** * 그룹 목록 - * @param rq + * @param cstmrSno * @return */ public List groupList(int cstmrSno){ @@ -92,7 +90,7 @@ public class BasGroupService { /** * 나의 그룹 - 참여 그룹 목록 - * @param rq + * @param cstmrSno * @return */ public List joinList(int cstmrSno){ @@ -117,7 +115,7 @@ public class BasGroupService { /** * 그룹 상세 조회 - * @param cntrlId + * @param groupId * @return * @throws Exception */ @@ -142,7 +140,7 @@ public class BasGroupService { /** * 그룹 생성 - * @param + * @param rq * @return * @throws Exception */ @@ -164,6 +162,7 @@ public class BasGroupService { entity.setUpdateDt(DateUtils.nowDate()); entity.setUseYn("Y"); entity.setCreateDt(DateUtils.nowDate()); + entity.setTrmnlId(rq.getTrmnlId()); //참여 정보 입력 하기 PtyCstmrGroup entity2 = new PtyCstmrGroup(); @@ -175,6 +174,7 @@ public class BasGroupService { entity2.setCstmrSno(rq.getCstmrSno()); entity2.setJoinYn("Y"); entity2.setJoinDt(DateUtils.nowDate()); + entity2.setTrmnlId(rq.getTrmnlId()); if( ptyGroupBasRepository.save(entity) == null) throw new CustomException(ErrorCode.FAIL); @@ -188,7 +188,7 @@ public class BasGroupService { /** * 그룹 수정 - * @param + * @param rq * @return * @throws Exception */ @@ -222,7 +222,7 @@ public class BasGroupService { /** * 그룹 삭제 - * @param + * @param groupId * @return * @throws Exception */ diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 791631d..7d66fee 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -278,9 +278,10 @@ public class CtrCntrlService { model.setCreateUserId(warnLog.getCreateUserId()); } - model.setCntrlId(control.getCntrlId()); - model.setIdntfNum(control.getIdntfNum()); - model.setWarnCount(warnCount); + + if(control.getCntrlId()!=null) model.setCntrlId(control.getCntrlId()); + if(control.getIdntfNum()!=null) model.setIdntfNum(control.getIdntfNum()); + if(warnCount!=null) model.setWarnCount(warnCount); result.add(model); } diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java index b6e9511..8ab7dd8 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java @@ -63,5 +63,8 @@ public class PtyCstmrBas implements Serializable { @Column(name="RFRSH_TOKEN") private String rfrshToken; + @Column(name="TRMNL_ID") + private String trmnlId; + } \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java index d7ec6f9..d68df61 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java @@ -49,6 +49,9 @@ public class PtyCstmrGroup implements Serializable { @Column(name="WTHDRW_DT") private Date wthdrwDt; + @Column(name="TRMNL_ID") + private String trmnlId; + public PtyCstmrGroup() { } @@ -132,4 +135,8 @@ public class PtyCstmrGroup implements Serializable { this.wthdrwDt = wthdrwDt; } + public String getTrmnlId() { return this.trmnlId; } + + public void setTrmnlId(String trmnlId) { this.trmnlId = trmnlId; } + } \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java index 61a5fa3..a376c86 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java @@ -20,6 +20,7 @@ public class PtyGroupBas implements Serializable { private String groupTypeCd; private Date updateDt; private String useYn; + private String trmnlId; public PtyGroupBas() { } @@ -87,4 +88,10 @@ public class PtyGroupBas implements Serializable { this.useYn = useYn; } + + @Column(name="TRMNL_ID") + public String getTrmnlId() { return this.trmnlId;} + + public void setTrmnlId(String trmnlId) { this.trmnlId = trmnlId; } + } \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java index 2db7076..e32385b 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java @@ -190,6 +190,7 @@ public class PtyCstmrQueryRepository{ basEntity.cstmrSno, basEntity.userId, basEntity.authId, + basEntity.trmnlId, basEntity.siteCode, dtlEntity.memberName )) diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index 2d4ea33..c2f450c 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -220,6 +220,7 @@ public class PtyGroupQueryRepository{ bas.groupId, bas.groupNm, bas.groupTypeCd, + bas.trmnlId, dtl.cstmrSno, dtl.cstmrGroupSno, bas.updateDt, diff --git a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java index 8aae6f6..b6dfc5f 100644 --- a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java @@ -33,7 +33,7 @@ public class MessageConsumer { GPModel model = objectMapper.readValue(message, GPModel.class); messageService.insert(model); // GPS 정보 DB 동기화 처리 - channel.queueDeclare(message, true, false, false, null); +// channel.queueDeclare(message, true, false, false, null); channel.basicAck(tag, false); } catch (RuntimeException e) { channel.basicReject(tag, false);