diff --git a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlMan.jsp b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlMan.jsp
index 2ec88dc..8d4b3e4 100644
--- a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlMan.jsp
+++ b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlMan.jsp
@@ -25,7 +25,7 @@ $(document).ready(function() {
datatype:"json",
mtype: 'POST',
url: url,
- postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val()},
+ postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val(), searchUseYn: $('select[name=searchUseYn]').val()},
colNames:['<%= localeMessage.getString("infAdpConMan.adaNm") %>',
'<%= localeMessage.getString("infAdpConMan.adaDes") %>',
'<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>',
@@ -62,6 +62,7 @@ $(document).ready(function() {
url2 += '&menuId='+'${param.menuId}';
//검색값
url2 += '&searchName='+$("input[name=searchName]").val();
+ url2 += '&searchUseYn='+$("select[name=searchUseYn]").val();
//key값
url2 += '&name='+name;
goNav(url2);
@@ -80,7 +81,7 @@ $(document).ready(function() {
resizeJqGridWidth('grid','content_middle','1000');
$("#btn_search").click(function(){
- $("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val()}, page:1 }).trigger("reloadGrid");
+ $("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val(), searchUseYn: $('select[name=searchUseYn]').val()}, page:1 }).trigger("reloadGrid");
});
$("#btn_new").click(function(){
var url2 = url_view;
@@ -126,6 +127,16 @@ $(document).ready(function() {
| <%= localeMessage.getString("infAdpConMan.adaNm") %> |
|
+ <%= localeMessage.getString("infAdpConMan.useYn") %> |
+
+
+
+
+ |
diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlMan.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlMan.jsp
index 5d0275e..e77d206 100644
--- a/WebContent/jsp/onl/admin/inflow/inflowClientControlMan.jsp
+++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlMan.jsp
@@ -25,7 +25,7 @@ $(document).ready(function() {
datatype:"json",
mtype: 'POST',
url: url,
- postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val()},
+ postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val(), searchUseYn: $('select[name=searchUseYn]').val()},
colNames:['클라이언트 ID',
'클라이언트명',
'<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>',
@@ -62,6 +62,7 @@ $(document).ready(function() {
url2 += '&menuId='+'${param.menuId}';
//검색값
url2 += '&searchName='+$("input[name=searchName]").val();
+ url2 += '&searchUseYn='+$("select[name=searchUseYn]").val();
//key값
url2 += '&name='+name;
goNav(url2);
@@ -80,7 +81,7 @@ $(document).ready(function() {
resizeJqGridWidth('grid','content_middle','1000');
$("#btn_search").click(function(){
- $("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val()}, page:1 }).trigger("reloadGrid");
+ $("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val(), searchUseYn: $('select[name=searchUseYn]').val()}, page:1 }).trigger("reloadGrid");
});
$("#btn_new").click(function(){
var url2 = url_view;
@@ -90,7 +91,8 @@ $(document).ready(function() {
url2 += '&menuId='+'${param.menuId}';
//검색값
url2 += '&searchName=';
-
+ url2 += '&searchUseYn='+$('select[name=searchUseYn]').val();
+
goNav(url2);
});
@@ -124,6 +126,16 @@ $(document).ready(function() {
| 클라이언트명 |
|
+ 사용여부 |
+
+
+
+
+ |
diff --git a/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp b/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp
index 04bf391..bc59f4d 100644
--- a/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp
+++ b/WebContent/jsp/onl/admin/inflow/inflowGroupControlMan.jsp
@@ -88,7 +88,7 @@ $(document).ready(function() {
datatype:"json",
mtype: 'POST',
url: url,
- postData : { cmd : 'LIST', searchGroupName: $('input[name=searchGroupName]').val()},
+ postData : { cmd : 'LIST', searchGroupName: $('input[name=searchGroupName]').val(), searchUseYn: $('select[name=searchUseYn]').val()},
colNames:['그룹 ID',
'그룹명',
'초당 임계치',
@@ -125,6 +125,7 @@ $(document).ready(function() {
url2 += '&menuId='+'${param.menuId}';
//검색값
url2 += '&searchGroupName='+$("input[name=searchGroupName]").val();
+ url2 += '&searchUseYn='+$("select[name=searchUseYn]").val();
//key값
url2 += '&groupId='+groupId;
goNav(url2);
@@ -143,7 +144,7 @@ $(document).ready(function() {
resizeJqGridWidth('grid','content_middle','1000');
$("#btn_search").click(function(){
- $("#grid").setGridParam({ postData: { searchGroupName: $('input[name=searchGroupName]').val()}, page:1 }).trigger("reloadGrid");
+ $("#grid").setGridParam({ postData: { searchGroupName: $('input[name=searchGroupName]').val(), searchUseYn: $('select[name=searchUseYn]').val()}, page:1 }).trigger("reloadGrid");
});
$("#btn_new").click(function(){
var url2 = url_view;
@@ -188,6 +189,16 @@ $(document).ready(function() {
| 그룹명 |
|
+ 사용여부 |
+
+
+
+
+ |
diff --git a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlMan.jsp b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlMan.jsp
index 096a59e..9612759 100644
--- a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlMan.jsp
+++ b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlMan.jsp
@@ -25,7 +25,7 @@ $(document).ready(function() {
datatype:"json",
mtype: 'POST',
url: url,
- postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val()},
+ postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val(), searchUseYn: $('select[name=searchUseYn]').val()},
colNames:['<%= localeMessage.getString("infIfConMan.ifNm") %>',
'<%= localeMessage.getString("infIfConMan.ifDesc") %>',
'<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>',
@@ -62,6 +62,7 @@ $(document).ready(function() {
url2 += '&menuId='+'${param.menuId}';
//검색값
url2 += '&searchName='+$("input[name=searchName]").val();
+ url2 += '&searchUseYn='+$("select[name=searchUseYn]").val();
//key값
url2 += '&name='+name;
goNav(url2);
@@ -80,7 +81,7 @@ $(document).ready(function() {
resizeJqGridWidth('grid','content_middle','1000');
$("#btn_search").click(function(){
- $("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val()}, page:1 }).trigger("reloadGrid");
+ $("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val(), searchUseYn: $('select[name=searchUseYn]').val()}, page:1 }).trigger("reloadGrid");
});
$("#btn_new").click(function(){
var url2 = url_view;
@@ -126,6 +127,16 @@ $(document).ready(function() {
| <%= localeMessage.getString("infIfConMan.ifNm") %> |
|
+ <%= localeMessage.getString("infAdpConMan.useYn") %> |
+
+
+
+
+ |
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java
index d68c379..a73f6aa 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java
@@ -27,6 +27,8 @@ import com.eactive.eai.rms.onl.manage.inflow.history.InflowControlHistoryManUISe
import com.eactive.eai.rms.onl.manage.inflow.inflow.InflowControlManMapper;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.impl.JPAQuery;
import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -46,7 +48,12 @@ public class InflowControlService extends AbstractDataService findAllForAdapter(Pageable pageable, String searchName) {
+ // 유량제어 미설정(useyn null)은 "사용안함" 검색 시 함께 조회되도록 처리
+ private static BooleanExpression useYnCondition(StringPath useYnPath, String searchUseYn) {
+ return "0".equals(searchUseYn) ? useYnPath.eq(searchUseYn).or(useYnPath.isNull()) : useYnPath.eq(searchUseYn);
+ }
+
+ public Page findAllForAdapter(Pageable pageable, String searchName, String searchUseYn) {
JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager);
QAdapterGroup qAdapterGroup = QAdapterGroup.adapterGroup;
QInflowControl qInflowControl = QInflowControl.inflowControl;
@@ -54,6 +61,8 @@ public class InflowControlService extends AbstractDataService findAllForInterface(Pageable pageable, String searchName) {
+ public Page findAllForInterface(Pageable pageable, String searchName, String searchUseYn) {
JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager);
QInflowControl qInflowControl = QInflowControl.inflowControl;
QEAIMessageEntity qEAIMessageEntity = QEAIMessageEntity.eAIMessageEntity;
+ BooleanBuilder boolBuilder = new BooleanBuilder();
+ boolBuilder.and(qEAIMessageEntity.eaisvcname.contains(searchName));
+ if (!StringUtils.isEmpty(searchUseYn))
+ boolBuilder.and(useYnCondition(qInflowControl.useyn, searchUseYn));
+
List tupleList = jpaQueryFactory
.select(qInflowControl, qEAIMessageEntity.eaisvcname, qEAIMessageEntity.eaisvcdesc)
.from(qEAIMessageEntity)
.leftJoin(qInflowControl)
.on(qInflowControl.id.type.eq(INTERFACE_TYPE_INFLOW).and(qInflowControl.id.name.eq(qEAIMessageEntity.eaisvcname)))
- .where(qEAIMessageEntity.eaisvcname.contains(searchName))
+ .where(boolBuilder)
.orderBy(qEAIMessageEntity.eaisvcname.asc())
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
@@ -145,7 +163,9 @@ public class InflowControlService extends AbstractDataService(dtoList, pageable, totalCount);
}
@@ -199,19 +219,24 @@ public class InflowControlService extends AbstractDataService findAllForClient(Pageable pageable, String searchName) {
-
+ public Page findAllForClient(Pageable pageable, String searchName, String searchUseYn) {
+
JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager);
QInflowControl qInflowControl = QInflowControl.inflowControl;
QClientEntity qClientEntity = QClientEntity.clientEntity;
+ BooleanBuilder boolBuilder = new BooleanBuilder();
+ boolBuilder.and(qClientEntity.clientname.contains(searchName));
+ if (!StringUtils.isEmpty(searchUseYn))
+ boolBuilder.and(useYnCondition(qInflowControl.useyn, searchUseYn));
+
List tupleList = jpaQueryFactory
.select(qInflowControl, qClientEntity.clientid, qClientEntity.clientname)
.from(qClientEntity)
.leftJoin(qInflowControl)
.on(qInflowControl.id.type.eq(CLIENT_TYPE_INFLOW)
.and(qInflowControl.id.name.eq(qClientEntity.clientid)))
- .where(qClientEntity.clientname.contains(searchName))
+ .where(boolBuilder)
.orderBy(qClientEntity.clientname.asc())
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
@@ -225,7 +250,10 @@ public class InflowControlService extends AbstractDataService(dtoList, pageable, totalCount);
}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java
index c3e31bf..d7b0400 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManController.java
@@ -59,8 +59,8 @@ public class InflowGroupControlManController extends OnlBaseAnnotationController
*/
@RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=LIST")
public ResponseEntity> selectList(HttpServletRequest request,
- Pageable pageVo, String searchGroupName) {
- Page uiPage = service.selectGroupList(pageVo, searchGroupName);
+ Pageable pageVo, String searchGroupName, String searchUseYn) {
+ Page uiPage = service.selectGroupList(pageVo, searchGroupName, searchUseYn);
return ResponseEntity.ok(new GridResponse<>(uiPage));
}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java
index 5c31e8b..97e4032 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/group/InflowGroupControlManService.java
@@ -61,7 +61,7 @@ public class InflowGroupControlManService extends BaseService {
/**
* 그룹 목록 조회
*/
- public Page selectGroupList(Pageable pageable, String searchGroupName) {
+ public Page selectGroupList(Pageable pageable, String searchGroupName, String searchUseYn) {
JPAQueryFactory jpaQueryFactory = new JPAQueryFactory(entityManager);
QInflowControlGroup qGroup = QInflowControlGroup.inflowControlGroup;
@@ -69,6 +69,10 @@ public class InflowGroupControlManService extends BaseService {
if (!StringUtils.isEmpty(searchGroupName)) {
boolBuilder.and(qGroup.groupName.contains(searchGroupName));
}
+ if (!StringUtils.isEmpty(searchUseYn)) {
+ // 유량제어 미설정(useYn null)은 "사용안함" 검색 시 함께 조회되도록 처리
+ boolBuilder.and("0".equals(searchUseYn) ? qGroup.useYn.eq(searchUseYn).or(qGroup.useYn.isNull()) : qGroup.useYn.eq(searchUseYn));
+ }
List groupList = jpaQueryFactory
.selectFrom(qGroup)
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java
index 01ea2b4..9a08e4c 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java
@@ -42,8 +42,8 @@ public class InflowAdapterControlManController extends OnlBaseAnnotationControll
@RequestMapping(value = "/onl/admin/inflow/inflowAdapterControlMan.json", params = "cmd=LIST")
public ResponseEntity> selectList(HttpServletRequest request, Pageable pageVo,
- String searchName) {
- Page uiPage = service.selectAdapterList(pageVo, searchName);
+ String searchName, String searchUseYn) {
+ Page uiPage = service.selectAdapterList(pageVo, searchName, searchUseYn);
return ResponseEntity.ok(new GridResponse<>(uiPage));
}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java
index a680058..6cec858 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java
@@ -44,8 +44,8 @@ public class InflowClientControlManController extends OnlBaseAnnotationControlle
@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST")
public ResponseEntity> selectList(HttpServletRequest request, Pageable pageVo,
- String searchName) {
- Page uiPage = service.selectClientList(pageVo, searchName);
+ String searchName, String searchUseYn) {
+ Page uiPage = service.selectClientList(pageVo, searchName, searchUseYn);
return ResponseEntity.ok(new GridResponse<>(uiPage));
}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java
index f5d0a0f..00058f6 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java
@@ -52,8 +52,8 @@ public class InflowControlManService extends BaseService {
private RestTemplate restTemplate = new RestTemplate();
// 어댑터 유량제어
- public Page selectAdapterList(Pageable pageable, String searchName) {
- Page dtoList = service.findAllForAdapter(pageable, searchName);
+ public Page selectAdapterList(Pageable pageable, String searchName, String searchUseYn) {
+ Page dtoList = service.findAllForAdapter(pageable, searchName, searchUseYn);
return dtoList.map(mapper::toVo);
}
@@ -86,8 +86,8 @@ public class InflowControlManService extends BaseService {
}
// 인터페이스 유량제어
- public Page selectInterfaceList(Pageable pageable, String searchName) {
- Page dtoList = service.findAllForInterface(pageable, searchName);
+ public Page selectInterfaceList(Pageable pageable, String searchName, String searchUseYn) {
+ Page dtoList = service.findAllForInterface(pageable, searchName, searchUseYn);
return dtoList.map(mapper::toVo);
}
@@ -120,8 +120,8 @@ public class InflowControlManService extends BaseService {
// 클라이언트 유량제어
- public Page selectClientList(Pageable pageable, String searchName) {
- Page dtoList = service.findAllForClient(pageable, searchName);
+ public Page selectClientList(Pageable pageable, String searchName, String searchUseYn) {
+ Page dtoList = service.findAllForClient(pageable, searchName, searchUseYn);
return dtoList.map(mapper::toVo);
}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java
index a72d95c..3557c7f 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java
@@ -42,8 +42,8 @@ public class InflowInterfaceControlManController extends OnlBaseAnnotationContro
@RequestMapping(value = "/onl/admin/inflow/inflowInterfaceControlMan.json", params = "cmd=LIST")
public ResponseEntity> selectList(HttpServletRequest request, Pageable pageVo,
- String searchName) {
- Page uiPage = service.selectInterfaceList(pageVo, searchName);
+ String searchName, String searchUseYn) {
+ Page uiPage = service.selectInterfaceList(pageVo, searchName, searchUseYn);
return ResponseEntity.ok(new GridResponse<>(uiPage));
}