Browse Source

drone history 구분 설정

Test
노승철 2 years ago
parent
commit
cf559d90bc
  1. 2
      src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
  2. 13
      src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java

2
src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java

@ -116,7 +116,6 @@ public class CtrCntrlService {
List<CtrCntrlHstryArea> areaList = query.detailArea(controlId); List<CtrCntrlHstryArea> areaList = query.detailArea(controlId);
String stAreaNm = ""; String stAreaNm = "";
// log.debug(">>>>" + areaList );
for(CtrCntrlHstryArea data : areaList) { for(CtrCntrlHstryArea data : areaList) {
if(data.getActnType().equals("01")) { if(data.getActnType().equals("01")) {
@ -148,7 +147,6 @@ public class CtrCntrlService {
result.setStAreaNm(stAreaNm); result.setStAreaNm(stAreaNm);
return result; return result;
} }
/** /**

13
src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java

@ -132,11 +132,14 @@ public class MessageServiceImpl implements MessageService {
ctrCntrlJpaService.insertCtrCntrlBas(dbModel); ctrCntrlJpaService.insertCtrCntrlBas(dbModel);
} }
CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel); // Drone인 경우에만 history 생성
if (model.getObjectId().indexOf("PALDRONE") > -1) {
if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) { CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel);
ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno());
} if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) {
ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno());
}
}
} }
@Override @Override

Loading…
Cancel
Save