From bae52b5012ee1994c24df3915dae1bad4e98acaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Wed, 13 Jul 2022 17:52:31 +0900 Subject: [PATCH] =?UTF-8?q?PAV=20DB=20=EA=B8=B0=EC=B2=B4=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=97=90=20=EC=A0=81=EC=9A=A9(=EC=A7=84=ED=96=89=EC=A4=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/dron/model/BasDronModel.java | 15 +- .../biz/api/bas/dron/model/BasIdntfModel.java | 12 +- .../api/bas/dron/service/BasDronService.java | 156 +++++++----------- .../palnet/biz/jpa/entity/ComArcrftBas.java | 5 +- .../palnet/biz/jpa/entity/ComArcrftOwner.java | 134 --------------- .../palnet/biz/jpa/entity/ComIdntfBas.java | 57 ++----- .../palnet/biz/jpa/entity/PtyGroupArcrft.java | 112 ------------- .../com/ComArcrftOwnerRepository.java | 17 -- .../ctr/CtrCntrlQueryRepository.java | 7 +- .../pty/PtyDronQueryRepository.java | 85 ++++------ .../pty/PtyGroupArcrftRepository.java | 17 -- 11 files changed, 128 insertions(+), 489 deletions(-) delete mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java delete mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java delete mode 100644 src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java delete mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java index 02b491b..9342031 100644 --- a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java @@ -7,6 +7,8 @@ import lombok.Data; @Data public class BasDronModel { + private String groupNm; + private String groupId; private int arcrftSno; @@ -54,18 +56,5 @@ public class BasDronModel { private String idntfTypeCd; - // 운영자 정보 - private int ownerSno; - - private String ownerNm; - - private String hpno; - - private String telno; - - private String useYn; - - - } diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java index 8addabd..950eced 100644 --- a/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java @@ -7,16 +7,22 @@ import lombok.Data; @Data public class BasIdntfModel { - //식별 번호 정보 + //식별 번호 정보 + private String id; private String idntfNum; - + private String isSave; + private int arcrftSno; + + private String idntfTypeCd; + private String ownerNm; - private String idntfTypeCd; + private String hpno; private Date updateDt; private Date createDt; + } diff --git a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java index d284fa3..67f4d1a 100644 --- a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java +++ b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java @@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.dron.service; import java.util.List; import java.util.Optional; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,18 +13,13 @@ import com.palnet.biz.api.bas.dron.model.BasDronRqModel; import com.palnet.biz.api.bas.dron.model.BasIdntfModel; import com.palnet.biz.api.bas.dron.model.BasIdntfRqModel; import com.palnet.biz.jpa.entity.ComArcrftBas; -import com.palnet.biz.jpa.entity.ComArcrftOwner; import com.palnet.biz.jpa.entity.ComIdntfBas; -import com.palnet.biz.jpa.entity.PtyGroupArcrft; import com.palnet.biz.jpa.repository.com.ComArcrftBasRepository; -import com.palnet.biz.jpa.repository.com.ComArcrftOwnerRepository; import com.palnet.biz.jpa.repository.com.ComIdntBasRepository; import com.palnet.biz.jpa.repository.pty.PtyDronQueryRepository; -import com.palnet.biz.jpa.repository.pty.PtyGroupArcrftRepository; 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 lombok.extern.log4j.Log4j2; @@ -39,16 +33,9 @@ public class BasDronService { @Autowired private ComArcrftBasRepository comArcrftBasRepository; - @Autowired - private ComArcrftOwnerRepository comArcrftOwnerRepository; - @Autowired private ComIdntBasRepository comIdntBasRepository; - @Autowired - private PtyGroupArcrftRepository ptyGroupArcrftRepository; - - /** * 드론 목록 * @param rq @@ -102,15 +89,15 @@ public class BasDronService { } // 민감정보 암호화 처리 - if(!StringUtils.isEmpty(rq.getHpno())) { - rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); - } - if(!StringUtils.isEmpty(rq.getOwnerNm())) { - rq.setOwnerNm(EncryptUtils.encrypt(rq.getOwnerNm())); - } - if(!StringUtils.isEmpty(rq.getTelno())) { - rq.setTelno(EncryptUtils.encrypt(rq.getTelno())); - } +// if(!StringUtils.isEmpty(rq.getHpno())) { +// rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); +// } +// if(!StringUtils.isEmpty(rq.getOwnerNm())) { +// rq.setOwnerNm(EncryptUtils.encrypt(rq.getOwnerNm())); +// } +// if(!StringUtils.isEmpty(rq.getTelno())) { +// rq.setTelno(EncryptUtils.encrypt(rq.getTelno())); +// } @@ -124,10 +111,10 @@ public class BasDronService { rq.setArcrftSno(comArcrftBas.getArcrftSno()); // KEY 넣기 //2. 드론 운영자 정보 등록 - ComArcrftOwner comArcrftOwner = this.insertComArcrftOwner(rq); - if(comArcrftOwner == null) { - throw new CustomException(ErrorCode.DB_ERROR); - } +// ComArcrftOwner comArcrftOwner = this.insertComArcrftOwner(rq); +// if(comArcrftOwner == null) { +// throw new CustomException(ErrorCode.DB_ERROR); +// } // //3. 드론 식별 정보 등록 // ComIdntfBas comIdntfBas = this.insertComIdntfBas(rq); @@ -136,10 +123,10 @@ public class BasDronService { // } //4. 드론 그룹에 연결 등록 - PtyGroupArcrft ptyGroupArcrft = this.insertPtyGroupArcrft(rq); - if(ptyGroupArcrft == null) { - throw new CustomException(ErrorCode.DB_ERROR); - } +// PtyGroupArcrft ptyGroupArcrft = this.insertPtyGroupArcrft(rq); +// if(ptyGroupArcrft == null) { +// throw new CustomException(ErrorCode.DB_ERROR); +// } return true; @@ -211,23 +198,6 @@ public class BasDronService { } - public ComArcrftOwner insertComArcrftOwner(BasDronModel model) throws Exception{ - - - ComArcrftOwner entity = new ComArcrftOwner(); - - BeanUtils.copyProperties(model , entity); - - entity.setCreateDt(DateUtils.nowDate()); - entity.setUpdateDt(DateUtils.nowDate()); - entity.setUseYn("Y"); - log.debug(entity.toString()); - - return comArcrftOwnerRepository.save(entity); - - } - - public ComIdntfBas insertComIdntfBas(BasDronModel model) throws Exception{ ComIdntfBas entity = new ComIdntfBas(); @@ -239,17 +209,17 @@ public class BasDronService { return comIdntBasRepository.save(entity); } - public PtyGroupArcrft insertPtyGroupArcrft(BasDronModel model) throws Exception{ - PtyGroupArcrft entity = new PtyGroupArcrft(); - BeanUtils.copyProperties(model , entity); - entity.setCreateDt(DateUtils.nowDate()); - entity.setUpdateDt(DateUtils.nowDate()); - entity.setUseYn("Y"); - log.debug(entity.toString()); - - return ptyGroupArcrftRepository.save(entity); - - } +// public PtyGroupArcrft insertPtyGroupArcrft(BasDronModel model) throws Exception{ +// PtyGroupArcrft entity = new PtyGroupArcrft(); +// BeanUtils.copyProperties(model , entity); +// entity.setCreateDt(DateUtils.nowDate()); +// entity.setUpdateDt(DateUtils.nowDate()); +// entity.setUseYn("Y"); +// log.debug(entity.toString()); +// +// return ptyGroupArcrftRepository.save(entity); +// +// } /** @@ -290,23 +260,23 @@ public class BasDronService { //민감 정보 암호화 처리 // 민감정보 암호화 처리 - if(!StringUtils.isEmpty(rq.getHpno())) { - rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); - } - if(!StringUtils.isEmpty(rq.getOwnerNm())) { - rq.setOwnerNm(EncryptUtils.encrypt(rq.getOwnerNm())); - } - if(!StringUtils.isEmpty(rq.getTelno())) { - rq.setTelno(EncryptUtils.encrypt(rq.getTelno())); - } +// if(!StringUtils.isEmpty(rq.getHpno())) { +// rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); +// } +// if(!StringUtils.isEmpty(rq.getOwnerNm())) { +// rq.setOwnerNm(EncryptUtils.encrypt(rq.getOwnerNm())); +// } +// if(!StringUtils.isEmpty(rq.getTelno())) { +// rq.setTelno(EncryptUtils.encrypt(rq.getTelno())); +// } //3. 운영자 정보 수정 - ComArcrftOwner comArcrftOwner = this.updateComArcrftOwner(rq); +// ComArcrftOwner comArcrftOwner = this.updateComArcrftOwner(rq); - if(comArcrftOwner == null) { - throw new CustomException(ErrorCode.DB_ERROR); - } +// if(comArcrftOwner == null) { +// throw new CustomException(ErrorCode.DB_ERROR); +// } return true; } @@ -344,26 +314,26 @@ public class BasDronService { } - public ComArcrftOwner updateComArcrftOwner(BasDronModel model) throws Exception{ - - - Optional optional = comArcrftOwnerRepository.findById(model.getOwnerSno()); - if (!optional.isPresent()) { - throw new CustomException(ErrorCode.DATA_NOTFIND); - } - - ComArcrftOwner entity = optional.get(); - entity.setUpdateDt(DateUtils.nowDate()); - entity.setUpdateUserId(model.getUpdateUserId()); - entity.setOwnerNm(model.getOwnerNm()); - entity.setHpno(model.getHpno()); - entity.setTelno(model.getTelno()); - - log.debug(entity.toString()); - - return comArcrftOwnerRepository.save(entity); - - } +// public ComArcrftOwner updateComArcrftOwner(BasDronModel model) throws Exception{ +// +// +// Optional optional = comArcrftOwnerRepository.findById(model.getOwnerSno()); +// if (!optional.isPresent()) { +// throw new CustomException(ErrorCode.DATA_NOTFIND); +// } +// +// ComArcrftOwner entity = optional.get(); +// entity.setUpdateDt(DateUtils.nowDate()); +// entity.setUpdateUserId(model.getUpdateUserId()); +//// entity.setOwnerNm(model.getOwnerNm()); +//// entity.setHpno(model.getHpno()); +// entity.setTelno(model.getTelno()); +// +// log.debug(entity.toString()); +// +// return comArcrftOwnerRepository.save(entity); +// +// } public ComIdntfBas updateComIdntfBas(BasDronModel model) throws Exception{ @@ -403,10 +373,10 @@ public class BasDronService { comIdntBasRepository.deleteByArcrftSno(arcrftSno); //3. 기체 소유자정보 사용여부 N 처리 - comArcrftOwnerRepository.deleteByArcrftSno(arcrftSno); +// comArcrftOwnerRepository.deleteByArcrftSno(arcrftSno); //4. 그룹기체 정보 사용여부 N 처리 - ptyGroupArcrftRepository.deleteByArcrftSno(arcrftSno); +// ptyGroupArcrftRepository.deleteByArcrftSno(arcrftSno); return true; }catch(Exception e) { diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java index 0fd19ac..f9ca9ae 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java +++ b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java @@ -24,7 +24,10 @@ public class ComArcrftBas implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="ARCRFT_SNO") private int arcrftSno; - + + @Column(name="GROUP_ID") + private String groupId; + @Column(name="ARCRFT_HGHT") private double arcrftHght; diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java deleted file mode 100644 index ae4480b..0000000 --- a/src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.palnet.biz.jpa.entity; - -import java.io.Serializable; -import javax.persistence.*; -import java.util.Date; - - -/** - * The persistent class for the COM_ARCRFT_OWNER database table. - * - */ -@Entity -@Table(name="COM_ARCRFT_OWNER") -@NamedQuery(name="ComArcrftOwner.findAll", query="SELECT c FROM ComArcrftOwner c") -public class ComArcrftOwner implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - @Column(name="OWNER_SNO") - private int ownerSno; - - @Column(name="ARCRFT_SNO") - private int arcrftSno; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name="CREATE_DT") - private Date createDt; - - @Column(name="CREATE_USER_ID") - private String createUserId; - - @Column(name="HPNO") - private String hpno; - - @Column(name="OWNER_NM") - private String ownerNm; - - @Column(name="TELNO") - private String telno; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name="UPDATE_DT") - private Date updateDt; - - @Column(name="UPDATE_USER_ID") - private String updateUserId; - - @Column(name="USE_YN") - private String useYn; - - public ComArcrftOwner() { - } - - public int getOwnerSno() { - return this.ownerSno; - } - - public void setOwnerSno(int ownerSno) { - this.ownerSno = ownerSno; - } - - public int getArcrftSno() { - return this.arcrftSno; - } - - public void setArcrftSno(int arcrftSno) { - this.arcrftSno = arcrftSno; - } - - public Date getCreateDt() { - return this.createDt; - } - - public void setCreateDt(Date createDt) { - this.createDt = createDt; - } - - public String getCreateUserId() { - return this.createUserId; - } - - public void setCreateUserId(String createUserId) { - this.createUserId = createUserId; - } - - public String getHpno() { - return this.hpno; - } - - public void setHpno(String hpno) { - this.hpno = hpno; - } - - public String getOwnerNm() { - return this.ownerNm; - } - - public void setOwnerNm(String ownerNm) { - this.ownerNm = ownerNm; - } - - public String getTelno() { - return this.telno; - } - - public void setTelno(String telno) { - this.telno = telno; - } - - public Date getUpdateDt() { - return this.updateDt; - } - - public void setUpdateDt(Date updateDt) { - this.updateDt = updateDt; - } - - public String getUpdateUserId() { - return this.updateUserId; - } - - public void setUpdateUserId(String updateUserId) { - this.updateUserId = updateUserId; - } - - public String getUseYn() { - return this.useYn; - } - - public void setUseYn(String useYn) { - this.useYn = useYn; - } - -} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java index 7a05153..e35d7fc 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java +++ b/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java @@ -2,6 +2,9 @@ package com.palnet.biz.jpa.entity; import java.io.Serializable; import javax.persistence.*; + +import lombok.Data; + import java.util.Date; @@ -11,6 +14,7 @@ import java.util.Date; */ @Entity @Table(name="COM_IDNTF_BAS") +@Data @NamedQuery(name="ComIdntfBas.findAll", query="SELECT c FROM ComIdntfBas c") public class ComIdntfBas implements Serializable { private static final long serialVersionUID = 1L; @@ -22,58 +26,25 @@ public class ComIdntfBas implements Serializable { @Column(name="ARCRFT_SNO") private int arcrftSno; + @Column(name="IDNTF_TYPE_CD") + private String idntfTypeCd; + + @Column(name="OWNER_NM") + private String ownerNm; + + @Column(name="HPNO") + private String hpno; + @Temporal(TemporalType.TIMESTAMP) @Column(name="CREATE_DT") private Date createDt; - @Column(name="IDNTF_TYPE_CD") - private String idntfTypeCd; - @Temporal(TemporalType.TIMESTAMP) @Column(name="UPDATE_DT") private Date updateDt; - + public ComIdntfBas() { } - public String getIdntfNum() { - return this.idntfNum; - } - - public void setIdntfNum(String idntfNum) { - this.idntfNum = idntfNum; - } - - public int getArcrftSno() { - return this.arcrftSno; - } - - public void setArcrftSno(int arcrftSno) { - this.arcrftSno = arcrftSno; - } - - public Date getCreateDt() { - return this.createDt; - } - - public void setCreateDt(Date createDt) { - this.createDt = createDt; - } - - public String getIdntfTypeCd() { - return this.idntfTypeCd; - } - - public void setIdntfTypeCd(String idntfTypeCd) { - this.idntfTypeCd = idntfTypeCd; - } - - public Date getUpdateDt() { - return this.updateDt; - } - - public void setUpdateDt(Date updateDt) { - this.updateDt = updateDt; - } } \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java deleted file mode 100644 index b946cc2..0000000 --- a/src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.palnet.biz.jpa.entity; - -import java.io.Serializable; -import javax.persistence.*; -import java.util.Date; - - -/** - * The persistent class for the PTY_GROUP_ARCRFT database table. - * - */ -@Entity -@Table(name="PTY_GROUP_ARCRFT") -@NamedQuery(name="PtyGroupArcrft.findAll", query="SELECT p FROM PtyGroupArcrft p") -public class PtyGroupArcrft implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - @Column(name="GROUP_ARCRFT_SNO") - private int groupArcrftSno; - - @Column(name="ARCRFT_SNO") - private int arcrftSno; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name="CREATE_DT") - private Date createDt; - - @Column(name="CREATE_USER_ID") - private String createUserId; - - @Column(name="GROUP_ID") - private String groupId; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name="UPDATE_DT") - private Date updateDt; - - @Column(name="UPDATE_USER_ID") - private String updateUserId; - - @Column(name="USE_YN") - private String useYn; - - public PtyGroupArcrft() { - } - - public int getGroupArcrftSno() { - return this.groupArcrftSno; - } - - public void setGroupArcrftSno(int groupArcrftSno) { - this.groupArcrftSno = groupArcrftSno; - } - - public int getArcrftSno() { - return this.arcrftSno; - } - - public void setArcrftSno(int arcrftSno) { - this.arcrftSno = arcrftSno; - } - - public Date getCreateDt() { - return this.createDt; - } - - public void setCreateDt(Date createDt) { - this.createDt = createDt; - } - - public String getCreateUserId() { - return this.createUserId; - } - - public void setCreateUserId(String createUserId) { - this.createUserId = createUserId; - } - - public String getGroupId() { - return this.groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public Date getUpdateDt() { - return this.updateDt; - } - - public void setUpdateDt(Date updateDt) { - this.updateDt = updateDt; - } - - public String getUpdateUserId() { - return this.updateUserId; - } - - public void setUpdateUserId(String updateUserId) { - this.updateUserId = updateUserId; - } - - public String getUseYn() { - return this.useYn; - } - - public void setUseYn(String useYn) { - this.useYn = useYn; - } - -} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java b/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java deleted file mode 100644 index 7b0f415..0000000 --- a/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.palnet.biz.jpa.repository.com; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import com.palnet.biz.jpa.entity.ComArcrftOwner; - -@Repository -public interface ComArcrftOwnerRepository extends JpaRepository{ - - @Modifying - @Query(value = "UPDATE COM_ARCRFT_OWNER SET USE_YN ='N' WHERE ARCRFT_SNO = :arcrftSno", nativeQuery = true) - int deleteByArcrftSno(@Param("arcrftSno") int arcrftSno); -} diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index fa51d49..741c3d4 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1,10 +1,7 @@ package com.palnet.biz.jpa.repository.ctr; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -20,7 +17,7 @@ import com.palnet.biz.api.main.dash.model.MainDashStcsModel; import com.palnet.biz.jpa.entity.ComArcrftBas; import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; import com.palnet.biz.jpa.entity.QComArcrftBas; -import com.palnet.biz.jpa.entity.QComArcrftOwner; +import com.palnet.biz.jpa.entity.QComIdntfBas; import com.palnet.biz.jpa.entity.QCtrCntrlBas; import com.palnet.biz.jpa.entity.QCtrCntrlHstry; import com.palnet.biz.jpa.entity.QCtrCntrlHstryArea; @@ -209,7 +206,7 @@ public class CtrCntrlQueryRepository{ public CtrCntrlDtlModel detailCntrl(String controlId) { QCtrCntrlBas ctr = QCtrCntrlBas.ctrCntrlBas; QComArcrftBas bas = QComArcrftBas.comArcrftBas; - QComArcrftOwner own = QComArcrftOwner.comArcrftOwner; + QComIdntfBas own = QComIdntfBas.comIdntfBas; CtrCntrlDtlModel result = query.select(Projections.bean(CtrCntrlDtlModel.class , ctr.cntrlId , diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java index 0252cdf..5b6f968 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java @@ -3,7 +3,6 @@ package com.palnet.biz.jpa.repository.pty; import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -11,14 +10,10 @@ import org.springframework.stereotype.Repository; import com.palnet.biz.api.bas.dron.model.BasDronModel; import com.palnet.biz.api.bas.dron.model.BasDronRqModel; import com.palnet.biz.api.bas.dron.model.BasIdntfModel; -import com.palnet.biz.api.bas.dron.model.BasOwnerModel; -import com.palnet.biz.api.bas.group.model.BasGroupAprvModel; import com.palnet.biz.api.main.dash.model.MainDashListModel; import com.palnet.biz.jpa.entity.QComArcrftBas; -import com.palnet.biz.jpa.entity.QComArcrftOwner; import com.palnet.biz.jpa.entity.QComIdntfBas; import com.palnet.biz.jpa.entity.QPtyCstmrGroup; -import com.palnet.biz.jpa.entity.QPtyGroupArcrft; import com.palnet.comn.utils.EncryptUtils; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.Projections; @@ -41,14 +36,11 @@ public class PtyDronQueryRepository{ */ public List list(BasDronRqModel rq){ - QPtyGroupArcrft group = QPtyGroupArcrft.ptyGroupArcrft; QComArcrftBas bas = QComArcrftBas.comArcrftBas; - QComArcrftOwner owner = QComArcrftOwner.comArcrftOwner; -// QComIdntfBas idnt = QComIdntfBas.comIdntfBas; + QComIdntfBas idnt = QComIdntfBas.comIdntfBas; BooleanBuilder builder = new BooleanBuilder(); - builder.and(group.groupId.eq(rq.getGroupId())); if(!StringUtils.isEmpty(rq.getArcrftModelNm())) { builder.and(bas.arcrftModelNm.like('%' + rq.getArcrftModelNm() + '%')); @@ -64,7 +56,7 @@ public class PtyDronQueryRepository{ List queryResult = query.select(Projections.bean(BasDronModel.class , - group.groupId, + bas.groupId, bas.arcrftSno, bas.arcrftHght, bas.arcrftLngth, @@ -83,16 +75,12 @@ public class PtyDronQueryRepository{ bas.updateDt, bas.updateUserId, bas.wghtTypeCd, - owner.ownerSno, - owner.ownerNm + idnt.idntfNum, + idnt.ownerNm )).from(bas) - .leftJoin(group) - .on(bas.arcrftSno.eq(group.arcrftSno)) - .on(group.groupId.eq(rq.getGroupId())) - .on(group.useYn.eq("Y")) - .leftJoin(owner) - .on(bas.arcrftSno.eq(owner.arcrftSno)) - .on(owner.useYn.eq("Y")) + .leftJoin(idnt) + .on(bas.arcrftSno.eq(idnt.arcrftSno)) + .on(bas.useYn.eq("Y")) .where(builder) .orderBy(bas.createDt.desc()) @@ -101,9 +89,9 @@ public class PtyDronQueryRepository{ List result = new ArrayList(); for(BasDronModel model : queryResult) { - if(!StringUtils.isEmpty(model.getOwnerNm())) { - model.setOwnerNm(EncryptUtils.decrypt(model.getOwnerNm())); - } +// if(!StringUtils.isEmpty(model.getOwnerNm())) { +// model.setOwnerNm(EncryptUtils.decrypt(model.getOwnerNm())); +// } result.add(model); } @@ -128,10 +116,13 @@ public class PtyDronQueryRepository{ List result = query.select(Projections.bean(BasIdntfModel.class , + idnt.arcrftSno, idnt.idntfNum, idnt.idntfTypeCd, idnt.createDt, - idnt.updateDt + idnt.updateDt, + idnt.ownerNm, + idnt.hpno )).from(idnt) .where(builder) .orderBy(idnt.createDt.asc()) @@ -149,13 +140,12 @@ public class PtyDronQueryRepository{ */ public BasDronModel detail(int arcrftSno){ - QPtyGroupArcrft group = QPtyGroupArcrft.ptyGroupArcrft; QComArcrftBas bas = QComArcrftBas.comArcrftBas; - QComArcrftOwner owner = QComArcrftOwner.comArcrftOwner; + QComIdntfBas idnt = QComIdntfBas.comIdntfBas; BasDronModel result = query.select(Projections.bean(BasDronModel.class , - group.groupId, + bas.groupId, bas.arcrftSno, bas.arcrftHght, bas.arcrftLngth, @@ -175,29 +165,25 @@ public class PtyDronQueryRepository{ bas.updateUserId, bas.wghtTypeCd, bas.imageUrl, - owner.ownerSno, - owner.ownerNm, - owner.hpno, - owner.telno + idnt.idntfNum, + idnt.ownerNm, + idnt.hpno )).from(bas) - .leftJoin(group) - .on(bas.arcrftSno.eq(group.arcrftSno)) - .on(group.useYn.eq("Y")) - .leftJoin(owner) - .on(bas.arcrftSno.eq(owner.arcrftSno)) - .on(owner.useYn.eq("Y")) + .leftJoin(idnt) + .on(bas.arcrftSno.eq(idnt.arcrftSno)) + .on(bas.useYn.eq("Y")) .where(bas.arcrftSno.eq(arcrftSno)) .fetchOne(); - if(!StringUtils.isEmpty(result.getOwnerNm())) { - result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm())); - } - if(!StringUtils.isEmpty(result.getHpno())) { - result.setHpno(EncryptUtils.decrypt(result.getHpno())); - } - if(!StringUtils.isEmpty(result.getTelno())) { - result.setTelno(EncryptUtils.decrypt(result.getTelno())); - } +// if(!StringUtils.isEmpty(result.getOwnerNm())) { +// result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm())); +// } +// if(!StringUtils.isEmpty(result.getHpno())) { +// result.setHpno(EncryptUtils.decrypt(result.getHpno())); +// } +// if(!StringUtils.isEmpty(result.getTelno())) { +// result.setTelno(EncryptUtils.decrypt(result.getTelno())); +// } return result; @@ -265,7 +251,6 @@ public class PtyDronQueryRepository{ */ public List dronTop3(int cstmrSno){ QComArcrftBas bas = QComArcrftBas.comArcrftBas; - QPtyGroupArcrft groupArcrft = QPtyGroupArcrft.ptyGroupArcrft; QPtyCstmrGroup group = QPtyCstmrGroup.ptyCstmrGroup; List result = @@ -274,13 +259,11 @@ public class PtyDronQueryRepository{ bas.prdctNum, bas.createDt )).from(group) - .leftJoin(groupArcrft) - .on(group.groupId.eq(groupArcrft.groupId)) + .leftJoin(bas) + .on(group.groupId.eq(bas.groupId)) .on(group.joinYn.eq("Y")) .on(group.aprvlYn.eq("Y")) - .on(groupArcrft.useYn.eq("Y")) - .leftJoin(bas) - .on(groupArcrft.arcrftSno.eq(bas.arcrftSno)) + .on(bas.useYn.eq("Y")) .where(bas.useYn.eq("Y")) .where(group.cstmrSno.eq(cstmrSno)) .limit(3) diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java deleted file mode 100644 index 79c3e97..0000000 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.palnet.biz.jpa.repository.pty; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import com.palnet.biz.jpa.entity.PtyGroupArcrft; - -@Repository -public interface PtyGroupArcrftRepository extends JpaRepository{ - - @Modifying - @Query(value = "UPDATE PTY_GROUP_ARCRFT SET USE_YN='N' WHERE ARCRFT_SNO = :arcrftSno", nativeQuery = true) - int deleteByArcrftSno(@Param("arcrftSno") int arcrftSno); -}