|
@@ -1,5 +1,6 @@
|
|
|
package com.goafanti.message.service.impl;
|
|
package com.goafanti.message.service.impl;
|
|
|
|
|
|
|
|
|
|
+import java.lang.reflect.InvocationTargetException;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -8,6 +9,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
|
|
|
|
|
|
|
|
+import org.apache.commons.beanutils.BeanUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -32,6 +34,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.message.JGMessageHelper;
|
|
import com.goafanti.message.JGMessageHelper;
|
|
|
|
|
+import com.goafanti.message.bo.AppMessageBo;
|
|
|
import com.goafanti.message.bo.MessageBo;
|
|
import com.goafanti.message.bo.MessageBo;
|
|
|
import com.goafanti.message.bo.MessageListBo;
|
|
import com.goafanti.message.bo.MessageListBo;
|
|
|
import com.goafanti.message.enums.ConsumerType;
|
|
import com.goafanti.message.enums.ConsumerType;
|
|
@@ -440,23 +443,23 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
- public Pagination<MessageListBo> applistMessage(Integer pageNo, Integer pageSize) {
|
|
|
|
|
|
|
+ public Pagination<AppMessageBo> applistMessage(Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
- if(null==pageNo||pageNo<0)pageNo=1;
|
|
|
|
|
- if(null==pageSize||pageSize<0)pageNo=10;
|
|
|
|
|
|
|
+ if(null==pageNo||pageNo<1)pageNo=1;
|
|
|
|
|
+ if(null==pageSize||pageSize<1)pageSize=10;
|
|
|
params.put("uid", TokenManager.getUserId());
|
|
params.put("uid", TokenManager.getUserId());
|
|
|
- params.put("uid", "2160baeb-8ea4-4192-a6f4-fccf8738e248");
|
|
|
|
|
- return (Pagination<MessageListBo>)findPage("appMessageList", "appMessageCount", params, pageNo, pageSize);
|
|
|
|
|
|
|
+ //params.put("uid", "2160baeb-8ea4-4192-a6f4-fccf8738e248");
|
|
|
|
|
+ return (Pagination<AppMessageBo>)findPage("appMessageList", "appMessageCount", params, pageNo, pageSize);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public MessageListBo appReadMessage(String id) {
|
|
|
|
|
|
|
+ public JtMessageConsumer updateAppReadMessage(String id) {
|
|
|
JtMessageConsumer mc=new JtMessageConsumer();
|
|
JtMessageConsumer mc=new JtMessageConsumer();
|
|
|
mc.setId(id);
|
|
mc.setId(id);
|
|
|
mc.setIsRead(true);
|
|
mc.setIsRead(true);
|
|
|
jtMessageConsumerMapper.updateByPrimaryKeySelective(mc);
|
|
jtMessageConsumerMapper.updateByPrimaryKeySelective(mc);
|
|
|
-
|
|
|
|
|
- return null;
|
|
|
|
|
|
|
+ mc=jtMessageConsumerMapper.selectByPrimaryKey(id);
|
|
|
|
|
+ return mc;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|