인터페이스 화면, 인증정보 API 추가 팝업에 API_FULL_PATH 표시
This commit is contained in:
@@ -105,8 +105,9 @@
|
|||||||
url : url,
|
url : url,
|
||||||
postData : gridPostData,
|
postData : gridPostData,
|
||||||
colNames : [ '업무구분',
|
colNames : [ '업무구분',
|
||||||
|
'API ID',
|
||||||
'API 명',
|
'API 명',
|
||||||
'API 설명',
|
'API FULL PATH',
|
||||||
'요청',
|
'요청',
|
||||||
'응답',
|
'응답',
|
||||||
'작성자',
|
'작성자',
|
||||||
@@ -116,6 +117,7 @@
|
|||||||
colModel : [ { name : 'eaiBzwkDstcd' , align : 'center' , width:'40', sortable:false},
|
colModel : [ { name : 'eaiBzwkDstcd' , align : 'center' , width:'40', sortable:false},
|
||||||
{ name : 'eaiSvcName' , align : 'left' , width:'100'},
|
{ name : 'eaiSvcName' , align : 'left' , width:'100'},
|
||||||
{ name : 'eaiSvcDesc' , align : 'left' },
|
{ name : 'eaiSvcDesc' , align : 'left' },
|
||||||
|
{ name : 'apiFullPath' , align : 'left' , width:'180'},
|
||||||
{ name : 'fromAdapter' , align : 'center' , width:'40', formatter:adapterNameShortFormatter },
|
{ name : 'fromAdapter' , align : 'center' , width:'40', formatter:adapterNameShortFormatter },
|
||||||
{ name : 'toAdapter' , align : 'center' , width:'40', formatter:adapterNameShortFormatter },
|
{ name : 'toAdapter' , align : 'center' , width:'40', formatter:adapterNameShortFormatter },
|
||||||
{ name : 'author' , align : 'center' , width:'60' },
|
{ name : 'author' , align : 'center' , width:'60' },
|
||||||
|
|||||||
@@ -87,6 +87,7 @@
|
|||||||
colNames: ['업무구분',
|
colNames: ['업무구분',
|
||||||
'API ID(*)',
|
'API ID(*)',
|
||||||
'API 명',
|
'API 명',
|
||||||
|
'API FULL PATH',
|
||||||
'요청',
|
'요청',
|
||||||
'응답',
|
'응답',
|
||||||
'작성자',
|
'작성자',
|
||||||
@@ -97,6 +98,7 @@
|
|||||||
colModel: [{name: 'eaiBzwkDstcd', align: 'center', width: '40', sortable: false},
|
colModel: [{name: 'eaiBzwkDstcd', align: 'center', width: '40', sortable: false},
|
||||||
{name: 'eaiSvcName', align: 'left', width: '100', sortable: true},
|
{name: 'eaiSvcName', align: 'left', width: '100', sortable: true},
|
||||||
{name: 'eaiSvcDesc', align: 'left', sortable: false},
|
{name: 'eaiSvcDesc', align: 'left', sortable: false},
|
||||||
|
{name: 'apiFullPath', align: 'left', sortable: false},
|
||||||
{name: 'fromAdapter', align: 'center', width: '40', formatter: adapterNameShortFormatter, sortable: false},
|
{name: 'fromAdapter', align: 'center', width: '40', formatter: adapterNameShortFormatter, sortable: false},
|
||||||
{name: 'toAdapter', align: 'center', width: '40', formatter: adapterNameShortFormatter, sortable: false},
|
{name: 'toAdapter', align: 'center', width: '40', formatter: adapterNameShortFormatter, sortable: false},
|
||||||
{name: 'author', align: 'center', width: '60', sortable: false},
|
{name: 'author', align: 'center', width: '60', sortable: false},
|
||||||
@@ -391,10 +393,16 @@
|
|||||||
<td>
|
<td>
|
||||||
<input type="text" name="searchEaiSvcName" value="${param.searchEaiSvcName}">
|
<input type="text" name="searchEaiSvcName" value="${param.searchEaiSvcName}">
|
||||||
</td>
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
<th style="width:180px;">API 명</th>
|
<th style="width:180px;">API 명</th>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" name="searchEaiSvcDesc" value="${param.searchEaiSvcDesc}">
|
<input type="text" name="searchEaiSvcDesc" value="${param.searchEaiSvcDesc}">
|
||||||
</td>
|
</td>
|
||||||
|
<th style="width:180px;">API FULL PATH</th>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="searchApiFullPath" value="${param.searchApiFullPath}">
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
|
|||||||
QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
||||||
QServiceMessageEntity qServiceMessageEntity = QServiceMessageEntity.serviceMessageEntity;
|
QServiceMessageEntity qServiceMessageEntity = QServiceMessageEntity.serviceMessageEntity;
|
||||||
QRouting qRouting = QRouting.routing;
|
QRouting qRouting = QRouting.routing;
|
||||||
|
QStandardMessageInfo qStdInfo = QStandardMessageInfo.standardMessageInfo;
|
||||||
|
|
||||||
JPAQuery<Tuple> jpaQuery = createBaseQuery(eaiMessageUISearch);
|
JPAQuery<Tuple> jpaQuery = createBaseQuery(eaiMessageUISearch);
|
||||||
|
|
||||||
@@ -53,7 +54,12 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
|
|||||||
OrderSpecifier<?> orderSpecifier = getOrderSpecifier(qeaiMessageEntity, sortname, sortorder);
|
OrderSpecifier<?> orderSpecifier = getOrderSpecifier(qeaiMessageEntity, sortname, sortorder);
|
||||||
|
|
||||||
List<Tuple> eaiMessages = jpaQuery
|
List<Tuple> eaiMessages = jpaQuery
|
||||||
.select(qeaiMessageEntity, qServiceMessageEntity.psvintfacdsticname, qServiceMessageEntity.psvsysadptrbzwkgroupname, qRouting.nonmotivrouturiname)
|
.select(qeaiMessageEntity
|
||||||
|
, qServiceMessageEntity.psvintfacdsticname
|
||||||
|
, qServiceMessageEntity.psvsysadptrbzwkgroupname
|
||||||
|
, qRouting.nonmotivrouturiname
|
||||||
|
, qStdInfo.apifullpath
|
||||||
|
)
|
||||||
.limit(pageable.getPageSize())
|
.limit(pageable.getPageSize())
|
||||||
.offset(pageable.getOffset())
|
.offset(pageable.getOffset())
|
||||||
.orderBy(orderSpecifier)
|
.orderBy(orderSpecifier)
|
||||||
@@ -96,16 +102,23 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
|
|||||||
QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
||||||
QServiceMessageEntity qServiceMessageEntity = QServiceMessageEntity.serviceMessageEntity;
|
QServiceMessageEntity qServiceMessageEntity = QServiceMessageEntity.serviceMessageEntity;
|
||||||
QRouting qRouting = QRouting.routing;
|
QRouting qRouting = QRouting.routing;
|
||||||
|
QStandardMessageInfo qStdInfo = QStandardMessageInfo.standardMessageInfo;
|
||||||
|
|
||||||
BooleanBuilder predicate = createSelectListPredicate(eaiMessageUISearch);
|
BooleanBuilder predicate = createSelectListPredicate(eaiMessageUISearch);
|
||||||
|
|
||||||
return getJPAQueryFactory()
|
return getJPAQueryFactory()
|
||||||
.select(qeaiMessageEntity, qServiceMessageEntity.psvintfacdsticname, qRouting.nonmotivrouturiname)
|
.select(qeaiMessageEntity
|
||||||
|
, qServiceMessageEntity.psvintfacdsticname
|
||||||
|
, qRouting.nonmotivrouturiname
|
||||||
|
, qStdInfo.apifullpath
|
||||||
|
)
|
||||||
.from(qeaiMessageEntity)
|
.from(qeaiMessageEntity)
|
||||||
.join(qRouting)
|
.join(qRouting)
|
||||||
.on(qeaiMessageEntity.flowctrlroutname.eq(qRouting.routname))
|
.on(qeaiMessageEntity.flowctrlroutname.eq(qRouting.routname))
|
||||||
.leftJoin(qeaiMessageEntity.serviceMessages, qServiceMessageEntity)
|
.leftJoin(qeaiMessageEntity.serviceMessages, qServiceMessageEntity)
|
||||||
.on(qServiceMessageEntity.id.svcprcssno.eq(1))
|
.on(qServiceMessageEntity.id.svcprcssno.eq(1))
|
||||||
|
.leftJoin(qStdInfo)
|
||||||
|
.on(qeaiMessageEntity.eaisvcname.eq(qStdInfo.eaisvcname))
|
||||||
.where(predicate);
|
.where(predicate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,6 +127,7 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
|
|||||||
QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
|
||||||
QServiceMessageEntity qServiceMessageEntity = QServiceMessageEntity.serviceMessageEntity;
|
QServiceMessageEntity qServiceMessageEntity = QServiceMessageEntity.serviceMessageEntity;
|
||||||
QRouting qRouting = QRouting.routing;
|
QRouting qRouting = QRouting.routing;
|
||||||
|
QStandardMessageInfo qStdInfo = QStandardMessageInfo.standardMessageInfo;
|
||||||
|
|
||||||
BooleanBuilder predicate = new BooleanBuilder();
|
BooleanBuilder predicate = new BooleanBuilder();
|
||||||
|
|
||||||
@@ -167,6 +181,12 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
|
|||||||
.and(qServiceMessageEntity.psvintfacdsticname
|
.and(qServiceMessageEntity.psvintfacdsticname
|
||||||
.containsIgnoreCase(eaiMessageUISearch.getSearchPsvintfacdsticName()));
|
.containsIgnoreCase(eaiMessageUISearch.getSearchPsvintfacdsticName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isNotBlank(eaiMessageUISearch.getSearchApiFullPath())) {
|
||||||
|
predicate
|
||||||
|
.and(qStdInfo.apifullpath.contains(eaiMessageUISearch.getSearchApiFullPath()));
|
||||||
|
}
|
||||||
|
|
||||||
return predicate;
|
return predicate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,4 +20,6 @@ public class EAIMessageUISearch {
|
|||||||
private String tranChangeSim;
|
private String tranChangeSim;
|
||||||
private String searchRefKey;
|
private String searchRefKey;
|
||||||
|
|
||||||
|
private String searchApiFullPath;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.eactive.eai.data.entity.onl.message.QEAIMessageEntity;
|
|||||||
import com.eactive.eai.data.entity.onl.message.ServiceMessageEntity;
|
import com.eactive.eai.data.entity.onl.message.ServiceMessageEntity;
|
||||||
import com.eactive.eai.data.entity.onl.message.ServiceMessageEntityId;
|
import com.eactive.eai.data.entity.onl.message.ServiceMessageEntityId;
|
||||||
import com.eactive.eai.data.entity.onl.messagekey.MessageKey;
|
import com.eactive.eai.data.entity.onl.messagekey.MessageKey;
|
||||||
|
import com.eactive.eai.data.entity.onl.stdmessage.QStandardMessageInfo;
|
||||||
import com.eactive.eai.data.entity.onl.stdmessage.StandardMessageInfo;
|
import com.eactive.eai.data.entity.onl.stdmessage.StandardMessageInfo;
|
||||||
import com.eactive.eai.rms.common.base.OnlBaseService;
|
import com.eactive.eai.rms.common.base.OnlBaseService;
|
||||||
import com.eactive.eai.rms.common.combo.ComboService;
|
import com.eactive.eai.rms.common.combo.ComboService;
|
||||||
@@ -131,10 +132,13 @@ public class ApiInterfaceService extends OnlBaseService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Page<ApiInterfaceUI> selectList(EAIMessageUISearch eaiMessageUISearch, Pageable pageable,String sortname, String sortorder) {
|
public Page<ApiInterfaceUI> selectList(EAIMessageUISearch eaiMessageUISearch, Pageable pageable,String sortname, String sortorder) {
|
||||||
Page<Tuple> tuples = eaiMessageQueryService.selectList(eaiMessageUISearch, pageable, sortname, sortorder );
|
|
||||||
|
Page<Tuple> tuples = eaiMessageQueryService.selectList(eaiMessageUISearch, pageable, sortname, sortorder );
|
||||||
|
|
||||||
return tuples.map(tuple -> {
|
return tuples.map(tuple -> {
|
||||||
EAIMessageEntity eaiMessageEntity = tuple.get(QEAIMessageEntity.eAIMessageEntity);
|
EAIMessageEntity eaiMessageEntity = tuple.get(QEAIMessageEntity.eAIMessageEntity);
|
||||||
|
|
||||||
|
String apiFullPath = tuple.get(QStandardMessageInfo.standardMessageInfo.apifullpath);
|
||||||
|
|
||||||
ApiInterfaceUI apiInterfaceUI;
|
ApiInterfaceUI apiInterfaceUI;
|
||||||
if (eaiMessageEntity.getServiceMessages() != null && eaiMessageEntity.getServiceMessages().size() > 0) {
|
if (eaiMessageEntity.getServiceMessages() != null && eaiMessageEntity.getServiceMessages().size() > 0) {
|
||||||
@@ -142,7 +146,9 @@ public class ApiInterfaceService extends OnlBaseService {
|
|||||||
} else {
|
} else {
|
||||||
apiInterfaceUI = apiInterfaceUIMapper.toVo(eaiMessageEntity);
|
apiInterfaceUI = apiInterfaceUIMapper.toVo(eaiMessageEntity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
apiInterfaceUI.setApiFullPath(apiFullPath);
|
||||||
|
|
||||||
return apiInterfaceUI;
|
return apiInterfaceUI;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user