From 893c062eb572b55a7dd2ef9c5fac02bad3646959 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 11:26:35 +0900
Subject: [PATCH] - 섬머노트 사진/동영상 버튼 삭제 - 이슈 파트너 메일에 첨부파일 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 4
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 2
src/main/java/kr/wisestone/owl/service/IssueService.java | 2
src/main/webapp/scripts/components/issue/issue.service.js | 7 +
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 6
src/main/webapp/views/issue/issueSendMailPartners.html | 47 +++++++++++
src/main/webapp/custom_components/summernote/summernote.js | 4
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 157 ++++++++++++++++++++++++++++++++++++++-
8 files changed, 213 insertions(+), 16 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 8d3b264..1223244 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -96,7 +96,7 @@
void sendIssueEmail(IssueForm issueForm);
- void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
+ void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files);
void reservationIssue();
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index dbb2790..da657dc 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3842,7 +3842,7 @@
// �씠�뒋瑜� �뀥�뵆由우뿉 �뵲�씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 硫붿씪濡� 諛쒖넚�븳�떎.
@Override
@Transactional(readOnly = true)
- public void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm) {
+ public void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> multipartFiles) {
if (emailTemplateForm.getSendEmails().size() < 1) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
@@ -3869,7 +3869,7 @@
for(int i=0; i < sendMails.length; i++) {
sendMails[i] = CommonUtil.decryptAES128(sendMails[i]);
}
- this.systemEmailService.sendEmail(emailTemplateForm.getTitle(), emailTemplateForm.getTemplate(), sendMails, null, null);
+ this.systemEmailService.sendEmail(emailTemplateForm.getTitle(), emailTemplateForm.getTemplate(), sendMails, null, multipartFiles);
this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailTemplateForm.getSendEmails(), sb);
this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
diff --git a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
index 2398cb2..96a594e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -276,7 +276,7 @@
if (multipartFiles != null && multipartFiles.size() > 0) {
for (MultipartFile file : multipartFiles) {
// �뙆�씪 泥⑤�
- messageHelper.addAttachment(file.getOriginalFilename(), file);
+ messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
}
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index 6c36f47..a9fec9d 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -236,12 +236,12 @@
}
// �씠�뒋 硫붿씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 諛쒖넚 (�뀥�뵆由� 異붽�)
- @RequestMapping(value = "/issue/sendEmailPartners", produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/issue/sendEmailPartners", method = RequestMethod.POST)
public
@ResponseBody
- Map<String, Object> sendEmailPartners(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> sendEmailPartners(MultipartHttpServletRequest request) {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueService.sendIssueEmailPartners(EmailTemplateForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+ this.issueService.sendIssueEmailPartners(EmailTemplateForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
// this.issueService.sendIssueEmailPartners(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
diff --git a/src/main/webapp/custom_components/summernote/summernote.js b/src/main/webapp/custom_components/summernote/summernote.js
index 5e5873c..6090685 100644
--- a/src/main/webapp/custom_components/summernote/summernote.js
+++ b/src/main/webapp/custom_components/summernote/summernote.js
@@ -5679,7 +5679,7 @@
}).render();
});
- context.memo('button.picture', function () {
+ /*context.memo('button.picture', function () {
return ui.button({
contents: ui.icon(options.icons.picture),
tooltip: lang.image.image,
@@ -5693,7 +5693,7 @@
tooltip: lang.video.video,
click: context.createInvokeHandler('videoDialog.show')
}).render();
- });
+ });*/
context.memo('button.hr', function () {
return ui.button({
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index ef088f1..de4f059 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -17,7 +17,10 @@
formCheck : formCheck, // �뤌 泥댄겕
onChangeEmailTemplate : onChangeEmailTemplate, // �씠硫붿씪 �뀥�뵆由� �꽑�깮�떆 �떎�뻾
getEmailTemplateList : getEmailTemplateList, // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
- getAccount : getAccount
+ getAccount : getAccount,
+ onFileSelect : onFileSelect, // �뙆�씪 泥⑤�
+ removeUploadFile : removeUploadFile, // �뾽濡쒕뱶�븯�젮�뒗 �듅�젙 �뙆�씪�쓣 �궘�젣
+ imageUpload : imageUpload, // �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
};
$scope.vm = {
@@ -32,6 +35,8 @@
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
mailUsers : parameter.partners.slice(), // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
account : [{account : [], name : [], id : []}],
+ files : [], // �뾽濡쒕뱶 �뙆�씪
+ attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
},
userName : "",
autoCompletePage : {
@@ -97,6 +102,132 @@
}
}
+ // �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
+ function imageUpload($files) {
+ var listFiles = [];
+ var uploadFileSize = 0;
+
+ for (var count in $files) {
+ var $file = $files[count];
+
+ if (typeof ($file) == "object") {
+ uploadFileSize += $file.size;
+
+ // �뙆�씪�떦 �슜�웾 �젣�븳 10MB
+ if ($file.size > $rootScope.fileByte.image) {
+ SweetAlert.error($filter("translate")("issue.capacityExceededImageFile"), $filter("translate")("issue.attachedOnlyImageFiles10mb")); // "�씠誘몄� �뙆�씪 �슜�웾 珥덇낵", "10MB �씠�븯�쓽 �씠誘몄� �뙆�씪留� 泥⑤�媛� 媛��뒫�빀�땲�떎."
+ listFiles = [];
+ break;
+ }
+
+ // �뿬�윭嫄댁쓽 �뙆�씪�쓣 �븳踰덉뿉 �뾽濡쒕뱶�븷 寃쎌슦 �젣�븳 300MB
+ if (uploadFileSize > $rootScope.fileByte.file) {
+ SweetAlert.error($filter("translate")("issue.capacityExceededImageFile"), $filter("translate")("issue.attachedMultipleImageFiles100mb")); // "�씠誘몄� �뙆�씪 �슜�웾 珥덇낵", "�뿬�윭 嫄댁쓽 �씠誘몄�瑜� �븳踰덉뿉 泥⑤��븷 寃쎌슦 100MB �씠�븯源뚯�留� 泥⑤�媛� 媛��뒫�빀�땲�떎."
+ listFiles = [];
+ break;
+ }
+
+ if (!$rootScope.checkImageType($file)) {
+ SweetAlert.error($filter("translate")("issue.limitImageFile"), $filter("translate")("issue.canBeUploadedOnlyImageFiles")); // "�씠誘몄� �뙆�씪 �젣�븳", "�씠誘몄� �뙆�씪留� �뾽濡쒕뱶 媛��뒫�빀�땲�떎. - bmp, jpg, jpeg, png, tif"
+ listFiles = [];
+ break;
+ }
+
+ if (!angular.isDefined($file.name)) {
+ var fileType = $file.type.split("/");
+ var imageType = "";
+
+ if (fileType[0] === "image") {
+ imageType = "." + fileType[1];
+ }
+
+ $file.name = new Date().getTime() + imageType;
+ }
+ else {
+ if ($file.name.indexOf(';') !== -1) {
+ SweetAlert.error($filter("translate")("issue.nameErrorImageFile"), $filter("translate")("issue.cannotUploadFileNameSpecialCharacters")); // "�씠誘몄� �뙆�씪紐� �삤瑜�", "�뙆�씪紐낆뿉 �듅�닔臾몄옄(;)媛� �뱾�뼱媛�硫� �뾽濡쒕뱶 �븷 �닔 �뾾�뒿�땲�떎."
+ listFiles = [];
+ break;
+ }
+ }
+
+ listFiles.push($file);
+ }
+ }
+
+ // �뙆�씪 �뾽濡쒕뱶 寃�利앹쓣 嫄곗튇 �뙆�씪�씠 1媛쒖씠�긽 議댁옱�븷 寃쎌슦�뿉留� �떎�뻾
+ if (listFiles.length > 0) {
+ AttachedFile.add({
+ method : "POST",
+ file : listFiles,
+ // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
+ fields : {
+ content : {
+ workspaceId : $rootScope.user.lastWorkspaceId
+ }
+ },
+ fileFormDataName : "file"
+ })
+ .then(function (result) {
+ if (result.data.message.status === "success") {
+ angular.forEach(result.data.attachedFiles, function (fileInfo) {
+ $scope.vm.summerNote.editor.summernote("editor.insertImage", fileInfo.path);
+ $scope.vm.form.attachedFiles.push(fileInfo);
+ });
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.errorFileUpload"), result.data.message.message); // �뙆�씪 �뾽濡쒕뱶 �삤瑜�
+ }
+ });
+ }
+ }
+
+ // �뙆�씪 �뾽濡쒕뱶�뿉 �궗�슜
+ function onFileSelect($files) {
+ var uploadFileSize = 0;
+
+ // �씠�쟾�뿉 泥⑤��븳 �뙆�씪�씠 �엳�쓣 寃쎌슦 �쟾泥� �뾽濡쒕뱶 �슜�웾�뿉 �룷�븿
+ angular.forEach($scope.vm.form.files, function ($file) {
+ uploadFileSize += $file.size;
+ });
+
+ for (var count in $files) {
+ var $file = $files[count];
+
+ if (typeof ($file) == "object") {
+ uploadFileSize += $file.size;
+
+ // �뙆�씪�떦 �슜�웾 �젣�븳 300MB
+ if (($file.size > $rootScope.fileByte.file) || (uploadFileSize > $rootScope.fileByte.file)) {
+ SweetAlert.error($filter("translate")("issue.attachmentCapacityExceeded"), $filter("translate")("issue.canAttachFileUpTo100mb")); // "泥⑤� �뙆�씪 �슜�웾 珥덇낵", "100MB �씠�븯源뚯�留� �뙆�씪 泥⑤�媛� 媛��뒫�빀�땲�떎."
+ break;
+ }
+
+ // �뙆�씪�쓣 �뾽濡쒕뱶�븷 �븣 �뙆�씪 �쑀�삎�쓣 �솗�씤�빐二쇰뒗 湲곕뒫 - �뿀�슜�릺吏� �븡�� �솗�옣�옄�씪 �븣�뒗 泥⑤� 湲덉�
+ if (!$rootScope.checkFileType($file)) {
+ SweetAlert.error($filter("translate")("issue.limitAttachmentExtensions"), $filter("translate")("issue.notAllowedAttachment")); // "泥⑤� �뙆�씪 �솗�옣�옄 �젣�븳", "泥⑤�媛� �뿀�슜�릺吏� �븡�뒗 �뙆�씪�엯�땲�떎."
+ break;
+ }
+
+ if ($file.name.indexOf(';') !== -1) {
+ SweetAlert.error($filter("translate")("issue.nameErrorAttachment"), $filter("translate")("issue.cannotUploadFileNameSpecialCharacters")); // "泥⑤� �뙆�씪紐� �삤瑜�", "�뙆�씪紐낆뿉 �듅�닔臾몄옄(;)媛� �뱾�뼱媛�硫� �뾽濡쒕뱶 �븷 �닔 �뾾�뒿�땲�떎."
+ break;
+ }
+
+ $file.index = count;
+ $scope.vm.form.files.push($file);
+ }
+ }
+ }
+
+ // �뾽濡쒕뱶 �뙆�씪 �궘�젣
+ function removeUploadFile(index) {
+ $scope.vm.form.files.splice(index, 1);
+
+ angular.forEach($scope.vm.form.files, function (file, index) {
+ file.index = index;
+ });
+ }
// �궗�슜�옄 �궘�젣
function removeMailTarget(index) {
@@ -134,12 +265,28 @@
return sendEmails;
})(),
+ attachedFileIds : (function () {
+ var attachedFileIds = [];
+
+ angular.forEach($scope.vm.form.attachedFiles, function (attachedFile) {
+ if ($scope.vm.form.description.indexOf(attachedFile.path) !== -1) {
+ attachedFileIds.push(attachedFile.id);
+ }
+ });
+
+ return attachedFileIds;
+ })(),
};
- Issue.sendEmailPartners($resourceProvider.getContent(
- content,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
-
+ Issue.sendEmailPartners({
+ method : "POST",
+ file : $scope.vm.form.files,
+ // data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
+ fields : {
+ content : content
+ },
+ fileFormDataName : "file"
+ }).then(function (result) {
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.succeededIssueMail"), $filter("translate")("issue.sentToTheSelectedUser")); // "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�"
$scope.fn.cancel();
diff --git a/src/main/webapp/scripts/components/issue/issue.service.js b/src/main/webapp/scripts/components/issue/issue.service.js
index 6c5a77c..a01b309 100644
--- a/src/main/webapp/scripts/components/issue/issue.service.js
+++ b/src/main/webapp/scripts/components/issue/issue.service.js
@@ -140,7 +140,11 @@
});
},
sendEmailPartners : function (conditions) {
- return $http.post("issue/sendEmailPartners", conditions).then(function (response) {
+ conditions.url = "issue/sendEmailPartners";
+ return $upload.upload(conditions).progress(function (evt) {
+ // �뙆�씪 �뾽濡쒕뱶 吏꾪뻾�쑉�쓣 �몴�떆�빐以��떎.
+ fileUploadProgress(evt);
+ }).then(function (response) {
$log.debug("�씠�뒋 �씠硫붿씪 諛쒖넚 寃곌낵 : ", response);
return response;
});
@@ -150,7 +154,6 @@
return $upload.upload(conditions).progress(function (evt) {
// �뙆�씪 �뾽濡쒕뱶 吏꾪뻾�쑉�쓣 �몴�떆�빐以��떎.
fileUploadProgress(evt);
-
}).then(function (response) {
$log.debug("�씠�뒋 �씠硫붿씪 諛쒖넚 寃곌낵 : ", response);
return response;
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 3bd9bc3..eeba1c9 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -76,6 +76,53 @@
ng-model="vm.html"
target=".note-editable"></summernote>
</div>
+
+ <div class="form-group mgb5 mt-10">
+ <label class="issue-label"><span translate="common.attachFiles">�뙆�씪 泥⑤�</span></label>
+ <div class="filebox input-group">
+ <input class="upload-name form-control"
+ placeholder="{{'users.pleaseSelectFile' | translate}}"
+ tabindex="-1"
+ disabled="disabled">
+ <label for="uploadFileField"><span
+ translate="common.selectFile">�뙆�씪�꽑�깮</span></label>
+ <input id="uploadFileField"
+ tabindex="-1"
+ type="file"
+ class="form-control"
+ multiple
+ ng-file-select="fn.onFileSelect($files)">
+ </div>
+
+ <div class="select2-selection__choicediv">
+ <div class="select2-selection__choice2" ng-repeat="file in vm.form.files">
+ <div class="select2-selection__choice2__remove" ng-click="fn.removeUploadFile($index)">
+ 횞
+ </div>
+ <div class="ssg-items ssg-items-blocks">
+ <div class="ssg-item">
+ <div class="item-icon">
+ <!-- 臾몄꽌 -->
+ <i class="os-icon os-icon-file-text" ng-if="file.fileType == 'DOC'"></i>
+ <!-- 誘몃뵒�뼱 -->
+ <i class="os-icon os-icon-film" ng-if="file.fileType == 'MEDIA'"></i>
+ <!-- �씠誘몄�(�뾽濡쒕뱶 �쟾) -->
+ <i class="os-icon os-icon-documents-07"
+ ng-if="file.fileType == 'IMAGE'"></i>
+ <!-- 湲고� -->
+ <i class="os-icon os-icon-ui-51" ng-if="file.fileType == 'ETC'"></i>
+ </div>
+ <div class="item-name">
+ <small>{{file.name}}</small>
+ </div>
+ <div class="item-amount">
+ ({{file.size/1024/1024 | number:2}} MB)
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</form>
</div>
--
Gitblit v1.8.0