1

src/main/java/com/ekexiu/portal/msg/Service.java

@@ -19,6 +19,9 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.DateUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.json.JsonService;
import com.ekexiu.portal.util.WebMsgSocketServlet;
@Path("/webMsg")
public class Service {
@@ -56,7 +59,7 @@ public class Service {
		if (list == null || list.isEmpty())
			return EMPTY_ACTORS;
		SimpleDateFormat sf = new SimpleDateFormat(DateUtil.DATETIME_FORMAT);
		SimpleDateFormat sf = new SimpleDateFormat(DateUtil.TIMESTAMP_FORMAT);
		List<ActorItem> ret = new ArrayList<ActorItem>(list.size());
		for (ListIterator<WebMsgIdx> it = list.listIterator(); it.hasNext();) {
			ret.add(build(it.next(), owner, sf));
@@ -65,11 +68,29 @@ public class Service {
	}
	@Get
	@Path("/idx")
	@Path("/idx/qm")
	public List<ActorItem> query(@JdbcConn Connection con, String id) throws SQLException {
		List<WebMsgIdx> list = webMsgDao.query(con, id);
		return build(list, id);
	}
	@Get
	@Path("/idx/qo")
	public ActorItem query(@JdbcConn Connection con,String id,String oid)throws SQLException{
		WebMsgIdx wmi = null;
		if(id.compareTo(oid)<0){
			wmi = webMsgDao.query(con,id, oid);
		}else{
			wmi = webMsgDao.query(con,oid, id);
		}
		SimpleDateFormat sf = new SimpleDateFormat(DateUtil.TIMESTAMP_FORMAT);
		if(wmi!=null){
			return build(wmi,id, sf);
		}
		return null;
		
	}
	
	
	@Get
	@Path("/idx/pq")
@@ -108,7 +129,7 @@ public class Service {
		while (next) {
			try {
				long time = System.currentTimeMillis();
				wmc.setSendTime(DateUtil.formatDateTime(time));
				wmc.setSendTime(DateUtil.formatTimeStamp(time));
				webMsgDao.insert(con, wmc);
				int numOfUpdate = 0;
				if (ownerSend) {
@@ -121,7 +142,7 @@ public class Service {
						wmi = new WebMsgIdx();
						wmi.setActor(actor);
						wmi.setLastCnt(cnt);
					
						wmi.setNumOfActor(ownerSend ? 1 : 0);
						wmi.setNumOfOwner(ownerSend ? 0 : 1);
						wmi.setOwner(owner);
@@ -129,10 +150,11 @@ public class Service {
						wmi.setShowOfOwner(true);
					}
					wmi.setLastTime(time);
					webMsgDao.insert(con,wmi);
					webMsgDao.insert(con, wmi);
				}
				con.commit();
				next=false;
				next = false;
				WebMsgSocketServlet.sendMessage(reciver, JsonService.toJson(wmc));
			} catch (SQLException e) {
				if ("23505".equals(e.getSQLState())) {
					con.rollback();
@@ -142,35 +164,36 @@ public class Service {
		}
	}
	@Get
	@Path("/cnt/load")
	public List<WebMsgCnt> load(@JdbcConn Connection con,String sender,String reciver,@Nullable String bt,@DefaultValue("true") boolean all)throws SQLException{
		if(all){
			return webMsgDao.queryAll(con,sender, reciver, bt);
		}else{
	public List<WebMsgCnt> load(@JdbcConn Connection con, String sender, String reciver, @Nullable String bt, @DefaultValue("true") boolean all)
			throws SQLException {
		if (all) {
			return webMsgDao.queryAll(con, sender, reciver, bt);
		} else {
			return webMsgDao.query(con, sender, reciver, bt);
		}
	}
	
	@Post
	@Path("/readed")
	public void readed(@JdbcConn(true) Connection con,String sender,String reciver,String time)throws SQLException{
	public void readed(@JdbcConn(true) Connection con, String sender, String reciver, String time) throws SQLException {
		int num = webMsgDao.readed(con, sender, reciver, time);
		if(num>0){
		if (num > 0) {
			String owner = sender;
			String actor = reciver;
			boolean 	ownerSend = true;
			if(sender.compareTo(reciver)>0){
			boolean ownerSend = true;
			if (sender.compareTo(reciver) > 0) {
				owner = reciver;
				actor = sender;
				ownerSend = false;
			}
			if(ownerSend){
				webMsgDao.decActorNum(con, owner, actor,num);
			}else{
			if (ownerSend) {
				webMsgDao.decActorNum(con, owner, actor, num);
			} else {
				webMsgDao.decOwnerNum(con, owner, actor, num);
			}
		}
	}
}

src/main/java/com/ekexiu/portal/msg/WebMsgCnt.java

@@ -38,7 +38,7 @@ public class WebMsgCnt {
		this.cnt = cnt;
	}
	
	@Column(DE.dateTime_de)
	@Column(DE.text_de)
	public String getSendTime() {
		return sendTime;
	}

src/main/java/com/ekexiu/portal/msg/WebMsgDao.java

@@ -2,7 +2,7 @@ package com.ekexiu.portal.msg;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import java.util.List; 
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
@@ -13,6 +13,7 @@ import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.GroupSqlColumn;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
@@ -30,6 +31,9 @@ public interface WebMsgDao {
	List<WebMsgIdx> query(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, isAnd = false, value = { "OWNER=? AND SHOW_OF_OWNER='1'",
			"ACTOR=? AND SHOW_OF_ACTOR='1'" },force=false) String id) throws SQLException;
	
	@SelectOne
	@Nullable
	WebMsgIdx query(Connection con,String owner,String actor)throws SQLException;
	
	@Exclude({"showOfOwner","showOfActor"})
	@PageSelect
@@ -85,6 +89,4 @@ public interface WebMsgDao {
	@From(WebMsgCnt.class)
	@SetSentence("READED='1'")
	int readed(Connection con,String sender,String reciver,@LtEq String sendTime)throws SQLException;
	
	
}

src/main/java/com/ekexiu/portal/util/WebMsgSocketServlet.java

@@ -20,15 +20,12 @@ public class WebMsgSocketServlet {
	private static final Map<String, Session> sessions = new ConcurrentHashMap<String, Session>();
	private static final String[] TYPE_LIST = new String[]{"www","app"};
	
	
	public static void sendMessage(String id ,String cnt){
		
		for(String type:TYPE_LIST){
			String key = id+"~"+type;
			Session session = sessions.get(key);
			if(session!=null && session.isOpen()){
				try {
					System.out.println("SEND:"+key+"           "+cnt);
					session.getBasicRemote().sendText(cnt);
				} catch (IOException e) {
				}
@@ -36,6 +33,13 @@ public class WebMsgSocketServlet {
			
		}
	}
	public static boolean invalidType(String type){
		for(String s:TYPE_LIST){
			if(s.equals(type))
				return false;
		}
		return true;
	}
	@OnMessage
	public void echoTextMessage(Session session, String msg, boolean last) {
@@ -75,7 +79,6 @@ public class WebMsgSocketServlet {
	@OnOpen
	public void open(Session session) {
		String qs = session.getQueryString();
		System.out.println("onOpen:"+qs);
		String[] ps = qs.split("&");
		String id = null;
		String type = null;
@@ -89,7 +92,7 @@ public class WebMsgSocketServlet {
			}
		}
		if (id == null || type == null) {
		if (id == null || type == null || invalidType(type) ) {
			try {
				session.close();
			} catch (IOException e) {
@@ -97,7 +100,6 @@ public class WebMsgSocketServlet {
			return;
		}
		String sessionFlag = id + "~" + type;
		Session old = null;
		synchronized (lock) {
			old = sessions.get(sessionFlag);
@@ -114,7 +116,6 @@ public class WebMsgSocketServlet {
	@OnClose
	public void close(Session session) {
		String qs = session.getQueryString();
		System.out.println("OnClose:"+qs);
		String[] ps = qs.split("&");
		String id = null;
		String type = null;