From 50bcf75b06eb7a8dbe39f9078d3ca7d0b7b9ff59 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 19 Aug 2024 18:19:45 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20agent=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20mms=20=ED=8C=8C=EC=9D=BC=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91=20=ED=8C=8C=EC=9D=BC=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/web/AgentCOneRestController.java | 6 +-- .../client/two/mapper/domain/AgentCTwoVO.java | 2 +- .../service/impl/AgentCTwoServiceImpl.java | 7 +++ .../two/web/AgentCTwoRestController.java | 13 ++--- .../agent/client/one/AgentCOneMapper.xml | 12 ++--- .../agent/client/two/AgentCTwoMapper.xml | 12 ++--- .../static/cmn/js/agent/timerForTwoC.js | 5 +- src/main/resources/templates/agent/view.html | 48 +++++++++---------- 8 files changed, 54 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java b/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java index a7752a6..f78a1f9 100644 --- a/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java +++ b/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java @@ -71,9 +71,9 @@ public class AgentCOneRestController { } @PostMapping("/agent/one/uploadFiles") - public ResponseEntity uploadFiles(@RequestParam("filename01") MultipartFile file1, - @RequestParam("filename02") MultipartFile file2, - @RequestParam("filename03") MultipartFile file3) { + public ResponseEntity uploadFiles(@RequestParam("fileName01") MultipartFile file1, + @RequestParam("fileName02") MultipartFile file2, + @RequestParam("fileName03") MultipartFile file3) { try { Map fileNames = new HashMap<>(); diff --git a/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java b/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java index 2cf32c0..0444b4c 100644 --- a/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java +++ b/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java @@ -22,7 +22,7 @@ import java.io.Serializable; @Setter @ToString public class AgentCTwoVO implements Serializable { - + private static final long serialVersionUID = 1L; private String msgType; private String sendStatus; diff --git a/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java b/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java index af1acc4..7c4e3ff 100644 --- a/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java +++ b/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java @@ -52,6 +52,7 @@ public class AgentCTwoServiceImpl extends AbstractAgentService batchList) { + log.info("batchList.get(0).toString() :: [{}]", batchList.get(0).toString()); mapper.insertAgents(batchList); } diff --git a/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java b/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java index f5bf704..8d888d9 100644 --- a/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java +++ b/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java @@ -47,6 +47,7 @@ public class AgentCTwoRestController { * */ @PostMapping("/agent/two/findByInsertCnt") public ResponseEntity findByInsertCnt(@RequestBody AgentCTwoVO agentCTwoVO) throws Exception { + System.out.println(" :: /agent/two/findByInsertCnt :: "); return ResponseEntity.ok().body(agentCTwoService.findByInsertCnt(agentCTwoVO)); } @@ -70,9 +71,9 @@ public class AgentCTwoRestController { } @PostMapping("/agent/two/uploadFiles") - public ResponseEntity uploadFiles(@RequestParam("filename01") MultipartFile file1, - @RequestParam("filename02") MultipartFile file2, - @RequestParam("filename03") MultipartFile file3) { + public ResponseEntity uploadFiles(@RequestParam("fileName01") MultipartFile file1, + @RequestParam("fileName02") MultipartFile file2, + @RequestParam("fileName03") MultipartFile file3) { try { Map fileNames = new HashMap<>(); @@ -92,12 +93,8 @@ public class AgentCTwoRestController { fileName = uploadSingleFile(file3); fileNames.put("fileName03", fileName); } - // 경로와 파일명 반환 - Map response = new HashMap<>(); - response.put("fileNames", fileNames); - response.put("status", "OK"); - return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "",response) ); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "",fileNames) ); } catch (IOException ex) { return ResponseEntity.ok(new RestResponse(HttpStatus.INTERNAL_SERVER_ERROR, "저장실패","") ); diff --git a/src/main/resources/mapper/agent/client/one/AgentCOneMapper.xml b/src/main/resources/mapper/agent/client/one/AgentCOneMapper.xml index a44b1c3..98aba7d 100644 --- a/src/main/resources/mapper/agent/client/one/AgentCOneMapper.xml +++ b/src/main/resources/mapper/agent/client/one/AgentCOneMapper.xml @@ -30,9 +30,9 @@ , SEND_PHONE , SUBJECT , MESSAGE - , FILENAME01 - , FILENAME02 - , FILENAME03 + , fileName01 + , fileName02 + , fileName03 ) VALUES @@ -44,9 +44,9 @@ , #{item.sendPhone} , #{item.subject} , #{item.message} - , #{fileName01} - , #{fileName02} - , #{fileName03} + , #{item.fileName01} + , #{item.fileName02} + , #{item.fileName03} ) diff --git a/src/main/resources/mapper/agent/client/two/AgentCTwoMapper.xml b/src/main/resources/mapper/agent/client/two/AgentCTwoMapper.xml index 9a375b1..36c54da 100644 --- a/src/main/resources/mapper/agent/client/two/AgentCTwoMapper.xml +++ b/src/main/resources/mapper/agent/client/two/AgentCTwoMapper.xml @@ -30,9 +30,9 @@ , SEND_PHONE , SUBJECT , MESSAGE - , FILENAME01 - , FILENAME02 - , FILENAME03 + , fileName01 + , fileName02 + , fileName03 ) VALUES @@ -44,9 +44,9 @@ , #{item.sendPhone} , #{item.subject} , #{item.message} - , #{fileName01} - , #{fileName02} - , #{fileName03} + , #{item.fileName01} + , #{item.fileName02} + , #{item.fileName03} ) diff --git a/src/main/resources/static/cmn/js/agent/timerForTwoC.js b/src/main/resources/static/cmn/js/agent/timerForTwoC.js index b1ae0be..ce75783 100644 --- a/src/main/resources/static/cmn/js/agent/timerForTwoC.js +++ b/src/main/resources/static/cmn/js/agent/timerForTwoC.js @@ -62,9 +62,12 @@ function fn_twoInsertCntAndTime(){ var jsonObject = {}; formData.forEach((value, key) => { - jsonObject[key] = value; + if (!(value instanceof File)) { + jsonObject[key] = value; + } }); + console.log('fn_twoInsertCntAndTime : [{}]',jsonObject); $.ajax({ type: "POST", url: "/agent/two/findByInsertCnt", diff --git a/src/main/resources/templates/agent/view.html b/src/main/resources/templates/agent/view.html index 2791a4f..ac808cd 100644 --- a/src/main/resources/templates/agent/view.html +++ b/src/main/resources/templates/agent/view.html @@ -190,13 +190,13 @@
@@ -297,13 +297,13 @@
@@ -841,10 +841,11 @@ // 먼저 파일을 업로드하고 파일명만 받음 var fileUploadForm = new FormData(); - fileUploadForm.append("filename01", formData.get("filename01")); - fileUploadForm.append("filename02", formData.get("filename02")); - fileUploadForm.append("filename03", formData.get("filename03")); + fileUploadForm.append("fileName01", formData.get("fileName01")); + fileUploadForm.append("fileName02", formData.get("fileName02")); + fileUploadForm.append("fileName03", formData.get("fileName03")); + console.log('fileUploadForm : ', fileUploadForm); $.ajax({ type: "POST", @@ -853,40 +854,35 @@ processData: false, contentType: false, success: function(response) { + console.log('response : ', response); if (response.status === 'OK') { // 파일명만 formData에 추가 // 파일명 formData에 추가 - if (response.fileNames && response.fileNames.fileName01) { - formData.append("fileName01", response.fileNames.fileName01); - } else { - formData.append("fileName01", ""); + if (response.data.fileName01) { + formData.append("fileName01", response.data.fileName01); } - - if (response.fileNames && response.fileNames.fileName02) { - formData.append("fileName02", response.fileNames.fileName02); - } else { - formData.append("fileName02", ""); + if (response.data.fileName02) { + formData.append("fileName02", response.data.fileName02); } - - if (response.fileNames && response.fileNames.fileName03) { - formData.append("fileName03", response.fileNames.fileName03); - } else { - formData.append("fileName03", ""); + if (response.data.fileName03) { + formData.append("fileName03", response.data.fileName03); } var jsonObject = {}; formData.forEach((value, key) => { - jsonObject[key] = value; - + if (!(value instanceof File)) { + jsonObject[key] = value; + } }); if(jsonObject['recvPhone'] === ""){ alert('정보를 입력하거나 예시입력을 클릭해주세요.') return false; } - console.log('jsonObject : ', jsonObject); + + $.ajax({ type: "POST",