Browse Source

登陆、注册逻辑修改

wanghui 8 years ago
parent
commit
dd832b7568
22 changed files with 1173 additions and 1226 deletions
  1. 1 0
      GeneratorConfig.xml
  2. 16 20
      src/main/java/com/goafanti/admin/controller/AdminMessageController.java
  3. 39 0
      src/main/java/com/goafanti/admin/service/MessageService.java
  4. 36 11
      src/main/java/com/goafanti/admin/service/impl/MessageServiceImpl.java
  5. 88 0
      src/main/java/com/goafanti/app/bo/UserBasicInfo.java
  6. 11 11
      src/main/java/com/goafanti/common/dao/MessageConsumerMapper.java
  7. 24 1
      src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java
  8. 57 77
      src/main/java/com/goafanti/common/dao/MessageProducerMapper.java
  9. 2 1
      src/main/java/com/goafanti/common/dao/UserMapper.java
  10. 23 38
      src/main/java/com/goafanti/common/mapper/MessageConsumerMapper.xml
  11. 28 4
      src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml
  12. 21 38
      src/main/java/com/goafanti/common/mapper/MessageProducerMapper.xml
  13. 17 6
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  14. 18 41
      src/main/java/com/goafanti/common/model/MessageConsumer.java
  15. 16 86
      src/main/java/com/goafanti/common/model/MessageConsumerExample.java
  16. 115 196
      src/main/java/com/goafanti/common/model/MessageProducer.java
  17. 572 683
      src/main/java/com/goafanti/common/model/MessageProducerExample.java
  18. 8 0
      src/main/java/com/goafanti/message/bo/MessageBo.java
  19. 50 5
      src/main/java/com/goafanti/user/controller/UserLoginController.java
  20. 27 6
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  21. 2 1
      src/main/java/com/goafanti/user/service/UserService.java
  22. 2 1
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

+ 1 - 0
GeneratorConfig.xml

@@ -9,5 +9,6 @@
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
     <table schema="aft" tableName="message_consumer"/>
+    <table schema="aft" tableName="message_producer"/>
   </context>
 </generatorConfiguration>

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

@@ -7,32 +7,25 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.MessageService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.message.enums.ConsumerType;
-import com.goafanti.user.service.UserService;
 
 /**
  *  消息推送
  * @author Administrator
  *
  */
-@Controller
+@RestController
 @RequestMapping(value = "/api/admin/message")
 public class AdminMessageController extends CertifyApiController{
-	
-	@Autowired
-	private UserService userServiceImpl;
-	@Autowired
-	private AdminService adminServiceImpl;
 	@Autowired
 	private MessageService messageServiceImpl;
 	/**
@@ -81,28 +74,31 @@ public class AdminMessageController extends CertifyApiController{
 	}
 	
 	/**
-	 * 登陆时查询未发送消息指定发送
-	 */
-	private void sendMessageOnLogin(){
-		//更新 message_producer
-		//新增 message_consumer
-	}
-	
-	/**
 	 * 同步绑定账号
 	 * @param uuid
 	 * @param registrationId
 	 * @param userName
 	 */
-	private void synBindingAccount(String uuid,String registrationId,String userName){
+	@RequestMapping(value = "/synBindingAccount",method = RequestMethod.POST)
+	private Result synBindingAccount(String uuid,String registrationId,String userName){
+		Result result = new Result();
 		//更新 jpush_easemob_account
+		messageServiceImpl.updateJpushEasemobAccount(uuid, registrationId, userName);
+		return result;
 	}
 	
 	/**
 	 * 读取时间
 	 * @param messageId
 	 */
-	private void readMessage(String messageId){
-		//更新message_consumer
+	@RequestMapping(value = "/readMessage",method = RequestMethod.GET)
+	private Result readMessage(String messageId){
+		Result result = new Result();
+		if(StringUtils.isBlank(messageId)){
+			//更新message_consumer
+			messageServiceImpl.updateMessageConsumer(messageId);
+		}
+		return result;
 	}
+	
 }

+ 39 - 0
src/main/java/com/goafanti/admin/service/MessageService.java

@@ -4,6 +4,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.common.model.MessageConsumer;
+import com.goafanti.common.model.MessageProducer;
 import com.goafanti.message.bo.MessageBo;
 
 public interface MessageService {
@@ -37,4 +39,41 @@ public interface MessageService {
 	 * @return
 	 */
 	List<MessageBo> selectSendMessage(String uid);
+	
+	/**
+	 * 更新消息生产表
+	 * @param producerList
+	 * @return
+	 */
+	public int updateMessageProducer(List<MessageProducer> producerList);
+	
+	/**
+	 * 批量插入生产者 
+	 * @param target
+	 * @return
+	 */
+	public int insertBatchProducer(List<MessageProducer> target);
+	
+	/**
+	 * 批量插入
+	 * @param target
+	 * @return
+	 */
+	public int insertBatchConsumer(List<MessageConsumer> target);
+	
+	/**
+	 * 绑定第三方账号
+	 * @param jea
+	 * @return
+	 */
+	public int updateJpushEasemobAccount(String uuid,String registrationId,String userName);
+	
+	/**
+	 * 更新
+	 * @param messageId
+	 * @param uid
+	 * @param readTime 
+	 * @return
+	 */
+	public int updateMessageConsumer(String messageId);
 }

+ 36 - 11
src/main/java/com/goafanti/admin/service/impl/MessageServiceImpl.java

@@ -14,19 +14,21 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.service.MessageService;
 import com.goafanti.common.dao.MessageFromSystemMapper;
-import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.MessageProducerMapper;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.MessageConsumer;
 import com.goafanti.common.model.MessageFromSystem;
 import com.goafanti.common.model.MessageProducer;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.message.bo.MessageBo;
+import com.goafanti.message.enums.SubjectType;
 
 @Service
 public class MessageServiceImpl implements MessageService{
-	private final Integer DEFAULT_SENDER = 0;//默认发送者ID
-	@Autowired
-	private UserMapper userMapper;
 	@Autowired
 	private MessageFromSystemMapper messageFromSystemMapper;
+	@Autowired
+	private MessageProducerMapper messageProducerMapper;
 	@Override
 	public String selectSendUser(Map<Integer, String> selectMap) {
 		Iterator<Entry<Integer, String>> iterator= selectMap.entrySet().iterator();
@@ -108,37 +110,60 @@ public class MessageServiceImpl implements MessageService{
 		messageFromSystemMapper.insert(mfs);
 		List<MessageProducer> target = new ArrayList<MessageProducer>();
 		String[] cids;
-		if(subject == 0){
+		if(subject == SubjectType.KE_HU.getTypeCode()){
 			cids = selectSendUser(selectMap).split(",");
 			MessageProducer mp;
 			for(String cid : cids){
 				mp = new MessageProducer();
 				mp.setId(UUID.randomUUID().toString());
 				mp.setMessageId(mfs.getId());
-				mp.setCreater(mfs.getCreater());
 				mp.setConsumerId(cid);
 			}
-			messageFromSystemMapper.batchInsert(target);
-		}else if(subject == 1){
+			insertBatchProducer(target);
+		}else if(subject == SubjectType.YUN_YING.getTypeCode()){
 			cids = selectSendAdmin(selectMap).split(",");
 			MessageProducer mp;
 			for(String cid : cids){
 				mp = new MessageProducer();
 				mp.setId(UUID.randomUUID().toString());
 				mp.setMessageId(mfs.getId());
-				mp.setCreater(mfs.getCreater());
 				mp.setConsumerId(cid);
 			}
-			messageFromSystemMapper.batchInsert(target);
+			insertBatchProducer(target);
 		}
 		return 1;
 	}
 
 	@Override
 	public List<MessageBo> selectSendMessage(String uid) {
-		
 		return messageFromSystemMapper.selectSendMessage(uid);
 	}
 	
+	@Override
+	public int updateMessageProducer(List<MessageProducer> producerList){
+		for(MessageProducer mp : producerList){
+			messageProducerMapper.updateByPrimaryKeySelective(mp);
+		}
+		return 1;
+	}
+	
+	@Override
+	public int insertBatchProducer(List<MessageProducer> target){
+		return messageFromSystemMapper.insertBatchProducer(target);
+	}
 	
+	@Override
+	public int insertBatchConsumer(List<MessageConsumer> target) {
+		return messageFromSystemMapper.insertBatchConsumer(target);
+	}
+
+	@Override
+	public int updateJpushEasemobAccount(String uuid, String registrationId, String userName) {
+		return messageFromSystemMapper.updateJpushEasemobAccount(uuid, registrationId,userName,TokenManager.getUserId());
+	}
+
+	@Override
+	public int updateMessageConsumer(String messageId) {
+		return messageFromSystemMapper.updateMessageConsumer(messageId, TokenManager.getUserId() , new Date());
+	}
 }

+ 88 - 0
src/main/java/com/goafanti/app/bo/UserBasicInfo.java

@@ -0,0 +1,88 @@
+package com.goafanti.app.bo;
+
+public class UserBasicInfo {
+	private String id;
+	private Integer number;
+	private String mobile;
+	private String nickname;
+	private String email;
+	private Integer type;
+	private String companyLogoUrl;
+	private String headPortraitUrl;
+	private String introduction;
+	private Integer isMember;
+	private String username;//环信名
+	private String registrationId;//极光id
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public Integer getNumber() {
+		return number;
+	}
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+	public String getMobile() {
+		return mobile;
+	}
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public String getCompanyLogoUrl() {
+		return companyLogoUrl;
+	}
+	public void setCompanyLogoUrl(String companyLogoUrl) {
+		this.companyLogoUrl = companyLogoUrl;
+	}
+	public String getHeadPortraitUrl() {
+		return headPortraitUrl;
+	}
+	public void setHeadPortraitUrl(String headPortraitUrl) {
+		this.headPortraitUrl = headPortraitUrl;
+	}
+	public String getIntroduction() {
+		return introduction;
+	}
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+	public Integer getIsMember() {
+		return isMember;
+	}
+	public void setIsMember(Integer isMember) {
+		this.isMember = isMember;
+	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	public String getRegistrationId() {
+		return registrationId;
+	}
+	public void setRegistrationId(String registrationId) {
+		this.registrationId = registrationId;
+	}
+}

+ 11 - 11
src/main/java/com/goafanti/common/dao/MessageConsumerMapper.java

@@ -9,68 +9,68 @@ public interface MessageConsumerMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	long countByExample(MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int deleteByExample(MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int insert(MessageConsumer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int insertSelective(MessageConsumer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	List<MessageConsumer> selectByExample(MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	MessageConsumer selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") MessageConsumer record,
 			@Param("example") MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int updateByExample(@Param("record") MessageConsumer record, @Param("example") MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int updateByPrimaryKeySelective(MessageConsumer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	int updateByPrimaryKey(MessageConsumer record);
 }

+ 24 - 1
src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java

@@ -1,10 +1,12 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.MessageConsumer;
 import com.goafanti.common.model.MessageFromSystem;
 import com.goafanti.common.model.MessageFromSystemExample;
 import com.goafanti.common.model.MessageProducer;
 import com.goafanti.message.bo.MessageBo;
 
+import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -108,7 +110,14 @@ public interface MessageFromSystemMapper {
      * 
      * @param target
      */
-	int batchInsert(List<MessageProducer> target);
+	int insertBatchProducer(List<MessageProducer> target);
+	
+	/**
+	 * 
+	 * @param target
+	 * @return
+	 */
+	int insertBatchConsumer(List<MessageConsumer> target);
 	
 	/**
 	 * 查询单个用户的未发消息
@@ -116,4 +125,18 @@ public interface MessageFromSystemMapper {
 	 * @return
 	 */
 	List<MessageBo> selectSendMessage(@Param("uid")String uid);
+
+	/**
+	 * 绑定第三方账号
+	 * @param uuid
+	 * @param registrationId
+	 * @param userName
+	 * @param uid
+	 * @return
+	 */
+	int updateJpushEasemobAccount(@Param("uuid")String uuid, @Param("registrationId")String registrationId, 
+			@Param("userName")String userName, @Param("uid")String uid);
+	
+	int updateMessageConsumer(String messageId, String uid,Date readTime);
+	
 }

+ 57 - 77
src/main/java/com/goafanti/common/dao/MessageProducerMapper.java

@@ -6,92 +6,72 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface MessageProducerMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    long countByExample(MessageProducerExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int deleteByExample(MessageProducerExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	long countByExample(MessageProducerExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int deleteByPrimaryKey(String id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int deleteByExample(MessageProducerExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int insert(MessageProducer record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int insertSelective(MessageProducer record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int insert(MessageProducer record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    List<MessageProducer> selectByExample(MessageProducerExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int insertSelective(MessageProducer record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    MessageProducer selectByPrimaryKey(String id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	List<MessageProducer> selectByExample(MessageProducerExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int updateByExampleSelective(@Param("record") MessageProducer record, @Param("example") MessageProducerExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	MessageProducer selectByPrimaryKey(String id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int updateByExample(@Param("record") MessageProducer record, @Param("example") MessageProducerExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") MessageProducer record,
+			@Param("example") MessageProducerExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int updateByPrimaryKeySelective(MessageProducer record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int updateByExample(@Param("record") MessageProducer record, @Param("example") MessageProducerExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table message_producer
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    int updateByPrimaryKey(MessageProducer record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int updateByPrimaryKeySelective(MessageProducer record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	int updateByPrimaryKey(MessageProducer record);
 
 }

+ 2 - 1
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserBusiness;
@@ -183,5 +184,5 @@ public interface UserMapper {
 	 * @param id
 	 * @return
 	 */
-	User selectBaseInfo(@Param("id")String id);
+	UserBasicInfo selectBaseInfo(@Param("id")String id);
 }

+ 23 - 38
src/main/java/com/goafanti/common/mapper/MessageConsumerMapper.xml

@@ -5,10 +5,9 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="creater" jdbcType="VARCHAR" property="creater" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="consumer_id" jdbcType="VARCHAR" property="consumerId" />
     <result column="message_id" jdbcType="VARCHAR" property="messageId" />
@@ -19,7 +18,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -53,7 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -87,15 +86,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
-    id, creater, create_time, consumer_id, message_id, delete_sign, read_time
+    id, create_time, consumer_id, message_id, delete_sign, read_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.MessageConsumerExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     select
     <if test="distinct">
@@ -114,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -125,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     delete from message_consumer
     where id = #{id,jdbcType=VARCHAR}
@@ -134,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     delete from message_consumer
     <if test="_parameter != null">
@@ -145,29 +144,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
-    insert into message_consumer (id, creater, create_time, 
-      consumer_id, message_id, delete_sign, 
-      read_time)
-    values (#{id,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{consumerId,jdbcType=VARCHAR}, #{messageId,jdbcType=VARCHAR}, #{deleteSign,jdbcType=BIT}, 
-      #{readTime,jdbcType=TIMESTAMP})
+    insert into message_consumer (id, create_time, consumer_id, 
+      message_id, delete_sign, read_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{consumerId,jdbcType=VARCHAR}, 
+      #{messageId,jdbcType=VARCHAR}, #{deleteSign,jdbcType=BIT}, #{readTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.MessageConsumer">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     insert into message_consumer
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="creater != null">
-        creater,
-      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -188,9 +184,6 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="creater != null">
-        #{creater,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -212,7 +205,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     select count(*) from message_consumer
     <if test="_parameter != null">
@@ -223,16 +216,13 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_consumer
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.creater != null">
-        creater = #{record.creater,jdbcType=VARCHAR},
-      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -257,11 +247,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_consumer
     set id = #{record.id,jdbcType=VARCHAR},
-      creater = #{record.creater,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       consumer_id = #{record.consumerId,jdbcType=VARCHAR},
       message_id = #{record.messageId,jdbcType=VARCHAR},
@@ -275,13 +264,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_consumer
     <set>
-      <if test="creater != null">
-        creater = #{creater,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -304,11 +290,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 18 20:45:17 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_consumer
-    set creater = #{creater,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
       consumer_id = #{consumerId,jdbcType=VARCHAR},
       message_id = #{messageId,jdbcType=VARCHAR},
       delete_sign = #{deleteSign,jdbcType=BIT},

+ 28 - 4
src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml

@@ -395,18 +395,27 @@
       delete_sign = #{deleteSign,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <insert id="insertBatch" parameterType="com.goafanti.common.model.MessageProducer">
-  	insert into message_producer (id, creater,consumer_id,message_id)
+  <insert id="insertBatchProducer" parameterType="com.goafanti.common.model.MessageProducer">
+  	insert into message_producer (id,consumer_id,message_id)
     values 
     <foreach item="item" index="index" collection="list" separator=",">
       (
-      	#{item.id,jdbcType=VARCHAR}, #{item.creater,jdbcType=VARCHAR},
-      	#{item.consumerId,jdbcType=VARCHAR},#{item.messageId,jdbcType=VARCHAR}
+      	#{item.id,jdbcType=VARCHAR},#{item.consumerId,jdbcType=VARCHAR},#{item.messageId,jdbcType=VARCHAR}
+      )
+    </foreach>
+  </insert>
+  <insert id="insertBatchConsumer" parameterType="com.goafanti.common.model.MessageConsumer">
+  	insert into message_consumer (id,consumer_id,message_id)
+    values 
+    <foreach item="item" index="index" collection="list" separator=",">
+      (
+      	#{item.id,jdbcType=VARCHAR},#{item.consumerId,jdbcType=VARCHAR},#{item.messageId,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
    <select id="selectSendMessage" parameterType="java.lang.String" resultType="com.goafanti.message.bo.MessageBo">
 		select
+			a.id,
 			a.message_id as messageId,
 			b.registration_id as registrationId
 		from
@@ -417,4 +426,19 @@
 			and a.send_time is null
 			and a.consumer_id = #{uid,jdbcType=VARCHAR};
    </select>
+   <update id="updateJpushEasemobAccount" parameterType="java.lang.String">
+   		update jpush_easemob_account
+   		<set>
+   			<if test="uuid != null and uuid != ''">
+   				uuid = #{uuid,jdbcType=VARCHAR}
+   			</if>
+   			<if test="registrationId != null and registrationId != ''">
+   				registration_id = #{registrationId,jdbcType=VARCHAR}
+   			</if>
+   			<if test="userName != null and userName != ''">
+   				username = #{userName,jdbcType=VARCHAR}
+   			</if>
+   			where uid = #{uid,jdbcType=VARCHAR}
+   		</set>
+   </update>
 </mapper>

+ 21 - 38
src/main/java/com/goafanti/common/mapper/MessageProducerMapper.xml

@@ -5,10 +5,9 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="creater" jdbcType="VARCHAR" property="creater" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="consumer_id" jdbcType="VARCHAR" property="consumerId" />
     <result column="message_id" jdbcType="VARCHAR" property="messageId" />
@@ -18,7 +17,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -52,7 +51,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -86,15 +85,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
-    id, creater, create_time, consumer_id, message_id, send_time
+    id, create_time, consumer_id, message_id, send_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.MessageProducerExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     select
     <if test="distinct">
@@ -113,7 +112,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -124,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     delete from message_producer
     where id = #{id,jdbcType=VARCHAR}
@@ -133,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     delete from message_producer
     <if test="_parameter != null">
@@ -144,29 +143,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
-    insert into message_producer (id, creater, create_time, 
-      consumer_id, message_id, send_time
-      )
-    values (#{id,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{consumerId,jdbcType=VARCHAR}, #{messageId,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}
-      )
+    insert into message_producer (id, create_time, consumer_id, 
+      message_id, send_time)
+    values (#{id,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{consumerId,jdbcType=VARCHAR}, 
+      #{messageId,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.MessageProducer">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     insert into message_producer
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="creater != null">
-        creater,
-      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -184,9 +178,6 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="creater != null">
-        #{creater,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -205,7 +196,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     select count(*) from message_producer
     <if test="_parameter != null">
@@ -216,16 +207,13 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_producer
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.creater != null">
-        creater = #{record.creater,jdbcType=VARCHAR},
-      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -247,11 +235,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_producer
     set id = #{record.id,jdbcType=VARCHAR},
-      creater = #{record.creater,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       consumer_id = #{record.consumerId,jdbcType=VARCHAR},
       message_id = #{record.messageId,jdbcType=VARCHAR},
@@ -264,13 +251,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_producer
     <set>
-      <if test="creater != null">
-        creater = #{creater,jdbcType=VARCHAR},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -290,11 +274,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+      This element was generated on Tue Dec 19 09:16:07 CST 2017.
     -->
     update message_producer
-    set creater = #{creater,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
       consumer_id = #{consumerId,jdbcType=VARCHAR},
       message_id = #{messageId,jdbcType=VARCHAR},
       send_time = #{sendTime,jdbcType=TIMESTAMP}

+ 17 - 6
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1411,12 +1411,23 @@
 		</if>
 	</select>
 	
-	<select id="selectBaseInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
+	<select id="selectBaseInfo" parameterType="java.lang.String" resultMap="com.goafanti.app.bo.UserBasicInfo">
 		select
-			id, mobile, nickname, email, number, type, 
-    		company_logo_url, head_portrait_url, society_tag, introduction, 
-   			identify_name, is_member
-   		from user where 
-   			id = #{id,jdbcType=VARCHAR}
+			a.id, 
+			a.mobile, 
+			a.nickname, 
+			a.email, 
+			a.number, 
+			a.type, 
+    		a.company_logo_url as companyLogoUrl, 
+    		a.head_portrait_url as headPortraitUrl, 
+    		a.introduction, 
+   			a.is_member as isMember,
+   			b.registration_id registrationId,
+   			b.username
+   		from user a left join jpush_easemob_account b 
+   			on a.id = b.uid 
+   		where 
+   			a.id = #{id,jdbcType=VARCHAR}
 	</select>
 </mapper>

+ 18 - 41
src/main/java/com/goafanti/common/model/MessageConsumer.java

@@ -6,44 +6,39 @@ public class MessageConsumer {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	private String id;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.creater
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
-	 */
-	private String creater;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.create_time
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.consumer_id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	private String consumerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.message_id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	private String messageId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.delete_sign
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	private Boolean deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.read_time
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	private Date readTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.id
 	 * @return  the value of message_consumer.id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -52,34 +47,16 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.id
 	 * @param id  the value for message_consumer.id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.creater
-	 * @return  the value of message_consumer.creater
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
-	 */
-	public String getCreater() {
-		return creater;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.creater
-	 * @param creater  the value for message_consumer.creater
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
-	 */
-	public void setCreater(String creater) {
-		this.creater = creater;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.create_time
 	 * @return  the value of message_consumer.create_time
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -88,7 +65,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.create_time
 	 * @param createTime  the value for message_consumer.create_time
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -97,7 +74,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.consumer_id
 	 * @return  the value of message_consumer.consumer_id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public String getConsumerId() {
 		return consumerId;
@@ -106,7 +83,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.consumer_id
 	 * @param consumerId  the value for message_consumer.consumer_id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setConsumerId(String consumerId) {
 		this.consumerId = consumerId;
@@ -115,7 +92,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.message_id
 	 * @return  the value of message_consumer.message_id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public String getMessageId() {
 		return messageId;
@@ -124,7 +101,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.message_id
 	 * @param messageId  the value for message_consumer.message_id
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setMessageId(String messageId) {
 		this.messageId = messageId;
@@ -133,7 +110,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.delete_sign
 	 * @return  the value of message_consumer.delete_sign
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public Boolean getDeleteSign() {
 		return deleteSign;
@@ -142,7 +119,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.delete_sign
 	 * @param deleteSign  the value for message_consumer.delete_sign
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setDeleteSign(Boolean deleteSign) {
 		this.deleteSign = deleteSign;
@@ -151,7 +128,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.read_time
 	 * @return  the value of message_consumer.read_time
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public Date getReadTime() {
 		return readTime;
@@ -160,7 +137,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.read_time
 	 * @param readTime  the value for message_consumer.read_time
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setReadTime(Date readTime) {
 		this.readTime = readTime;

+ 16 - 86
src/main/java/com/goafanti/common/model/MessageConsumerExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class MessageConsumerExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public MessageConsumerExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -233,76 +233,6 @@ public class MessageConsumerExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andCreaterIsNull() {
-			addCriterion("creater is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterIsNotNull() {
-			addCriterion("creater is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterEqualTo(String value) {
-			addCriterion("creater =", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterNotEqualTo(String value) {
-			addCriterion("creater <>", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterGreaterThan(String value) {
-			addCriterion("creater >", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterGreaterThanOrEqualTo(String value) {
-			addCriterion("creater >=", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterLessThan(String value) {
-			addCriterion("creater <", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterLessThanOrEqualTo(String value) {
-			addCriterion("creater <=", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterLike(String value) {
-			addCriterion("creater like", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterNotLike(String value) {
-			addCriterion("creater not like", value, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterIn(List<String> values) {
-			addCriterion("creater in", values, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterNotIn(List<String> values) {
-			addCriterion("creater not in", values, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterBetween(String value1, String value2) {
-			addCriterion("creater between", value1, value2, "creater");
-			return (Criteria) this;
-		}
-
-		public Criteria andCreaterNotBetween(String value1, String value2) {
-			addCriterion("creater not between", value1, value2, "creater");
-			return (Criteria) this;
-		}
-
 		public Criteria andCreateTimeIsNull() {
 			addCriterion("create_time is null");
 			return (Criteria) this;
@@ -626,7 +556,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_consumer
-	 * @mbg.generated  Mon Dec 18 20:45:17 CST 2017
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 115 - 196
src/main/java/com/goafanti/common/model/MessageProducer.java

@@ -3,201 +3,120 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class MessageProducer {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column message_producer.id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    private String id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column message_producer.creater
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    private String creater;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column message_producer.create_time
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column message_producer.consumer_id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    private String consumerId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column message_producer.message_id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    private String messageId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column message_producer.send_time
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    private Date sendTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column message_producer.id
-     *
-     * @return the value of message_producer.id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column message_producer.id
-     *
-     * @param id the value for message_producer.id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column message_producer.creater
-     *
-     * @return the value of message_producer.creater
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public String getCreater() {
-        return creater;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column message_producer.creater
-     *
-     * @param creater the value for message_producer.creater
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public void setCreater(String creater) {
-        this.creater = creater;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column message_producer.create_time
-     *
-     * @return the value of message_producer.create_time
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column message_producer.create_time
-     *
-     * @param createTime the value for message_producer.create_time
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column message_producer.consumer_id
-     *
-     * @return the value of message_producer.consumer_id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public String getConsumerId() {
-        return consumerId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column message_producer.consumer_id
-     *
-     * @param consumerId the value for message_producer.consumer_id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public void setConsumerId(String consumerId) {
-        this.consumerId = consumerId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column message_producer.message_id
-     *
-     * @return the value of message_producer.message_id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column message_producer.message_id
-     *
-     * @param messageId the value for message_producer.message_id
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public void setMessageId(String messageId) {
-        this.messageId = messageId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column message_producer.send_time
-     *
-     * @return the value of message_producer.send_time
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public Date getSendTime() {
-        return sendTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column message_producer.send_time
-     *
-     * @param sendTime the value for message_producer.send_time
-     *
-     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
-     */
-    public void setSendTime(Date sendTime) {
-        this.sendTime = sendTime;
-    }
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.create_time
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.consumer_id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	private String consumerId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.message_id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	private String messageId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.send_time
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	private Date sendTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.id
+	 * @return  the value of message_producer.id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.id
+	 * @param id  the value for message_producer.id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.create_time
+	 * @return  the value of message_producer.create_time
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.create_time
+	 * @param createTime  the value for message_producer.create_time
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.consumer_id
+	 * @return  the value of message_producer.consumer_id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public String getConsumerId() {
+		return consumerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.consumer_id
+	 * @param consumerId  the value for message_producer.consumer_id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public void setConsumerId(String consumerId) {
+		this.consumerId = consumerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.message_id
+	 * @return  the value of message_producer.message_id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public String getMessageId() {
+		return messageId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.message_id
+	 * @param messageId  the value for message_producer.message_id
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.send_time
+	 * @return  the value of message_producer.send_time
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public Date getSendTime() {
+		return sendTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.send_time
+	 * @param sendTime  the value for message_producer.send_time
+	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 */
+	public void setSendTime(Date sendTime) {
+		this.sendTime = sendTime;
+	}
 }

File diff suppressed because it is too large
+ 572 - 683
src/main/java/com/goafanti/common/model/MessageProducerExample.java


+ 8 - 0
src/main/java/com/goafanti/message/bo/MessageBo.java

@@ -3,6 +3,8 @@ package com.goafanti.message.bo;
 import java.util.Date;
 
 public class MessageBo{
+	/** 字段ID **/
+	private String id;
 	/** 极光 ID **/
 	private String registrationId;
 	/** 环信用户名 **/
@@ -23,6 +25,12 @@ public class MessageBo{
 	private String messageBody; 
 	/** 业务字段 **/
 	private String extra;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
 	public String getRegistrationId() {
 		return registrationId;
 	}

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

@@ -1,5 +1,10 @@
 package com.goafanti.user.controller;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
@@ -7,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.web.util.SavedRequest;
 import org.apache.shiro.web.util.WebUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,21 +23,29 @@ import org.springframework.web.servlet.view.RedirectView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.goafanti.admin.service.MessageService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.MessageConsumer;
+import com.goafanti.common.model.MessageProducer;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.message.JGMessageHelper;
+import com.goafanti.message.bo.MessageBo;
 import com.goafanti.user.service.UserService;
 
 @Controller
 public class UserLoginController extends BaseController {
 	@Resource
 	private UserService userService;
-
+	@Autowired
+	private MessageService messageServiceImpl;
+	@Autowired
+	private JGMessageHelper jgMessageHelper;
 	@RequestMapping(value = "/login", method = RequestMethod.GET)
 	@ResponseBody
 	public Result login(HttpServletRequest request, Model model) {
@@ -70,10 +84,8 @@ public class UserLoginController extends BaseController {
 		}
 		res.setToken(SecurityUtils.getSubject().getSession().getId());
 		res.setData(jo);
-		/**
-		 * 查询需要发送的消息
-		 * 发送表(已发送)>接收表 
-		 */
+		// 发送推送消息
+		sendMessageAfterLogin(); 
 		return res;
 	}
 
@@ -119,4 +131,37 @@ public class UserLoginController extends BaseController {
 		}
 		return res;
 	}
+	
+	/**
+	 * 登陆时查询未发送消息指定发送 
+	 */
+	private void sendMessageAfterLogin(){
+		//更新 message_producer
+		User u = TokenManager.getUserToken();
+		if(u != null){
+			List<MessageBo> boList = messageServiceImpl.selectSendMessage(u.getId()); 
+			if(boList != null && boList.size()>0){
+				jgMessageHelper.sendSystemMessage(boList);
+				List<MessageProducer> producers = new ArrayList<MessageProducer>();
+				List<MessageConsumer> consumers = new ArrayList<MessageConsumer>();
+				MessageProducer mp = null;
+				MessageConsumer mc = null;
+				Date date = new Date();
+				for(MessageBo bo : boList){
+					mp = new MessageProducer();
+					mp.setId(bo.getId());
+					mp.setSendTime(date);
+					producers.add(mp);
+					mc = new MessageConsumer();
+					mc.setId(UUID.randomUUID().toString());
+					mc.setConsumerId(TokenManager.getUserId());
+					mc.setMessageId(bo.getMessageId());
+					consumers.add(mc);
+				}
+				messageServiceImpl.updateMessageProducer(producers);
+				//新增 message_consumer
+				messageServiceImpl.insertBatchConsumer(consumers);
+			}	
+		}
+	}
 }

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

@@ -8,13 +8,18 @@ import javax.validation.Valid;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.service.AdminService;
+import com.goafanti.admin.service.MessageService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -26,6 +31,8 @@ import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.easemob.EasemobUtils;
+import com.goafanti.easemob.bo.EasemobInfo;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.service.UserService;
 
@@ -35,12 +42,13 @@ public class UserRegisterController extends BaseController {
 	private UserService		userService;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil	passwordUtil;
-
-	Logger					logger	= Logger.getLogger(UserRegisterController.class);
-
 	@Resource
 	private AdminService	adminService;
-
+	@Autowired
+	private MessageService messageServiceImpl;
+	@Autowired
+	private EasemobUtils   easemobUtils;
+	Logger					logger	= Logger.getLogger(UserRegisterController.class);
 	/**
 	 * 用户注册
 	 * 
@@ -49,7 +57,7 @@ public class UserRegisterController extends BaseController {
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
 	@ResponseBody
-	public Result register(@Valid InputUser user, String companyName, String contacts, String mobileCode,
+	public Result register(@Valid InputUser user, String companyName, String contacts, String mobileCode,String uuid,
 			BindingResult bindingResult) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -109,9 +117,22 @@ public class UserRegisterController extends BaseController {
 			us.setAid("2");//ID为"2"的管理员
 			userService.insertRegister(us,companyName,contacts);
 		}
-
+		registerEasemobAfterRegister(uuid);//开通环信账号
 		return res;
 	}
 	
+	private void registerEasemobAfterRegister(String uuid){
+		User u = TokenManager.getUserToken();
+		if(u != null){
+			JSONObject resultObj = new JSONObject();
+			resultObj.put("password", new SimpleHash("md5", u.getId(), null, 1).toHex());
+			resultObj.put("username", String.valueOf(u.getNumber()));
+			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
+			easemobUtils.sendLater(
+					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
+			//绑定账号
+			messageServiceImpl.updateJpushEasemobAccount(uuid, null, u.getNumber()+"");
+		}
+	}
 
 }

+ 2 - 1
src/main/java/com/goafanti/user/service/UserService.java

@@ -3,6 +3,7 @@ package com.goafanti.user.service;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgListBo;
@@ -60,5 +61,5 @@ public interface UserService {
 
 	List<UserPartnerDetailBo> findUserPartner();
 
-	User selectBaseInfo(String id);
+	UserBasicInfo selectBaseInfo(String id);
 }

+ 2 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.CopyrightInfoMapper;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
@@ -355,7 +356,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	}
 
 	@Override
-	public User selectBaseInfo(String id) {
+	public UserBasicInfo selectBaseInfo(String id) {
 		return userMapper.selectBaseInfo(id);
 	}