浏览代码

消息推送BUG修复

anderx 7 年之前
父节点
当前提交
7d2d6779a3

+ 2 - 2
src/main/java/com/goafanti/message/controller/AdminMessageController.java

@@ -406,7 +406,7 @@ public class AdminMessageController extends CertifyApiController{
 	 * @return
 	 */
 	@RequestMapping(value="/getMessageList", method = RequestMethod.GET)
-	public Result getMessageList(JtMessageProducer messageProducer,String sendStartTime,String code, String sendEndTime,Integer subject, Integer pageNo,Integer pageSize ){
+	public Result getMessageList(JtMessageProducer messageProducer,String sendStartTime, String sendEndTime,String messageCode,Integer subject, Integer pageNo,Integer pageSize ){
 		Result res = new Result();
 		/*if(StringUtils.isBlank(TokenManager.getUserId())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "登录数据失效"));
@@ -414,7 +414,7 @@ public class AdminMessageController extends CertifyApiController{
 		}*/
 		if (res.getError().isEmpty()) {
 			//查看消息列表
-			res.setData(jtMessageProducerService.getMessageList(messageProducer, sendStartTime, sendEndTime, code, subject,pageNo, pageSize ));
+			res.setData(jtMessageProducerService.getMessageList(messageProducer, sendStartTime, sendEndTime, messageCode, subject,pageNo, pageSize ));
 		}
 		return res;
 	}

+ 2 - 2
src/main/java/com/goafanti/message/service/impl/JtMessageProducerServiceImpl.java

@@ -114,7 +114,7 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<JtMessageProducer> getMessageList(JtMessageProducer messageProducer, String sendStartTime, String sendEndTime,
-			String code,Integer subject,Integer pageNo,Integer pageSize){
+			String messageCode,Integer subject,Integer pageNo,Integer pageSize){
 		if(pageNo==null || pageNo<1)pageNo=1;
 		if(pageSize==null ||pageSize<1)pageSize=10; 
 		Map<String, Object> params=new HashMap<String,Object>();
@@ -124,7 +124,7 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 		if(null != messageProducer.getIsSend())params.put("isSend",messageProducer.getIsSend());
 		if(StringUtils.isNotBlank(sendStartTime))params.put("sendStartTime",sendStartTime);
 		if(StringUtils.isNotBlank(sendEndTime))params.put("sendEndTime",sendEndTime);
-		if(StringUtils.isNotBlank(code))params.put("code",code);
+		if(StringUtils.isNotBlank(messageCode))params.put("code",messageCode);
 		if(null!=subject)params.put("subject",subject);
 		return (Pagination<JtMessageProducer>) findPage("getMyMessageList", "getMyMessageCount", params, pageNo, pageSize);
 	}