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 ab4fe96..c3e31bf 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 @@ -7,6 +7,14 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +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; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -16,14 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; - @Controller public class InflowGroupControlManController extends OnlBaseAnnotationController { @@ -78,7 +78,7 @@ public class InflowGroupControlManController extends OnlBaseAnnotationController * 그룹 저장 (INSERT) */ @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=INSERT") - public String insert(HttpServletRequest request, HttpServletResponse response, InflowGroupControlManUI ui, + public ResponseEntity insert(HttpServletRequest request, HttpServletResponse response, InflowGroupControlManUI ui, @RequestParam(value = "interfaceListJson", required = false) String interfaceListJson) throws Exception { parseInterfaceList(ui, interfaceListJson); String modifiedBy = getSessionUserId(request); @@ -88,14 +88,14 @@ public class InflowGroupControlManController extends OnlBaseAnnotationController CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.ReloadInflowGroupControlCommand", ui.getGroupId()); agentUtilService.broadcast(command); - return null; + return ResponseEntity.ok().build(); } /** * 그룹 저장 (UPDATE) */ @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=UPDATE") - public String update(HttpServletRequest request, HttpServletResponse response, InflowGroupControlManUI ui, + public ResponseEntity update(HttpServletRequest request, HttpServletResponse response, InflowGroupControlManUI ui, @RequestParam(value = "interfaceListJson", required = false) String interfaceListJson) throws Exception { parseInterfaceList(ui, interfaceListJson); String modifiedBy = getSessionUserId(request); @@ -105,21 +105,21 @@ public class InflowGroupControlManController extends OnlBaseAnnotationController CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.ReloadInflowGroupControlCommand", ui.getGroupId()); agentUtilService.broadcast(command); - return null; + return ResponseEntity.ok().build(); } /** * 그룹 삭제 */ @RequestMapping(value = "/onl/admin/inflow/inflowGroupControlMan.json", params = "cmd=DELETE") - public String delete(HttpServletRequest request, HttpServletResponse response, String groupId) throws Exception { + public ResponseEntity delete(HttpServletRequest request, HttpServletResponse response, String groupId) throws Exception { service.deleteGroup(groupId); // Agent Command 전송 CommonCommand command = new CommonCommand("com.eactive.eai.agent.inflow.RemoveInflowGroupControlCommand", groupId); agentUtilService.broadcast(command); - return null; + return ResponseEntity.ok().build(); } /**