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