Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/eapim-admin

2026-05-07 15:39:27 +09:00
parent 4ee50be000 9d55db3281
commit dbd36f28d4
12 changed files with 715 additions and 37 deletions
@@ -0,0 +1,138 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"%>
+<%@ page import="java.io.*"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ include file="/jsp/common/include/localemessage.jsp" %>
+<%
+	response.setHeader("Pragma", "No-cache");
+	response.setHeader("Cache-Control", "no-cache");
+	response.setHeader("Expires", "0");
+
+%>
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<jsp:include page="/jsp/common/include/css.jsp"/>
+<jsp:include page="/jsp/common/include/script.jsp"/>
+<script language="javascript" >
+var url      ='<c:url value="/onl/admin/inflow/inflowClientControlMan.json" />';
+var url_view ='<c:url value="/onl/admin/inflow/inflowClientControlMan.view" />';
+
+
+$(document).ready(function() {	
+	$('#grid').jqGrid({
+		datatype:"json",
+		mtype: 'POST',
+		url: url,
+		postData : { cmd : 'LIST', searchName: $('input[name=searchName]').val()},
+		colNames:['클라이언트 ID',
+                  '클라이언트명',
+                  '<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>',
+                  '<%= localeMessage.getString("infAdpConMan.thr") %>',
+                  '<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %>',
+                  '<%= localeMessage.getString("infAdpConMan.useYn") %>'
+        ],
+		colModel:[
+			{ name : 'NAME'					, align:'left'		, width:'100'	, sortable:false },
+			{ name : 'DESC'					, align:'left'		, width:'200'},
+			{ name : 'THRESHOLDPERSECOND'	, align:'right'		, width:'60'},
+			{ name : 'THRESHOLD' 			, align:'right'		, width:'60'},
+			{ name : 'THRESHOLDTIMEUNIT'	, align:'center'	, width:'80'},
+			{ name : 'USEYN'				, align:'center'	, width:'60'	, editoptions:{value:"0:사용안함;1:사용함"}, formatter:"select"  }
+		],
+        jsonReader: {
+             repeatitems:false
+        },	          
+		pager : $('#pager'),
+		page : '${param.page}',
+		rowNum : '${rmsDefaultRowNum}',
+	    autoheight: true,
+	    height: $("#container").height(),
+		autowidth: true,
+		viewrecords: true,
+		rowList : eval('[${rmsDefaultRowList}]'),
+		ondblClickRow: function(rowId) {
+			var rowData = $(this).getRowData(rowId); 
+            var name = rowData['NAME'];
+            var url2 = url_view;
+            url2 += '?cmd=DETAIL';
+            url2 += '&page='+$(this).getGridParam("page");
+            url2 += '&returnUrl='+getReturnUrl();
+            url2 += '&menuId='+'${param.menuId}';
+			//검색값
+            url2 += '&searchName='+$("input[name=searchName]").val();
+            //key값
+            url2 += '&name='+name;
+            goNav(url2);
+            
+        },
+		gridComplete:function (d){
+			var colModel = $(this).getGridParam("colModel");
+			for(var i = 0 ; i< colModel.length; i++){
+				$(this).setColProp(colModel[i].name, {sortable : false});			
+			}
+		
+		}	        		
+	});
+	
+	
+	resizeJqGridWidth('grid','content_middle','1000');
+
+	$("#btn_search").click(function(){
+		$("#grid").setGridParam({ postData: { searchName: $('input[name=searchName]').val()}, page:1 }).trigger("reloadGrid");
+	});
+	$("#btn_new").click(function(){
+		var url2 = url_view;
+		url2 += '?cmd=DETAIL';
+		url2 += '&page='+$("#grid").getGridParam("page");
+		url2 += '&returnUrl='+getReturnUrl();
+        url2 += '&menuId='+'${param.menuId}';
+		//검색값
+        url2 += '&searchName=';
+		
+        goNav(url2);
+	});
+	
+	$("input[name^=search]").keydown(function(key){
+		if (key.keyCode == 13){
+			$("#btn_search").click();
+		}
+	});
+	
+	buttonControl();
+	
+});
+ 
+</script>
+</head>
+	<body>		
+		<div class="right_box">
+			<div class="content_top">
+				<ul class="path">
+					<li><a href="#">${rmsMenuPath}</a></li>					
+				</ul>				
+			</div><!-- end content_top -->
+			<div class="content_middle" id="content_middle">
+				<div class="search_wrap">
+					<button type="button" class="cssbtn" id="btn_search" level="R"><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button>
+				</div>
+				<div class="title">클라이언트 유량제어<span class="tooltip">클라이언트(API Key) 유량제어를 관리한다</span></div>
+				
+				<table class="search_condition" cellspacing=0;>
+					<tbody>
+						<tr>
+							<th style="width:180px;">클라이언트명</th>
+							<td><input type="text" name="searchName" value="${param.searchName}"></td>
+						</tr>
+					</tbody>
+				</table>
+				
+				<table id="grid" ></table>
+				<div id="pager"></div>
+				
+			</div><!-- end content_middle -->
+		</div><!-- end right_box -->				
+	</body>
+</html>
+
@@ -0,0 +1,185 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"%>
+<%@ page import="java.io.*"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ include file="/jsp/common/include/localemessage.jsp" %>
+<%
+	response.setHeader("Pragma", "No-cache");
+	response.setHeader("Cache-Control", "no-cache");
+	response.setHeader("Expires", "0");
+%>
+
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<jsp:include page="/jsp/common/include/css.jsp"/>
+<jsp:include page="/jsp/common/include/script.jsp"/>
+
+<script language="javascript" >
+var url      ='<c:url value="/onl/admin/inflow/inflowClientControlMan.json" />';
+var url_view ='<c:url value="/onl/admin/inflow/inflowClientControlMan.view" />';
+var isDetail = false;
+function init(url,key,callback){
+	$.ajax({  
+		type : "POST",
+		url:url,
+		dataType:"json",
+		data:{cmd: 'LIST_INIT_COMBO'},
+		success:function(json){
+			new makeOptions("CODE","NAME").setObj($("select[name=useYn]")).setData(json.useYnRows).setFormat(codeName3OptionFormat).rendering();
+			new makeOptions("CODE","NAME").setObj($("select[name=thresholdTimeUnit]")).setNoValueInclude(true).setData(json.timeUnitRows).setFormat(codeName3OptionFormat).rendering();
+			
+			if(typeof callback === 'function') {
+				callback(url,key);
+			}
+		},
+		error:function(e){
+			alert(e.responseText);
+		}
+	});
+}
+function detail(url,key){
+	if (!isDetail)return;
+	$.ajax({  
+		type : "POST",
+		url:url,
+		dataType:"json",
+		data:{cmd: 'DETAIL', name : key},
+		success:function(json){
+			var data = json;
+			$("input[name=name]").attr('readonly',true);
+			$("input[name=desc]").attr('readonly',true);
+			
+			$("#ajaxForm input[type!=radio],#ajaxForm select,#ajaxForm textarea").each(function(){
+				var name = $(this).attr("name");
+				var tag  = $(this).prop("tagName").toLowerCase();
+				$(tag+"[name="+name+"]").val(data[name.toUpperCase()]);
+			});
+
+		},
+		error:function(e){
+			alert(e.responseText);
+		}
+	});
+}
+$(document).ready(function() {	
+	var returnUrl = getReturnUrlForReturn();
+	var key ="${param.name}";
+	if (key != "" && key !="null"){
+		isDetail = true;
+	}	
+	init(url,key,detail);
+	
+	
+	$("#btn_modify").click(function(){
+		var postData = $('#ajaxForm').serializeArray();
+		if (isDetail){
+			postData.push({ name: "cmd" , value:"UPDATE"});
+		}else{
+			postData.push({ name: "cmd" , value:"INSERT"});
+		}
+		$.ajax({
+			type : "POST",
+			url:url,
+			data:postData,
+			success:function(args){
+				alert("<%= localeMessage.getString("common.saveMsg") %>");
+				goNav(returnUrl);//LIST로 이동
+			},
+			error:function(e){
+				alert(e.responseText);
+			}
+		});
+	});
+	$("#btn_delete").click(function(){
+		
+		if ( confirm( '<%=localeMessage.getString("common.confirmMsg")%>' ) != true ) return;
+		
+		var postData = $('#ajaxForm').serializeArray();
+		postData.push({ name: "cmd" , value:"DELETE"});
+		$.ajax({
+			type : "POST",
+			url:url,
+			data:postData,
+			success:function(args){
+				alert("<%= localeMessage.getString("common.deleteMsg") %>");
+				goNav(returnUrl);//LIST로 이동
+
+			},
+			error:function(e){
+				alert(e.responseText);
+			}
+		});
+	});	
+	$("#btn_previous").click(function(){
+		goNav(returnUrl);//LIST로 이동
+	});
+
+	buttonControl(isDetail);
+	titleControl(isDetail);
+});
+ 
+</script>
+</head>
+	<body>
+		<div class="right_box">
+			<div class="content_top">
+				<ul class="path">
+					<li><a href="#">${rmsMenuPath}</a></li>					
+				</ul>					
+			</div><!-- end content_top -->
+			<div class="content_middle">
+				<div class="search_wrap">
+					<button type="button" class="cssbtn" id="btn_delete" level="W" status="DETAIL"><i class="material-icons">delete</i> <%= localeMessage.getString("button.delete") %></button>
+					<button type="button" class="cssbtn" id="btn_modify" level="W" status="DETAIL,NEW"><i class="material-icons">save</i> <%= localeMessage.getString("button.modify") %></button>
+					<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
+				</div>
+				<div class="title">클라이언트 유량제어 <span class="tooltip" >클라이언트 유량제어 </span></div>				
+				
+				<table id="grid" ></table>
+				<div id="pager"></div>
+				
+				<!-- detail -->
+				<form id="ajaxForm">
+				<table class="table_row" cellspacing="0">
+					<tr>
+						<th style="width:20%;">클라이언트 ID</th>
+						<td><input type="text" name="name" /></td>
+					</tr>
+					<tr>
+						<th style="width:20%;">클라이언트명</th>
+						<td><input type="text" name="desc" /></td>
+					</tr>
+					<tr>
+						<th style="width:20%;"><%= localeMessage.getString("infAdpConMan.thrPerSecond") %></th>
+						<td><input type="text"  name="thresholdPerSecond" /></td>
+					</tr>
+					<tr>
+						<th style="width:20%;"><%= localeMessage.getString("infAdpConMan.thr") %></th>
+						<td><input type="text"  name="threshold" /></td>
+					</tr>
+					<tr>
+						<th style="width:20%;"><%= localeMessage.getString("infAdpConMan.thrTimeUnit") %></th>
+						<td>
+							<div class="select-style">
+								<select name="thresholdTimeUnit" />
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th style="width:20%;"><%= localeMessage.getString("infAdpConMan.useYn") %></th>
+						<td>
+						<div class="select-style">
+									<select name="useYn" />
+								</div>
+						</td>
+					</tr>
+				</table>
+				</form>
+				
+			</div><!-- end content_middle -->
+		</div><!-- end right_box -->	
+	</body>
+</html>
+
@@ -17,6 +17,17 @@
 	<script language="javascript" >
 		var url      = '<c:url value="/onl/apim/portalnotice/portalNoticeMan.json" />';
 		var url_view = '<c:url value="/onl/apim/portalnotice/portalNoticeMan.view" />';
+		var combo;
+		
+		function formatNoticeType(cellvalue, options, rowObject) {
+			var name = "";
+			for (var i = 0; i < combo.noticeTypeList.length; i++) {
+				if (combo.noticeTypeList[i].CODE == cellvalue) {
+					return combo.noticeTypeList[i].NAME;	
+				}
+			}
+			return cellvalue;
+		}
 		
 		function formatuseYn(cellvalue, options, rowObject) {
 			return cellvalue === 'N'
@@ -24,27 +35,57 @@
 					: '<span>사용</span>';
 		}
 		
+		function formatFixYn(cellvalue, options, rowObject) {
+			return cellvalue === 'Y'
+					? '고정'
+					: '';
+		}
+
 		function formatFile(cellvalue, options, rowObject) {
 			var iconPath = '${pageContext.request.contextPath}/images/icon_file.png';
 			var icon = rowObject.hasAttachment ? '<img src="' + iconPath + '" alt="File Attached" style="vertical-align: middle; margin-left: 5px; width: 16px; height: 16px;">' : '';
 			return cellvalue + icon;
 		}
 		
+		
+		function init(){
+			$.ajax({
+				type : "POST",
+				url:url,
+				dataType:"json",
+				data:{cmd: 'LIST_INIT_COMBO'},
+				success:function(json){
+					console.log('init', json);
+					combo = json;
+					new makeOptions("CODE","NAME").setObj($("select[name=searchNoticeType]")).setNoValueInclude(true).setNoValue('','<%=localeMessage.getString("combo.all")%>').setData(json.noticeTypeList).rendering();
+				
+					putSelectFromParam();
+				},
+				error:function(e){
+					alert(e.responseText);
+				}
+			});
+		}
+
 		$(document).ready(function() {
+						
 			$('#grid').jqGrid({
 				datatype:"json",
 				mtype: 'POST',
 				url: url,
 				postData : { cmd : 'LIST',
+					searchNoticeType: $('select[name=searchNoticeType]').val(),
 					searchUseYn: $('select[name=searchUseYn]').val(),
 					searchNoticeSubject: $('input[name=searchNoticeSubject]').val(),
 					searchNoticeDetail: $('input[name=searchNoticeDetail]').val()
 				},
-				colNames:['id', 'No.', '제목', '사용', '마지막 수정일', '등록일', '등록자', '조회수'],
+				colNames:['id', 'No.', '게시유형', '제목', '고정여부', '사용', '마지막 수정일', '등록일', '등록자', '조회수'],
 				colModel:[
 					{ name : 'id'       	   , align:'center', key:true, hidden:true},
-					{ name : 'rowNum'          , align:'center', width:80 },
-					{ name : 'noticeSubject'   , align:'left'  , width:200 , formatter: formatFile },
+					{ name : 'rowNum'          , align:'center', width:60 },
+					{ name : 'noticeType'  	   , align:'center', width:60, formatter: formatNoticeType  },
+					{ name : 'noticeSubject'   , align:'left'  , width:300, formatter: formatFile },
+					{ name : 'fixYn'           , align:'center', width:60, formatter: formatFixYn },
 					{ name : 'useYn'           , align:'center', width:60, formatter: formatuseYn },
 					{ name : 'lastModifiedDate', align:'center', width:120 , formatter: timeStampFormat},
 					{ name : 'createdDate'     , align:'center', width:120, formatter: timeStampFormat },
@@ -98,6 +139,8 @@
 				}
 			});

+			init();
+
 			resizeJqGridWidth('grid','content_middle','1000');

 			$("#btn_search").click(function(){
@@ -140,9 +183,25 @@
 		<div class="title">공지사항 목록<span class="tooltip">공지사항을 관리합니다.</span></div>
 		<form id="ajaxForm"  onsubmit="return false;">
 			<table class="search_condition" cellspacing=0;>
+				<colgroup> 
+			        <col style="width:180px;"> 
+			        <col style="width:240px;"> 
+			        <col style="width:180px;"> 
+			        <col style="width:240px;">
+			        <col style="width:180px;"> 
+			        <col style="width:240px;">
+			    </colgroup>
 				<tbody>
 				<tr>
-					<th style="width:180px;">사용여부</th>
+					<th>게시유형</th>
+					<td>
+						<div class="select-style">
+							<select name="searchNoticeType"></select>
+						</div>
+					</td>
+					<th>제목/내용</th>
+					<td><input type="text" name="searchSubjectDetail"></td>
+					<th>사용여부</th>
 					<td>
 						<div class="select-style">
 							<select name="searchUseYn">
@@ -152,8 +211,6 @@
 							</select>
 						</div>
 					</td>
-					<th style="width:180px;">제목/내용</th>
-					<td><input type="text" name="searchSubjectDetail"></td>
 				</tr>
 				</tbody>
 			</table>
@@ -24,7 +24,36 @@
 	var fileInfo = null;

 	function init() {
+		var key = "${param.id}";
+		isDetail = key != "" && key != "null";
+
+		if (isDetail) {
+			$("#title").append(" 수정");
+			buttonControl(true);
+		} else {
+			$("#title").append(" 등록");
+			$("#btn_modify").html('<i class="material-icons">save</i> <%= localeMessage.getString("button.register") %>');
+			buttonControl(false);
+		}
+		
 		// 초기화 로직
+		$.ajax({
+			type : "POST",
+			url:url,
+			dataType:"json",
+			data:{cmd: 'LIST_INIT_COMBO'},
+			success:function(json){
+				combo = json;
+				new makeOptions("CODE","NAME").setObj($("select[name=noticeType]")).setNoValueInclude(false).setData(json.noticeTypeList).rendering();
+				
+				if (key) {
+					detail(key);
+				}
+			},
+			error:function(e){
+				alert(e.responseText);
+			}
+		});
 	}

 	function decodeHTMLEntities(text) {
@@ -98,8 +127,10 @@
 			data: {cmd: 'DETAIL', id: key},
 			success: function (data) {
 				$("#id").val(key);
+				$('#noticeType').val(data.noticeType);
 				$("#noticeSubject").val(data.noticeSubject);
 				$("#useYn").prop("checked", data.useYn === "Y");
+				$("#fixYn").prop("checked", data.fixYn === "Y");

 				var decodedContent = decodeHTMLEntities(data.noticeDetail);
 				$('#contents').summernote('code', decodedContent);
@@ -123,29 +154,16 @@

 	$(document).ready(function () {
 		var returnUrl = getReturnUrlForReturn();
-		var key = "${param.id}";
-		isDetail = key != "" && key != "null";
-
-		if (isDetail) {
-			$("#title").append(" 수정");
-			buttonControl(true);
-		} else {
-			$("#title").append(" 등록");
-			$("#btn_modify").html('<i class="material-icons">save</i> <%= localeMessage.getString("button.register") %>');
-			buttonControl(false);
-		}
 		
 		init();
 		
+
 		// Summernote 에디터 초기화 (이미지 붙여넣기 data-uri 방식, 리사이징 지원)
 		initSummernote('#contents', {
 			placeholder: '여기에 내용을 입력하세요.',
 			height: 300
 		});

-		if (key) {
-			detail(key);
-		}

 		$('#fileInput').change(function(e) {
 			var file = e.target.files[0];
@@ -175,6 +193,7 @@
 			var formData = new FormData($("#ajaxForm")[0]);

 			formData.set("useYn", $("#useYn").is(":checked") ? "Y" : "N");
+			formData.set("fixYn", $("#fixYn").is(":checked") ? "Y" : "N");
 			formData.set("noticeDetail", $('#contents').summernote('code'));

 			formData.append("cmd", isDetail ? "UPDATE" : "INSERT");
@@ -244,24 +263,43 @@
 		<form id="ajaxForm" enctype="multipart/form-data" accept-charset="UTF-8">
 			<input type="hidden" name="id" id="id">
 			<table class="table_row" cellspacing="0">
+				<colgroup>
+					<col style="width: 10%"/>
+					<col style="width: 40%"/>
+					<col style="width: 10%"/>
+					<col style="width: 40%"/>
+				</colgroup>
 				<tr>
-					<th style="width:20%;">사용여부</th>
-					<td>
-						<input type="checkbox" name="useYn" id="useYn" value="Y" ${portalNoticeUI.useYn eq 'Y' ? 'checked' : ''}> 사용</td>
+					<th>게시유형</th>
+					<td colspan="3">		
+						<div class="select-style" >
+							<select name="noticeType" id="noticeType"></select>
+						</div>
+					</td>
 				</tr>
 				<tr>
-					<th style="width:20%;">제목 <font color="red">*</font></th>
-					<td><input type="text" id="noticeSubject" name="noticeSubject" style="width:100%" data-required data-warning="제목을 입력하여 주십시오."/></td>
+					<th>제목 <font color="red">*</font></th>
+					<td colspan="3"><input type="text" id="noticeSubject" name="noticeSubject" style="width:100%" data-required data-warning="제목을 입력하여 주십시오."/></td>
 				</tr>
 				<tr>
-					<th style="width:20%;">본문 <font color="red">*</font></th>
+					<th>사용여부</th>
 					<td>
+						<input type="checkbox" name="useYn" id="useYn" value="Y" ${portalNoticeUI.useYn eq 'Y' ? 'checked' : ''}> 사용
+					</td>
+					<th>고정여부</th>
+					<td>
+						<input type="checkbox" name="fixYn" id="fixYn" value="Y" ${portalNoticeUI.fixYn eq 'Y' ? 'checked' : ''}> 고정
+					</td>
+				</tr>
+				<tr>
+					<th>본문 <font color="red">*</font></th>
+					<td colspan="3">
 						<textarea id="contents" name="noticeDetail" style="width:100%;height:300px" data-required data-warning="본문을 입력하여 주십시오."></textarea>
 					</td>
 				</tr>
 				<tr>
-					<th style="width:20%;">첨부파일</th>
-					<td>
+					<th>첨부파일</th>
+					<td colspan="3">
 						<div style="margin: 5px 0px;  display: inline-block;">
 							<input type="file" id="fileInput" name="files" style="display:none;" />
 							<button type="button" id="addFile" class="cssbtn smallBtn">파일 선택</button>
@@ -10,6 +10,9 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
@Service
@Transactional(transactionManager = "transactionManagerForEMS")
 public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, String, PortalNoticeRepository> {
@@ -19,6 +22,10 @@ public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, St

 		BooleanBuilder predicate = new BooleanBuilder();

+		if (StringUtils.isNotBlank(portalNoticeUISearch.getSearchNoticeType())) {
+			predicate.and(qPortalNotice.noticeType.eq(portalNoticeUISearch.getSearchNoticeType()));
+		}
+		
 		if (StringUtils.isNotBlank(portalNoticeUISearch.getSearchUseYn())) {
 			predicate.and(qPortalNotice.useYn.eq(portalNoticeUISearch.getSearchUseYn()));
 		}
@@ -28,7 +35,12 @@ public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, St
 					.or(qPortalNotice.noticeDetail.containsIgnoreCase(portalNoticeUISearch.getSearchSubjectDetail())));
 		}

-		return repository.findAll(predicate, pageable);
+		//return repository.findAll(predicate, pageable);
+		
+		Sort fixYnFirst = Sort.by(Sort.Direction.DESC, "fixYn");
+		Sort combinedSort = fixYnFirst.and(pageable.getSort());
+		Pageable fixedPageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), combinedSort);
+		return repository.findAll(predicate, fixedPageable);
 	}

 }
@@ -5,6 +5,7 @@ import lombok.Data;
@Data
 public class PortalNoticeUISearch {

+	private String searchNoticeType;
 	private String searchUseYn;
 	private String searchSubjectDetail;

@@ -1,6 +1,9 @@
 package com.eactive.eai.rms.data.entity.onl.inflow;

+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;

 import javax.persistence.EntityManager;
@@ -13,6 +16,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

+import com.eactive.apim.portal.app.entity.QCredential;
 import com.eactive.eai.data.entity.onl.adapter.QAdapterGroup;
 import com.eactive.eai.data.entity.onl.inflow.InflowControl;
 import com.eactive.eai.data.entity.onl.inflow.InflowControlId;
@@ -33,10 +37,15 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
 public class InflowControlService extends AbstractDataService<InflowControl, InflowControlId, InflowControlRepository> {

 	private static final String ADAPTER_TYPE_INFLOW = "01";
+	private static final String INTERFACE_TYPE_INFLOW = "02";
+	private static final String CLIENT_TYPE_INFLOW = "03";

 	@PersistenceContext
 	EntityManager entityManager;

+	@PersistenceContext(unitName = "entityManagerFactoryForEMS")
+	EntityManager entityManagerForEMS;
+
 	@Autowired
 	InflowControlManMapper mapper;

@@ -124,7 +133,7 @@ public class InflowControlService extends AbstractDataService<InflowControl, Inf
 				.select(qInflowControl, qEAIMessageEntity.eaisvcname, qEAIMessageEntity.eaisvcdesc)
 				.from(qEAIMessageEntity)
 				.leftJoin(qInflowControl)
-				.on(qInflowControl.id.type.eq("02").and(qInflowControl.id.name.eq(qEAIMessageEntity.eaisvcname)))
+				.on(qInflowControl.id.type.eq(INTERFACE_TYPE_INFLOW).and(qInflowControl.id.name.eq(qEAIMessageEntity.eaisvcname)))
 				.where(qEAIMessageEntity.eaisvcname.contains(searchName))
 				.orderBy(qEAIMessageEntity.eaisvcname.asc())
 				.offset(pageable.getOffset())
@@ -144,6 +153,8 @@ public class InflowControlService extends AbstractDataService<InflowControl, Inf
 		return new PageImpl<>(dtoList, pageable, totalCount);
 	}
 	
+	
+
 	private InflowControlServiceDto toDto(QEAIMessageEntity qEAIMessageEntity, QInflowControl qInflowControl,
 			Tuple tuple) {
 		InflowControlServiceDto dto = null;
@@ -167,13 +178,109 @@ public class InflowControlService extends AbstractDataService<InflowControl, Inf
 				.select(qInflowControl, qEAIMessageEntity.eaisvcname, qEAIMessageEntity.eaisvcdesc)
 				.from(qEAIMessageEntity)
 				.leftJoin(qInflowControl)
-				.on(qInflowControl.id.type.eq("02").and(qInflowControl.id.name.eq(qEAIMessageEntity.eaisvcname)))
+				.on(qInflowControl.id.type.eq(INTERFACE_TYPE_INFLOW).and(qInflowControl.id.name.eq(qEAIMessageEntity.eaisvcname)))
 				.where(qEAIMessageEntity.eaisvcname.eq(eaisvcname))
 				.fetchOne();

 		return toDto(qEAIMessageEntity, qInflowControl, tuple);
 	}
 	
+	public InflowControlServiceDto findByIdForClient(String clientId) {
+		QCredential qCredential = QCredential.credential;
+		QInflowControl qInflowControl = QInflowControl.inflowControl;
+
+		// EMSADM: Credential 조회
+		Tuple credTuple = new JPAQueryFactory(entityManagerForEMS)
+				.select(qCredential.clientid, qCredential.clientname)
+				.from(qCredential)
+				.where(qCredential.clientid.eq(clientId))
+				.fetchOne();
+
+		// AGWADM: InflowControl 조회
+		InflowControl inflowControl = new JPAQueryFactory(entityManager)
+				.selectFrom(qInflowControl)
+				.where(qInflowControl.id.type.eq(CLIENT_TYPE_INFLOW)
+						.and(qInflowControl.id.name.eq(clientId)))
+				.fetchOne();
+
+		InflowControlServiceDto dto;
+		if (inflowControl != null) {
+			dto = mapper.toDto(inflowControl);
+		} else {
+			dto = new InflowControlServiceDto();
+			dto.setName(clientId);
+			dto.setType(CLIENT_TYPE_INFLOW);
+		}
+		if (credTuple != null) {
+			dto.setDesc(credTuple.get(qCredential.clientname));
+		}
+		return dto;
+	}
+
+	public Page<InflowControlServiceDto> findAllForClient(Pageable pageable, String searchName) {
+		QCredential qCredential = QCredential.credential;
+		QInflowControl qInflowControl = QInflowControl.inflowControl;
+
+		// EMSADM: Credential 목록 및 건수 조회
+		JPAQueryFactory emsFactory = new JPAQueryFactory(entityManagerForEMS);
+		BooleanBuilder credPredicate = new BooleanBuilder();
+		if (!StringUtils.isEmpty(searchName)) {
+			credPredicate.and(qCredential.clientname.contains(searchName));
+		}
+
+		long totalCount = emsFactory
+				.select(qCredential.clientid.count())
+				.from(qCredential)
+				.where(credPredicate)
+				.fetchOne();
+
+		List<Tuple> credList = emsFactory
+				.select(qCredential.clientid, qCredential.clientname)
+				.from(qCredential)
+				.where(credPredicate)
+				.orderBy(qCredential.clientname.asc())
+				.offset(pageable.getOffset())
+				.limit(pageable.getPageSize())
+				.fetch();
+
+		if (credList.isEmpty()) {
+			return new PageImpl<>(Collections.emptyList(), pageable, totalCount);
+		}
+
+		// AGWADM: 해당 clientId의 InflowControl 일괄 조회
+		List<String> clientIds = credList.stream()
+				.map(t -> t.get(qCredential.clientid))
+				.collect(Collectors.toList());
+
+		Map<String, InflowControl> inflowMap = new JPAQueryFactory(entityManager)
+				.selectFrom(qInflowControl)
+				.where(qInflowControl.id.type.eq(CLIENT_TYPE_INFLOW)
+						.and(qInflowControl.id.name.in(clientIds)))
+				.fetch()
+				.stream()
+				.collect(Collectors.toMap(ic -> ic.getId().getName(), ic -> ic));
+
+		// Java에서 병합
+		List<InflowControlServiceDto> dtoList = credList.stream()
+				.map(tuple -> {
+					String clientId = tuple.get(qCredential.clientid);
+					InflowControl inflowControl = inflowMap.get(clientId);
+					InflowControlServiceDto dto;
+					if (inflowControl != null) {
+						dto = mapper.toDto(inflowControl);
+					} else {
+						dto = new InflowControlServiceDto();
+						dto.setName(clientId);
+						dto.setType(CLIENT_TYPE_INFLOW);
+					}
+					dto.setDesc(tuple.get(qCredential.clientname));
+					return dto;
+				})
+				.collect(Collectors.toList());
+
+		return new PageImpl<>(dtoList, pageable, totalCount);
+	}
+	
 	public Page<Tuple> selectLogList(Pageable pageable, InflowControlHistoryManUISearch uiSearch) {
 		QInflowControlLog qlog = QInflowControlLog.inflowControlLog;
        QInflowControlGroup qgroup = QInflowControlGroup.inflowControlGroup;
@@ -1,6 +1,8 @@
 package com.eactive.eai.rms.onl.apim.portalnotice;

 import com.eactive.eai.rms.common.base.BaseAnnotationController;
+import com.eactive.eai.rms.common.combo.ComboService;
+import com.eactive.eai.rms.common.combo.ComboVo;
 import com.eactive.eai.rms.common.login.SessionManager;
 import com.eactive.eai.rms.common.vo.GridResponse;
 import com.eactive.eai.rms.data.entity.onl.apim.portalnotice.PortalNoticeUISearch;
@@ -16,12 +18,16 @@ import org.springframework.web.bind.annotation.PostMapping;

 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

@Controller
@RequiredArgsConstructor
 public class PortalNoticeManController extends BaseAnnotationController {

 	private final PortalNoticeManService portalNoticeManService;
+	private final ComboService comboService;

 	@GetMapping(value = "/onl/apim/portalnotice/portalNoticeMan.view")
 	public void view() {
@@ -41,6 +47,14 @@ public class PortalNoticeManController extends BaseAnnotationController {
 		return ResponseEntity.ok(new GridResponse<>(page));
 	}
 	
+	@PostMapping(value = "/onl/apim/portalnotice/portalNoticeMan.json", params = "cmd=LIST_INIT_COMBO")
+	public ResponseEntity<Map<String, Object>> initCombo() {
+		List<ComboVo> noticeTypeList = comboService.getMonitoringCodeSortedBySeq("NOTICE_TYPE");
+		Map<String, Object> resultMap = new HashMap<>();
+		resultMap.put("noticeTypeList", noticeTypeList);
+		return ResponseEntity.ok(resultMap);
+	}
+
 	@PostMapping(value = "/onl/apim/portalnotice/portalNoticeMan.json", params = "cmd=DETAIL")
 	public ResponseEntity<PortalNoticeUI> selectDetail(String id) {
 		PortalNoticeUI PortalNoticeUI = portalNoticeManService.selectDetail(id);
@@ -93,8 +93,9 @@ public class PortalNoticeManService extends BaseService {
 	}

 	public void insert(PortalNoticeUI portalNoticeUI) throws IOException {
-		portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
-		portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		//portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
+		//portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		portalNoticeUI.setNoticeDetail(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail()));

 		PortalNotice portalNotice = portalNoticeUIMapper.toEntity(portalNoticeUI);
 		portalNotice.setId(null);
@@ -123,8 +124,9 @@ public class PortalNoticeManService extends BaseService {
 	}

 	public void update(PortalNoticeUI portalNoticeUI) throws IOException {
-		portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
- 		portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		//portalNoticeUI.setNoticeSubject(decodeString(portalNoticeUI.getNoticeSubject()));
+ 		//portalNoticeUI.setNoticeDetail(decodeString(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail())));
+		portalNoticeUI.setNoticeDetail(StringEscapeUtils.unescapeHtml(portalNoticeUI.getNoticeDetail()));

 		PortalNotice portalNotice = portalNoticeService.getById(portalNoticeUI.getId());

@@ -33,6 +33,11 @@ public class PortalNoticeUI {

 	private String inquirerName;
 	
+	private String fixYn;
+	
+	private String noticeType;
+	
+
 	private String createdBy;

 	@JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14)
@@ -0,0 +1,86 @@
+package com.eactive.eai.rms.onl.manage.inflow.inflow;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.eactive.eai.agent.command.CommonCommand;
+import com.eactive.eai.rms.common.base.OnlBaseAnnotationController;
+import com.eactive.eai.rms.common.combo.ComboService;
+import com.eactive.eai.rms.common.combo.ComboVo;
+import com.eactive.eai.rms.common.vo.GridResponse;
+
+@Controller
+public class InflowClientControlManController extends OnlBaseAnnotationController {
+
+	@Autowired
+	private InflowControlManService service;
+
+	@Autowired
+	private ComboService comboService;
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.view")
+	public String viewList() {
+		return "/onl/admin/inflow/inflowClientControlMan";
+	}
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.view", params = "cmd=DETAIL")
+	public String viewDetail() {
+		return "/onl/admin/inflow/inflowClientControlManDetail";
+	}
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST")
+	public ResponseEntity<GridResponse<InflowControlManUI>> selectList(HttpServletRequest request, Pageable pageVo,
+			String searchName) {
+		Page<InflowControlManUI> uiPage = service.selectClientList(pageVo, searchName);
+		return ResponseEntity.ok(new GridResponse<>(uiPage));
+	}
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=DETAIL")
+	public ResponseEntity<InflowControlManUI> selectDetail(HttpServletRequest request, HttpServletResponse response,
+			String name) {
+		InflowControlManUI ui = service.selectClientDetail(name);
+		return ResponseEntity.ok(ui);
+	}
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=UPDATE")
+	public String save(HttpServletRequest request, HttpServletResponse response, InflowControlManUI ui)
+			throws Exception {
+		service.mergeClient(ui);
+		CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.ReloadInflowClientControlCommand",
+				ui.getName());
+		agentUtilService.broadcast(command);
+		return null;
+	}
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=DELETE")
+	public String delete(HttpServletRequest request, HttpServletResponse response, String name) throws Exception {
+		service.deleteClient(name);
+		CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.RemoveInflowClientControlCommand",
+				name);
+		agentUtilService.broadcast(command);
+		return null;
+	}
+
+	@RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST_INIT_COMBO")
+	public ModelAndView initCombo(HttpServletRequest request, HttpServletResponse response) {
+		List<ComboVo> useYnRows = comboService.getFromCode("USE_YN");
+		List<ComboVo> timeUnitRows = comboService.getFromCode("INFLOW_CTRL_TIME_UNIT");
+		Map<String, List<ComboVo>> resultMap = new HashMap<>();
+		resultMap.put("useYnRows", useYnRows);
+		resultMap.put("timeUnitRows", timeUnitRows);
+		return new ModelAndView("jsonView", resultMap);
+	}
+
+}
@@ -20,6 +20,7 @@ public class InflowControlManService extends BaseService {

 	private static final String ADAPTER_TYPE_INFLOW = "01";
 	private static final String INTERFACE_TYPE_INFLOW = "02";
+	private static final String CLIENT_TYPE_INFLOW = "03";

 	@Autowired
 	@Qualifier("comboService")
@@ -92,6 +93,38 @@ public class InflowControlManService extends BaseService {
 		service.deleteById(id);
 	}
 	
+	
+	// 클라이언트 유량제어
+	public Page<InflowControlManUI> selectClientList(Pageable pageable, String searchName) {
+		Page<InflowControlServiceDto> dtoList = service.findAllForClient(pageable, searchName);
+		return dtoList.map(mapper::toVo);
+	}
+
+	public InflowControlManUI selectClientDetail(String name) {
+		return mapper.toVo(service.findByIdForClient(name));
+	}
+
+	public void mergeClient(InflowControlManUI ui) {
+		ui.setType(CLIENT_TYPE_INFLOW);
+		InflowControlId id = toId(ui);
+		Optional<InflowControl> inflowControlOptional = service.findById(id);
+
+		InflowControl entity = null;
+		if (inflowControlOptional.isPresent()) {
+			entity = inflowControlOptional.get();
+			mapper.updateToEntity(ui, entity);
+		} else {
+			entity = mapper.toEntity(ui);
+		}
+		service.save(entity);
+	}
+
+	public void deleteClient(String name) {
+		InflowControlId id = toId(CLIENT_TYPE_INFLOW, name);
+		service.findById(id).ifPresent(service::delete);
+	}
+		
+	
 	private InflowControlId toId(InflowControlManUI ui) {
 		return toId(ui.getType(), ui.getName());
 	}