diff --git a/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java b/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java index 2d77a67..72da8a1 100644 --- a/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java +++ b/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java @@ -52,7 +52,6 @@ public class AgentCOneServiceImpl extends AbstractAgentService batchList) { - log.info("batchList.get(0).toString() :: [{}]", batchList.get(0).toString()); mapper.insertAgents(batchList); } diff --git a/src/main/resources/templates/agent/view.html b/src/main/resources/templates/agent/view.html index ac808cd..9bd71df 100644 --- a/src/main/resources/templates/agent/view.html +++ b/src/main/resources/templates/agent/view.html @@ -655,45 +655,86 @@ // 폼 데이터를 수집 var formData = new FormData($("#divOneSms .sendForm")[0]); - var jsonObject = {}; - formData.forEach((value, key) => { - jsonObject[key] = value; - }); - if(jsonObject['recvPhone'] === ""){ - alert('정보를 입력하거나 예시입력을 클릭해주세요.') - return false; - } + // 먼저 파일을 업로드하고 파일명만 받음 + var fileUploadForm = new FormData(); + fileUploadForm.append("fileName01", formData.get("fileName01")); + fileUploadForm.append("fileName02", formData.get("fileName02")); + fileUploadForm.append("fileName03", formData.get("fileName03")); - console.log('one jsonObject send : ', jsonObject); $.ajax({ type: "POST", - url: "/agent/one/send", - data: JSON.stringify(jsonObject), // JSON 문자열로 변환된 데이터를 전송 - dataType: 'json', - contentType: 'application/json', - // async: true, - success: function (data) { - // console.log('data : ', data); + url: "/agent/one/uploadFiles", + data: fileUploadForm, + processData: false, + contentType: false, + success: function(response) { + console.log('response : ', response); + if (response.status === 'OK') { - if (data.status === 'OK') { - fn_successAlert('경과시간 : '+data.data, data.msg); - // fn_successAlert(data, message) - } - else { - alert("오류 알림 : :: "+data.msg); + + // 파일명만 formData에 추가 + // 파일명 formData에 추가 + if (response.data.fileName01) { + formData.append("fileName01", response.data.fileName01); + } + if (response.data.fileName02) { + formData.append("fileName02", response.data.fileName02); + } + if (response.data.fileName03) { + formData.append("fileName03", response.data.fileName03); + } + + var jsonObject = {}; + formData.forEach((value, key) => { + if (!(value instanceof File)) { + jsonObject[key] = value; + } + }); + if(jsonObject['recvPhone'] === ""){ + alert('정보를 입력하거나 예시입력을 클릭해주세요.') + return false; + } + + console.log('one jsonObject send : ', jsonObject); + + $.ajax({ + type: "POST", + url: "/agent/one/send", + data: JSON.stringify(jsonObject), // JSON 문자열로 변환된 데이터를 전송 + dataType: 'json', + contentType: 'application/json', + // async: true, + success: function (data) { + // console.log('data : ', data); + + if (data.status === 'OK') { + fn_successAlert('경과시간 : '+data.data, data.msg); + // fn_successAlert(data, message) + } + else { + alert("오류 알림 : :: "+data.msg); + } + }, + error: function (e) { + alert("저장에 실패하였습니다."); + console.log("ERROR : " + JSON.stringify(e)); + }, + beforeSend : function(xmlHttpRequest) { + fn_oneInsertScriptStart(); + + }, + complete : function(xhr, textStatus) { + // oneStopInsertTimer(); + } + }); + } else { + alert("파일 업로드 실패: " + response.msg); } }, - error: function (e) { - alert("저장에 실패하였습니다."); + error: function(e) { + alert("파일 업로드에 실패하였습니다."); console.log("ERROR : " + JSON.stringify(e)); - }, - beforeSend : function(xmlHttpRequest) { - fn_oneInsertScriptStart(); - - }, - complete : function(xhr, textStatus) { - // oneStopInsertTimer(); } }); }); @@ -711,7 +752,9 @@ var jsonObject = {}; formData.forEach((value, key) => { - jsonObject[key] = value; + if (!(value instanceof File)) { + jsonObject[key] = value; + } }); var usertagId = '#'+$(this).data('tagid'); @@ -772,7 +815,9 @@ var jsonObject = {}; formData.forEach((value, key) => { - jsonObject[key] = value; + if (!(value instanceof File)) { + jsonObject[key] = value; + } }); var usertagId = '#'+$(this).data('tagid'); jsonObject['userId'] = $(usertagId).val(); @@ -845,7 +890,6 @@ fileUploadForm.append("fileName02", formData.get("fileName02")); fileUploadForm.append("fileName03", formData.get("fileName03")); - console.log('fileUploadForm : ', fileUploadForm); $.ajax({ type: "POST", @@ -938,7 +982,9 @@ var jsonObject = {}; formData.forEach((value, key) => { - jsonObject[key] = value; + if (!(value instanceof File)) { + jsonObject[key] = value; + } }); var usertagId = '#'+$(this).data('tagid'); jsonObject['userId'] = $(usertagId).val(); @@ -998,7 +1044,9 @@ var jsonObject = {}; formData.forEach((value, key) => { - jsonObject[key] = value; + if (!(value instanceof File)) { + jsonObject[key] = value; + } }); var usertagId = '#'+$(this).data('tagid'); jsonObject['userId'] = $(usertagId).val();