Explorar el Código

[service]MessageServiceImpl误删找回

dongbw hace 8 años
padre
commit
b7376f0b47

+ 68 - 0
donate-service/src/main/java/com/uas/service/donate/impl/MessageServiceImpl.java

@@ -0,0 +1,68 @@
+package com.uas.service.donate.impl;
+
+import com.uas.message.mail.service.MailService;
+import com.uas.platform.core.util.HttpUtil;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.service.donate.MessageConfiguration;
+import com.uas.service.donate.model.SmsMessage;
+import com.uas.service.donate.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 发送消息提醒实现方法
+ *
+ */
+@Service
+public class MessageServiceImpl implements MessageService {
+
+    @Autowired
+    private MailService mailService;
+
+    @Autowired
+    private MessageConfiguration messageConfiguration;
+
+    @Override
+    public ResponseEntity<String> sendMail(String receivedEmail, Map<String, Object> model) {
+        try {
+            if (null != messageConfiguration.getTplInvitationForB2B()) {
+                model.put("vendorusername", "");
+                model.put("vendorname", "");
+                model.put("custname", "");
+                model.put("inviteuid", "");
+                model.put("inviteUserCode", "");
+                mailService.send(messageConfiguration.getTplInvitationForB2B(), receivedEmail, model);
+            }
+            return new ResponseEntity<String>(HttpStatus.OK);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    @Override
+    public ResponseEntity<String> sendMessage(String receiverTel, List<Object> obj) {
+        try {
+            if (null != messageConfiguration.getMsgInvitationForB2B()) {
+                SmsMessage sms = new SmsMessage();
+//            obj.add(record.getVendusername());
+//            obj.add(record.getVendname());
+//            obj.add(SystemSession.getUser().getUserName() + "("
+//                    + SystemSession.getUser().getEnterprise().getEnName() + ")");
+                sms.setParams(obj);
+                sms.setReceiver(receiverTel);
+                sms.setTemplateId(messageConfiguration.getMsgInvitationForB2B());
+                HttpUtil.sendPost(messageConfiguration.getMessageSendUrl(), FlexJsonUtils.toJsonDeep(sms));
+            }
+            return new ResponseEntity<String>(HttpStatus.OK);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+}

+ 0 - 3
donate-service/src/main/webapp/resources/js/activity/main.js

@@ -5,7 +5,6 @@ require.config({
 		'angular' : 'lib/angular/angular.min',
 		'angularAMD' : 'lib/angular/angularAMD',
 		'angular-toaster': 'lib/angular/angular-toaster.min',
-		'angular-sanitize' : 'lib/angular/angular-sanitize.min',
 		'bootstrap' : 'lib/bootstrap/js/bootstrap.min',
 		'common' : 'js/common',
 		'jquery' : 'lib/jquery/jquery.min',
@@ -23,8 +22,6 @@ require.config({
 		'file-upload-shim' : 'lib/angular/angular-file-upload-shim.min',
 		'ui.router' : 'lib/angular/angular-ui-router.min',
 		'ui-bootstrap' : 'lib/angular/ui-bootstrap-tpls.min',
-		'jquery-summernote' : 'lib/jquery/summernote.min',
-		'jquery-summernote-lang' : 'lib/jquery/summernote-zh-CN',
 		'ui-jquery': 'js/common/ui-jquery',
 		'angular-sanitize' : 'lib/angular/angular-sanitize.min'
 	},

+ 0 - 3
donate-service/src/main/webapp/resources/js/approval/main.js

@@ -53,12 +53,9 @@ require.config({
 		'ui-bootstrap' : [ 'angular' ],
 		'bootstrap' : ['jquery'],
 		'jquery-summernote' : ['jquery', 'bootstrap'],
-		'jquery-summernote-lang' : ['jquery-summernote'],
-		'ui-form' : ['angular', 'jquery-summernote', 'jquery-summernote-lang'],
 		'jquery-uploadify' : [ 'jquery' ],
 		'ui-jquery': ['jquery'],
 		'ngAnimate': ['angular'],
-		'angular-sanitize' : ['angular'],
 		'angular-toaster': ['angular', 'ngAnimate'],
 		'ngDraggable': [ 'jquery', 'angular' ],
 		'angular-sanitize': ['angular'],

+ 1 - 4
donate-service/src/main/webapp/resources/js/project/main.js

@@ -22,10 +22,7 @@ require.config({
 		'file-upload-shim' : 'lib/angular/angular-file-upload-shim.min',
 		'ui.router' : 'lib/angular/angular-ui-router.min',
 		'ui-bootstrap' : 'lib/angular/ui-bootstrap-tpls.min',
-		'jquery-summernote' : 'lib/jquery/summernote.min',
-		'jquery-summernote-lang' : 'lib/jquery/summernote-zh-CN',
-		'ui-jquery': 'js/common/ui-jquery',
-		'angular-sanitize' : 'lib/angular/angular-sanitize.min'
+		'ui-jquery': 'js/common/ui-jquery'
 	},
 	shim : {
 		'angular' : {

+ 0 - 6
donate-service/src/main/webapp/resources/js/user/main.js

@@ -5,14 +5,11 @@ require.config({
 		'angular' : 'lib/angular/angular.min',
 		'angularAMD' : 'lib/angular/angularAMD',
 		'angular-toaster': 'lib/angular/angular-toaster.min',
-		'angular-sanitize' : 'lib/angular/angular-sanitize.min',
 		'bootstrap' : 'lib/bootstrap/js/bootstrap.min',
 		'common' : 'js/common',
 		'jquery' : 'lib/jquery/jquery.min',
 		'jquery-uploadify' : 'lib/jquery/jquery.uploadify.min',
 		'ngSanitize' : 'lib/angular/angular-sanitize.min',
-		'jquery-summernote' : 'lib/jquery/summernote.min',
-		'jquery-summernote-lang' : 'lib/jquery/summernote-zh-CN',
         'ngRoute' : 'lib/angular/angular-route.min',
 		'ngResource' : 'lib/angular/angular-resource.min',
 		'ngLocal' : 'lib/angular/angular-i18n',
@@ -53,12 +50,9 @@ require.config({
 		'ui-bootstrap' : [ 'angular' ],
 		'bootstrap' : ['jquery'],
 		'jquery-summernote' : ['jquery', 'bootstrap'],
-		'jquery-summernote-lang' : ['jquery-summernote'],
-		'ui-form' : ['angular', 'jquery-summernote', 'jquery-summernote-lang'],
 		'jquery-uploadify' : [ 'jquery' ],
 		'ui-jquery': ['jquery'],
 		'ngAnimate': ['angular'],
-		'angular-sanitize' : ['angular'],
 		'angular-toaster': ['angular', 'ngAnimate'],
 		'ngDraggable': [ 'jquery', 'angular' ],
 		'angular-sanitize': ['angular'],