重命名 类

src/main/java/com/hdp/customerservice/websocket/CustomerManager.java

@@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.springframework.util.StringUtils;
 
 import com.hdp.customerservice.websocket.model.Customer;
-import com.hdp.pi.wechat.model.BaseEntity;
+import com.hdp.pi.wechat.messages.AbstractMessage;
 
 public class CustomerManager {
 	
@@ -37,7 +37,7 @@ public class CustomerManager {
 		users.put(user.openId, user);
 	}
 	
-	public static void addUserIfNotExist(BaseEntity e){
+	public static void addUserIfNotExist(AbstractMessage e){
 		String openId=e.openId;
 		Customer user = users.get(openId);
 		if(user == null){

src/main/java/com/hdp/customerservice/websocket/IMManager.java

@@ -22,7 +22,7 @@ import org.springframework.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.hdp.customerservice.websocket.model.Customer;
 import com.hdp.customerservice.websocket.model.Waiter;
-import com.hdp.pi.wechat.model.BaseEntity;
+import com.hdp.pi.wechat.messages.AbstractMessage;
 
 public class IMManager {
 	private static Log log=LogFactory.getLog(IMManager.class);
@@ -30,7 +30,7 @@ public class IMManager {
 	public static ConcurrentHashMap<String,Waiter> 
 					waiters = new ConcurrentHashMap<String, Waiter>();
 	
-	private static LinkedBlockingQueue<BaseEntity> queue=new LinkedBlockingQueue<BaseEntity>();
+	private static LinkedBlockingQueue<AbstractMessage> queue=new LinkedBlockingQueue<AbstractMessage>();
 	
 	public static void broadcast(String id,String message){
 		Iterator<Waiter> ws= waiters.values().iterator();
@@ -46,7 +46,7 @@ public class IMManager {
 		}
 	}
 	
-	public static void pushMessage(BaseEntity message){
+	public static void pushMessage(AbstractMessage message){
 		CustomerManager.addUserIfNotExist(message);
 		try {
 			queue.put(message);
@@ -58,7 +58,7 @@ public class IMManager {
 		new Thread(new Runnable() {//消息发射器
 			
 			public void hand(){
-				BaseEntity e=queue.poll();
+				AbstractMessage e=queue.poll();
 				if(e == null){
 					return ;
 				}

src/main/java/com/hdp/customerservice/websocket/model/Customer.java

@@ -11,7 +11,7 @@ package com.hdp.customerservice.websocket.model;
 import java.util.Date;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import com.hdp.pi.wechat.model.BaseEntity;
+import com.hdp.pi.wechat.messages.AbstractMessage;
 
 public class Customer {
 	

src/main/java/com/hdp/pi/wechat/handler/ImageMessageHandler.java

@@ -5,8 +5,8 @@ import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.springframework.stereotype.Component;
 
-import com.hdp.pi.wechat.model.BaseEntity;
-import com.hdp.pi.wechat.model.ImageMessage;
+import com.hdp.pi.wechat.messages.AbstractMessage;
+import com.hdp.pi.wechat.messages.ImageMessage;
 
 /**
  * Created by Veal on 2015/5/15.
@@ -14,7 +14,7 @@ import com.hdp.pi.wechat.model.ImageMessage;
 @Component
 public class ImageMessageHandler extends MessageHandler {
     @Override
-    protected BaseEntity decode(String message) throws DocumentException {
+    protected AbstractMessage decode(String message) throws DocumentException {
     	Document doc = DocumentHelper.parseText(message);
         ImageMessage imageMessage=new ImageMessage();
         imageMessage.msgId = getXMLNodeText(doc,"/xml/MsgId");

src/main/java/com/hdp/pi/wechat/handler/LocationHandler.java

@@ -5,8 +5,8 @@ import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.springframework.stereotype.Component;
 
-import com.hdp.pi.wechat.model.BaseEntity;
-import com.hdp.pi.wechat.model.LocationMessage;
+import com.hdp.pi.wechat.messages.AbstractMessage;
+import com.hdp.pi.wechat.messages.LocationMessage;
 
 /**
  * Created by Veal on 2015/5/15.
@@ -14,7 +14,7 @@ import com.hdp.pi.wechat.model.LocationMessage;
 @Component
 public class LocationHandler extends MessageHandler {
     @Override
-    protected BaseEntity decode(String message) throws DocumentException {
+    protected AbstractMessage decode(String message) throws DocumentException {
     	Document doc = DocumentHelper.parseText(message);
         LocationMessage location=new LocationMessage();
         location.msgId= getXMLNodeText(doc,"/xml/MsgId");

src/main/java/com/hdp/pi/wechat/handler/MessageHandler.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.hdp.customerservice.websocket.IMManager;
-import com.hdp.pi.wechat.model.BaseEntity;
+import com.hdp.pi.wechat.messages.AbstractMessage;
 
 import java.util.Calendar;
 
@@ -20,12 +20,12 @@ public abstract class MessageHandler {
     /**
      *不同的消息对应的解析方法
      **/
-    protected abstract BaseEntity decode(String message) throws Exception;
+    protected abstract AbstractMessage decode(String message) throws Exception;
 
     /**
      *处理通用信息 比如openid 日期
      **/
-    public final void deCommonInfo(BaseEntity entity,String message) throws Exception{
+    public final void deCommonInfo(AbstractMessage entity,String message) throws Exception{
     	Document doc = DocumentHelper.parseText(message);
         Calendar calendar=Calendar.getInstance();
         calendar.setTimeInMillis(Long.parseLong(getXMLNodeText(doc,"/xml/CreateTime")));
@@ -51,7 +51,7 @@ public abstract class MessageHandler {
             return false;
         }
         boolean result=Boolean.TRUE;//默认为处理成功
-        BaseEntity entity = decode(message);//特有字段需子类重写
+        AbstractMessage entity = decode(message);//特有字段需子类重写
         entity.msgType = msgType;//消息类型
         deCommonInfo(entity,message);//处理通用字段
         if(null != entity){

src/main/java/com/hdp/pi/wechat/handler/ShortVideoMessageHandler.java

@@ -5,8 +5,8 @@ import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 
-import com.hdp.pi.wechat.model.BaseEntity;
-import com.hdp.pi.wechat.model.ShortVideoMessage;
+import com.hdp.pi.wechat.messages.AbstractMessage;
+import com.hdp.pi.wechat.messages.ShortVideoMessage;
 
 /**
  * Created by Veal on 2015/5/15.
@@ -14,7 +14,7 @@ import com.hdp.pi.wechat.model.ShortVideoMessage;
 @Component
 public class ShortVideoMessageHandler extends MessageHandler {
     @Override
-    protected BaseEntity decode(String message) throws DocumentException {
+    protected AbstractMessage decode(String message) throws DocumentException {
         Document doc= DocumentHelper.parseText(message);
         ShortVideoMessage shortVideoMessage=new ShortVideoMessage();
         shortVideoMessage.msgId= getXMLNodeText(doc,"/xml/MsgId");

src/main/java/com/hdp/pi/wechat/handler/TextMessageHandler.java

@@ -5,8 +5,8 @@ import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 
-import com.hdp.pi.wechat.model.BaseEntity;
-import com.hdp.pi.wechat.model.TextMessage;
+import com.hdp.pi.wechat.messages.AbstractMessage;
+import com.hdp.pi.wechat.messages.TextMessage;
 
 /**
  * Created by Veal on 2015/5/15.
@@ -14,7 +14,7 @@ import com.hdp.pi.wechat.model.TextMessage;
 @Component
 public class TextMessageHandler extends MessageHandler {
     @Override
-    protected BaseEntity decode(String message) throws DocumentException {
+    protected AbstractMessage decode(String message) throws DocumentException {
 	Document doc = DocumentHelper.parseText(message);
         TextMessage textMessage=new TextMessage();
         textMessage.msgId= getXMLNodeText(doc,"/xml/MsgId");

src/main/java/com/hdp/pi/wechat/handler/VideoMessageHandler.java

@@ -5,8 +5,8 @@ import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 
-import com.hdp.pi.wechat.model.BaseEntity;
-import com.hdp.pi.wechat.model.VideoMessage;
+import com.hdp.pi.wechat.messages.AbstractMessage;
+import com.hdp.pi.wechat.messages.VideoMessage;
 
 /**
  * Created by Veal on 2015/5/15.
@@ -14,7 +14,7 @@ import com.hdp.pi.wechat.model.VideoMessage;
 @Component
 public class VideoMessageHandler extends MessageHandler {
     @Override
-    protected BaseEntity decode(String message) throws DocumentException {
+    protected AbstractMessage decode(String message) throws DocumentException {
         Document doc= DocumentHelper.parseText(message);
         VideoMessage videoMessage=new VideoMessage();
         videoMessage.msgId= getXMLNodeText(doc,"/xml/MsgId");

src/main/java/com/hdp/pi/wechat/handler/VoiceMessageHander.java

@@ -6,8 +6,8 @@ import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Node;
 
-import com.hdp.pi.wechat.model.BaseEntity;
-import com.hdp.pi.wechat.model.VoiceMessage;
+import com.hdp.pi.wechat.messages.AbstractMessage;
+import com.hdp.pi.wechat.messages.VoiceMessage;
 
 /**
  * Created by Veal on 2015/5/15.
@@ -15,7 +15,7 @@ import com.hdp.pi.wechat.model.VoiceMessage;
 @Component
 public class VoiceMessageHander extends MessageHandler {
     @Override
-    protected BaseEntity decode(String message) throws DocumentException {
+    protected AbstractMessage decode(String message) throws DocumentException {
         Document doc= DocumentHelper.parseText(message);
         VoiceMessage voiceMessage=new VoiceMessage();
         voiceMessage.msgId= getXMLNodeText(doc,"/xml/MsgId");

src/main/java/com/hdp/pi/wechat/model/BaseEntity.java → src/main/java/com/hdp/pi/wechat/messages/AbstractMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -6,7 +6,7 @@ import java.util.Date;
 /**
  * Created by Veal on 2015/5/13.
  */
-public abstract class BaseEntity implements Serializable{
+public abstract class AbstractMessage implements Serializable{
 	
 	public Integer entCode;
 	

src/main/java/com/hdp/pi/wechat/model/ImageMessage.java → src/main/java/com/hdp/pi/wechat/messages/ImageMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 /**
  * Created by Veal on 2015/5/12.
  */
-public class ImageMessage extends BaseEntity{
+public class ImageMessage extends AbstractMessage{
 
     public String msgId;//图文消息的id
 

src/main/java/com/hdp/pi/wechat/model/LocationMessage.java → src/main/java/com/hdp/pi/wechat/messages/LocationMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 /**
  * Created by Veal on 2015/5/12.
  */
-public class LocationMessage extends BaseEntity{
+public class LocationMessage extends AbstractMessage{
 
     public String msgId;
 

src/main/java/com/hdp/pi/wechat/model/ShortVideoMessage.java → src/main/java/com/hdp/pi/wechat/messages/ShortVideoMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 /**
  * Created by Veal on 2015/5/12.
  */
-public class ShortVideoMessage extends BaseEntity{
+public class ShortVideoMessage extends AbstractMessage{
 
     public String msgId;
 

src/main/java/com/hdp/pi/wechat/model/TextMessage.java → src/main/java/com/hdp/pi/wechat/messages/TextMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 /**
  * Created by Veal on 2015/5/12.
  */
-public class TextMessage extends BaseEntity{
+public class TextMessage extends AbstractMessage{
 
     public String msgId;
 

src/main/java/com/hdp/pi/wechat/model/VideoMessage.java → src/main/java/com/hdp/pi/wechat/messages/VideoMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 /**
  * Created by Veal on 2015/5/12.
  */
-public class VideoMessage extends BaseEntity{
+public class VideoMessage extends AbstractMessage{
 
     public String msgId;
 

src/main/java/com/hdp/pi/wechat/model/VoiceMessage.java → src/main/java/com/hdp/pi/wechat/messages/VoiceMessage.java

-package com.hdp.pi.wechat.model;
+package com.hdp.pi.wechat.messages;
 
 
 /**
  * Created by Veal on 2015/5/12.
  */
-public class VoiceMessage extends BaseEntity{
+public class VoiceMessage extends AbstractMessage{
 
     public String msgId;