From 6119858d740e96dcf01f2089503683fb9ab6a31e Mon Sep 17 00:00:00 2001 From: "DESKTOP-MAVEOS0\\lmh32" Date: Wed, 10 May 2023 11:33:45 +0900 Subject: [PATCH] =?UTF-8?q?WorkState=20=EB=B7=B0=20=EB=B0=8F=20=EC=BB=A8?= =?UTF-8?q?=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EB=B0=8F=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/sysMgt/views/WorkState.vue | 9 ++------ .../kr/co/uplus/ez/api/comm/FileService.java | 18 ++++++++++++++++ .../uplus/ez/api/sysMgt/SysMgtController.java | 9 +++++--- .../co/uplus/ez/api/sysMgt/SysMgtService.java | 11 ++++++++++ .../ez/api/sysMgt/dto/SetWorkStateResDto.java | 21 +++++++++++++++++++ 5 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 src/main/java/kr/co/uplus/ez/api/comm/FileService.java create mode 100644 src/main/java/kr/co/uplus/ez/api/sysMgt/dto/SetWorkStateResDto.java diff --git a/frontend/src/modules/sysMgt/views/WorkState.vue b/frontend/src/modules/sysMgt/views/WorkState.vue index 27b8ef5..7a83ab4 100644 --- a/frontend/src/modules/sysMgt/views/WorkState.vue +++ b/frontend/src/modules/sysMgt/views/WorkState.vue @@ -110,11 +110,6 @@ export default { created() { }, destroyed() { - // this.$store.commit('dataStore/updateDataStore', ''); - this.$store.commit('searchcondition/updateSearchCondition', { - params: { - }, - }); }, mounted() { let page = 1; @@ -128,7 +123,7 @@ export default { isKeep = true; } */ - this.grid.pagePerRows = 50; + this.grid.pagePerRows = 30; page = 1; this.search(isKeep); }, @@ -136,7 +131,7 @@ export default { methods: { fnSaveTxt(){ let params = { - startDate : this.startDate, + startDate : moment(this.startDate).format('YYYY-MM-DD'), startTime : this.startTime, endTime : this.endTime, state : this.state, diff --git a/src/main/java/kr/co/uplus/ez/api/comm/FileService.java b/src/main/java/kr/co/uplus/ez/api/comm/FileService.java new file mode 100644 index 0000000..a67a3c3 --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/comm/FileService.java @@ -0,0 +1,18 @@ +package kr.co.uplus.ez.api.comm; + +import java.nio.file.Path; +import java.util.stream.Stream; + +import org.springframework.core.io.Resource; +import org.springframework.web.multipart.MultipartFile; + +public interface FileService { + + void init(); + void store(MultipartFile file); + Stream loadAll(); + Path load(String filename); + Resource loadAsResource(String filename); + void deleteAll(); + void deleteFile(String filename); +} 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 73ea990..d29774d 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 @@ -292,7 +292,6 @@ public class SysMgtController { * desc : 배치 상세내용. * @return */ - @ApiOperation(value = "batchDetail", notes = "배치 상세내용") @ApiResponses({ @ApiResponse(code = HttpServletResponse.SC_OK, message = "SUCESS") }) @RequestMapping(value = "batchDetail", method = {RequestMethod.POST}) @@ -429,8 +428,12 @@ public class SysMgtController { @RequestMapping(value = "/setWorkState", method = {RequestMethod.POST}) @ResponseBody - public void setWorkState(@RequestBody @Valid Object setWorkParam) { + public SetWorkStateResDto setWorkState(@RequestBody @Valid Object setWorkParam, BindingResult bindingResult) { - logger.debug("setWorkParam={}",setWorkParam); + if (validComponents.validParameter(bindingResult)) { + return new SetWorkStateResDto(ApiResponseCode.CM_PARAMETER_ERROR); + } + + 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 a05fc51..f854fef 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 @@ -1,6 +1,7 @@ package kr.co.uplus.ez.api.sysMgt; import kr.co.uplus.ez.api.calculate.dto.CalcListResDto; +import kr.co.uplus.ez.api.comm.FileService; import kr.co.uplus.ez.api.homeMgt.dto.NoticeListReqDto; import kr.co.uplus.ez.api.sysMgt.dto.*; import kr.co.uplus.ez.common.data.ApiResponseCode; @@ -34,6 +35,9 @@ public class SysMgtService { @Autowired @Qualifier("sqlSessionTemplateDb2") private SqlSessionTemplate sqlSessionSlave; + + @Autowired + FileService fileService; /** * date : 2022. 4. 25. @@ -526,5 +530,12 @@ public class SysMgtService { return new NotiListResDto(ApiResponseCode.SUCCESS, notiListRes); } + public SetWorkStateResDto setWorkState(Object setWorkParam) { + + logger.debug("setWorkParam={}",setWorkParam); + + + return new SetWorkStateResDto(ApiResponseCode.SUCCESS); + } } diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/SetWorkStateResDto.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/SetWorkStateResDto.java new file mode 100644 index 0000000..c84e0ae --- /dev/null +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/SetWorkStateResDto.java @@ -0,0 +1,21 @@ +package kr.co.uplus.ez.api.sysMgt.dto; + +import java.io.Serializable; + +import kr.co.uplus.ez.common.data.ApiResponseCode; +import kr.co.uplus.ez.common.data.ResponseMessage; + +public class SetWorkStateResDto extends ResponseMessage implements Serializable{ + + public SetWorkStateResDto() { + this.retCode = ApiResponseCode.SUCCESS.getResultCode(); + this.retMsg = ApiResponseCode.SUCCESS.getResultMsg(); + } + + public SetWorkStateResDto(ApiResponseCode returnStr) { + this.retCode = returnStr.getResultCode(); + this.retMsg = returnStr.getResultMsg(); + } + + +}