wanghui лет назад: 8
Родитель
Сommit
c0ac7c6780

+ 7 - 7
src/main/java/com/goafanti/admin/controller/AdminMessageController.java

@@ -36,7 +36,7 @@ import com.goafanti.message.service.MessageService;
 @RequestMapping(value = "/api/admin/message")
 public class AdminMessageController extends CertifyApiController{
 	@Resource
-	private MessageService messageServiceImpl;
+	private MessageService messageService;
 	
 	/**
 	 * 进入创建系统消息
@@ -102,7 +102,7 @@ public class AdminMessageController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "必须选定目标群体"));
 			return res;
 		}
-		messageServiceImpl.insertSystemMessage(targetMap,targetType, title, body, subject,
+		messageService.insertSystemMessage(targetMap,targetType, title, body, subject,
 				DateUtils.parseDate(createTime,AFTConstants.YYYYMMDDHHMMSS),isDraft);
 		return res;
 	}
@@ -171,7 +171,7 @@ public class AdminMessageController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "必须指定目标群体"));
 			return res;
 		}
-		messageServiceImpl.insertRecommendMessage(sourceMap,sourceType,targetMap,targetType,SubjectType.TUI_JIAN.getTypeCode(),isDraft);
+		messageService.insertRecommendMessage(sourceMap,sourceType,targetMap,targetType,SubjectType.TUI_JIAN.getTypeCode(),isDraft);
 		return res;
 		
 	}
@@ -193,7 +193,7 @@ public class AdminMessageController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "消息类型不能为空"));
 			return res;
 		}*/
-		res.setData(messageServiceImpl.listSystemMessage(isDraft, subject,pageNo,pageSize));
+		res.setData(messageService.listSystemMessage(isDraft, subject,pageNo,pageSize));
 		return res;
 	}
 	
@@ -219,7 +219,7 @@ public class AdminMessageController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "消息标题和消息内容不能为空"));
 			return res;
 		}
-		messageServiceImpl.updateSystemMessage(messageId, title, body, isDraft);
+		messageService.updateSystemMessage(messageId, title, body, isDraft);
 		return res;
 	}
 	
@@ -235,7 +235,7 @@ public class AdminMessageController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "消息编号为空"));
 			return res;
 		}
-		messageServiceImpl.deleteSystemMessage(messageId);
+		messageService.deleteSystemMessage(messageId);
 		return res;
 	}
 	
@@ -252,7 +252,7 @@ public class AdminMessageController extends CertifyApiController{
 			return res;
 		}
 		// 读取消息详情
-		MessageFromSystem mfs = messageServiceImpl.selectSystemMessageDetail(messageId);
+		MessageFromSystem mfs = messageService.selectSystemMessageDetail(messageId);
 		MessageListBo bo = new MessageListBo();
 		bo.setCreateTime(mfs.getCreateTime() == null ? ""
 				: DateUtils.formatDate(mfs.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS));

+ 7 - 7
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -34,7 +34,7 @@ public class AppApiController extends BaseApiController {
 	@Resource
 	private UserService userServiceImpl;
 	@Resource
-	private MessageService messageServiceImpl;
+	private MessageService messageService;
 	@Resource
 	private EasemobUtils   easemobUtils;
 	@RequestMapping(value = "/uploadImg",method = RequestMethod.POST)
@@ -73,7 +73,7 @@ public class AppApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.USER_NICKNAME_EXIST));
 			return res;
 		} else if (needChange) { // 修改环信昵称
-			JpushEasemobAccount jea = messageServiceImpl.selectSynAccByUid(TokenManager.getUserId());
+			JpushEasemobAccount jea = messageService.selectSynAccByUid(TokenManager.getUserId());
 			if (null != jea && StringUtils.isNotBlank(jea.getEasemobName())) {
 				JSONObject resultObj = new JSONObject();
 				resultObj.put("username", jea.getEasemobName());
@@ -104,7 +104,7 @@ public class AppApiController extends BaseApiController {
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public Result index(){
 		Result res = new Result();
-		res.setData(messageServiceImpl.selectMessageWithGroup());
+		res.setData(messageService.selectMessageWithGroup());
 		return res;
 	}
 	
@@ -115,7 +115,7 @@ public class AppApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定消息类型"));
 			return res;
 		}
-		res.setData(messageServiceImpl.listPersonalMessage(subject,sourceType,pageNo,pageSize));
+		res.setData(messageService.listPersonalMessage(subject,sourceType,pageNo,pageSize));
 		return res;
 	}
 	
@@ -129,7 +129,7 @@ public class AppApiController extends BaseApiController {
 	private Result synBindingAccount(String uuid,String registrationId,String easemobName,String easemobPass){
 		Result res = new Result();
 		//更新 jpush_easemob_account
-		messageServiceImpl.updateJpushEasemobAccount(uuid, registrationId, easemobName,easemobPass);
+		messageService.updateJpushEasemobAccount(uuid, registrationId, easemobName,easemobPass);
 		return res;
 	}
 	
@@ -147,7 +147,7 @@ public class AppApiController extends BaseApiController {
 			return res;
 		}
 		//读取消息详情
-		MessageFromSystem mfs = messageServiceImpl.selectSystemMessageDetail(messageId);
+		MessageFromSystem mfs = messageService.selectSystemMessageDetail(messageId);
 		MessageListBo bo = new MessageListBo();
 		bo.setCreateTime(mfs.getCreateTime()==null?"":DateUtils.formatDate(mfs.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS));
 		bo.setResourceType(String.valueOf(mfs.getResourceType()));
@@ -157,7 +157,7 @@ public class AppApiController extends BaseApiController {
 		bo.setBody(mfs.getBody());
 		res.setData(bo);
 		//更新 message_consumer
-		messageServiceImpl.updateMessageConsumer(messageId);
+		messageService.updateMessageConsumer(messageId);
 		return res;
 	}
 }

+ 5 - 5
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -46,7 +46,7 @@ public class UserLoginController extends BaseController {
 	@Resource
 	private AdminMapper			adminMapper;
 	@Resource
-	private MessageService messageServiceImpl;
+	private MessageService messageService;
 	@Resource
 	private JGMessageHelper jgMessageHelper;
 	@Resource
@@ -157,7 +157,7 @@ public class UserLoginController extends BaseController {
 		//更新 message_producer
 		User u = TokenManager.getUserToken();
 		if(u != null){
-			List<MessageBo> boList = messageServiceImpl.selectSendMessage(u.getId()); 
+			List<MessageBo> boList = messageService.selectSendMessage(u.getId()); 
 			if(boList != null && boList.size()>0){
 				jgMessageHelper.sendSystemMessage(boList);
 				List<MessageProducer> producers = new ArrayList<MessageProducer>();
@@ -176,11 +176,11 @@ public class UserLoginController extends BaseController {
 					mc.setMessageId(bo.getMessageId());
 					consumers.add(mc);
 				}
-				messageServiceImpl.updateMessageProducer(producers);
+				messageService.updateMessageProducer(producers);
 				//新增 message_consumer
-				messageServiceImpl.insertBatchConsumer(consumers);
+				messageService.insertBatchConsumer(consumers);
 			}
-			messageServiceImpl.updateJpushEasemobAccount(null, null, null,null);
+			messageService.updateJpushEasemobAccount(null, null, null,null);
 		}
 	}
 }

+ 2 - 2
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -44,7 +44,7 @@ public class UserRegisterController extends BaseController {
 	@Resource
 	private AdminService	adminService;
 	@Resource
-	private MessageService messageServiceImpl;
+	private MessageService messageService;
 	@Resource
 	private EasemobUtils   easemobUtils;
 	Logger					logger	= Logger.getLogger(UserRegisterController.class);
@@ -132,7 +132,7 @@ public class UserRegisterController extends BaseController {
 			easemobUtils.sendLater(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
-			messageServiceImpl.updateJpushEasemobAccount(uuid, null, easemobName,easemobPass);
+			messageService.updateJpushEasemobAccount(uuid, null, easemobName,easemobPass);
 		}
 	}
 }