diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java index ee0a497..28494a0 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java @@ -8,16 +8,12 @@ package kr.co.uplus.ez.api.sysMgt; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import kr.co.uplus.ez.api.homeMgt.dto.NoticeListReqDto; import kr.co.uplus.ez.api.sysMgt.dto.*; import kr.co.uplus.ez.common.components.ValidComponents; import kr.co.uplus.ez.common.components.WebClientRequestService; import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.Const; -import springfox.documentation.spring.web.json.Json; -import org.apache.http.HttpStatus; -import org.apache.http.protocol.HTTP; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,13 +24,11 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -436,38 +430,37 @@ public class SysMgtController { */ @RequestMapping(value = "/setWorkState", method = {RequestMethod.POST}) @ResponseBody - public SetWorkStateResDto setWorkState(@RequestBody @Valid SetWorkStateReqDto setWorkParam, BindingResult bindingResult, - HttpServletRequest request) { + public SetWorkStateResDto setWorkState(@RequestBody @Valid SetWorkStateReqDto setWorkParam, BindingResult bindingResult) { if (validComponents.validParameter(bindingResult)) { return new SetWorkStateResDto(ApiResponseCode.CM_PARAMETER_ERROR); } - String ip = request.getHeader("X-Forwarded-For"); - logger.info("> X-FORWARDED-FOR : " + ip); - - if (ip == null) { - ip = request.getHeader("Proxy-Client-IP"); - logger.info("> Proxy-Client-IP : " + ip); - } - if (ip == null) { - ip = request.getHeader("WL-Proxy-Client-IP"); - logger.info("> WL-Proxy-Client-IP : " + ip); - } - if (ip == null) { - ip = request.getHeader("HTTP_CLIENT_IP"); - logger.info("> HTTP_CLIENT_IP : " + ip); - } - if (ip == null) { - ip = request.getHeader("HTTP_X_FORWARDED_FOR"); - logger.info("> HTTP_X_FORWARDED_FOR : " + ip); - } - if (ip == null) { - ip = request.getRemoteAddr(); - logger.info("> getRemoteAddr : "+ip); - } - logger.info("> Result : IP Address : "+ip); - setWorkParam.setIp(ip); +// String ip = request.getHeader("X-Forwarded-For"); +// logger.info("> X-FORWARDED-FOR : " + ip); +// +// if (ip == null) { +// ip = request.getHeader("Proxy-Client-IP"); +// logger.info("> Proxy-Client-IP : " + ip); +// } +// if (ip == null) { +// ip = request.getHeader("WL-Proxy-Client-IP"); +// logger.info("> WL-Proxy-Client-IP : " + ip); +// } +// if (ip == null) { +// ip = request.getHeader("HTTP_CLIENT_IP"); +// logger.info("> HTTP_CLIENT_IP : " + ip); +// } +// if (ip == null) { +// ip = request.getHeader("HTTP_X_FORWARDED_FOR"); +// logger.info("> HTTP_X_FORWARDED_FOR : " + ip); +// } +// if (ip == null) { +// ip = request.getRemoteAddr(); +// logger.info("> getRemoteAddr : "+ip); +// } +// logger.info("> Result : IP Address : "+ip); +// setWorkParam.setIp(ip); return sysService.setWorkState(setWorkParam); } diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java index 94d70de..aaf9b47 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java @@ -585,8 +585,8 @@ public class SysMgtService { setWorkState += setWorkParam.getStartTimeT() + "@"; setWorkState += setWorkParam.getStartTimeM() + "@"; setWorkState += setWorkParam.getEndTimeT() + "@"; - setWorkState += setWorkParam.getEndTimeM() + "@"; - setWorkState += setWorkParam.getIp(); + setWorkState += setWorkParam.getEndTimeM(); +// setWorkState += setWorkParam.getIp(); try {