1

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

@@ -6,30 +6,46 @@ public class ActorItem {
	private String timeStr;
	private String cnt;
	private int num;
	/**
	 * @return 会话参与人ID
	 */
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	/**
	 * @return 会话最近活动时间 UTC MilliSecond since UTC1970-01-01 00：00：00：000
	 */
	public long getTime() {
		return time;
	}
	public void setTime(long time) {
		this.time = time;
	}
	/**
	 * @return 会话最近活动时间 YYYYMMDDHH24MISSZZZ
	 */
	public String getTimeStr() {
		return timeStr;
	}
	public void setTimeStr(String timeStr) {
		this.timeStr = timeStr;
	}
	/**
	 * @return 会话最近活动内空
	 */
	public String getCnt() {
		return cnt;
	}
	public void setCnt(String cnt) {
		this.cnt = cnt;
	}
	/**
	 * @return 会话未读数
	 */
	public int getNum() {
		return num;
	}

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

@@ -49,6 +49,8 @@ public class Service {
	public static ActorItem build(WebMsgIdx wmi, String owner, SimpleDateFormat sf) {
		ActorItem item = new ActorItem();
		item.setCnt(wmi.getLastCnt());
		item.setTime(wmi.getLastTime());
		item.setTimeStr(sf.format(new Date(wmi.getLastTime())));
		String actor = wmi.getActor();
		if (owner.equals(actor)) {
			item.setId(wmi.getOwner());
@@ -57,8 +59,7 @@ public class Service {
			item.setId(actor);
			item.setNum(wmi.getNumOfActor());
		}
		item.setTime(wmi.getLastTime());
		item.setTimeStr(sf.format(new Date(wmi.getLastTime())));
		return item;
	}
@@ -79,6 +80,15 @@ public class Service {
			throw new JfwBaseException(ERROR_OWNER_OR_ACTOR, "消息的参与人不合法");
	}
	/**
	 * 查询指定用户的未删除会话
	 * 
	 * @param con
	 * @param id
	 *            用户ID
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/idx/qm")
	public List<ActorItem> query(@JdbcConn Connection con, String id) throws SQLException {
@@ -86,10 +96,20 @@ public class Service {
		return build(list, id);
	}
	/**
	 * 查询指定的未删除会话
	 * 
	 * @param con
	 * @param owner
	 *            会话所有人
	 * @param actor
	 *            会话参与人
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/idx/qo")
	public ActorItem query(@JdbcConn Connection con, String owner, String actor) throws SQLException, JfwBaseException {
		checkActors(owner, owner);
	public ActorItem query(@JdbcConn Connection con, String owner, String actor) throws SQLException {
		WebMsgIdx wmi = null;
		if (owner.compareTo(actor) < 0) {
			wmi = webMsgDao.query(con, owner, actor);
@@ -103,6 +123,15 @@ public class Service {
		return null;
	}
	/**
	 * 查询指定用户的未删除会话(分页,最后活动时间倒序）
	 * 
	 * @param con
	 * @param id
	 *            用户ID
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/idx/pq")
	public PageQueryResult<ActorItem> query(@JdbcConn Connection con, String id, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)
@@ -116,6 +145,15 @@ public class Service {
		return ret;
	}
	/**
	 * 查询指定用户的未读消息数
	 * 
	 * @param con
	 * @param id
	 *            用户id
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/unReadedCount")
	public Integer queryUnReadedCount(@JdbcConn Connection con, final String id) throws SQLException {
@@ -139,9 +177,23 @@ public class Service {
				});
	}
	/**
	 * 发送消息
	 * 
	 * @param con
	 * @param sender
	 *            发送人ID
	 * @param reciver
	 *            接收人ID
	 * @param cnt
	 *            内容
	 * @return 发送时间（YYYYMMDDHH24MISSZZZ)
	 * @throws SQLException
	 * @throws JfwBaseException
	 */
	@Post
	@Path
	public void send(@JdbcConn Connection con, String sender, String reciver, String cnt) throws SQLException, JfwBaseException {
	public String send(@JdbcConn Connection con, String sender, String reciver, String cnt) throws SQLException, JfwBaseException {
		checkActors(sender, reciver);
		boolean ownerSend = true;
		String owner = sender;
@@ -195,19 +247,69 @@ public class Service {
				throw e;
			}
		}
		return wmc.getSendTime();
	}
	/**
	 * 查询消息内容
	 * 
	 * @param con
	 * @param sender
	 *            发送人ID
	 * @param reciver
	 *            接收人ID
	 * @param bt
	 *            >=开始时间（YYYYMMDDHH24MISSZZZ)
	 * @param et
	 *            <=结束时间（YYYYMMDDHH24MISSZZZ)
	 * @param both
	 *            是否包含反向消息
	 * @return
	 * @throws SQLException
	 */
	@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);
	public List<WebMsgCnt> load(@JdbcConn Connection con, String sender, String reciver, @Nullable String bt, @Nullable String et,
			@DefaultValue("false") boolean both) throws SQLException {
		if (both) {
			return webMsgDao.queryAll(con, sender, reciver, bt, et);
		} else {
			return webMsgDao.query(con, sender, reciver, bt);
			return webMsgDao.query(con, sender, reciver, bt, et);
		}
	}
	/**
	 * 倒序查询消息内容
	 * 
	 * @param con
	 * @param sender
	 *            发送人
	 * @param reciver
	 *            接收人
	 * @param sendTime
	 *            <最后发送时间
	 * @param rows
	 *            返加数据最大条数
	 * @param both
	 *            是否包含反向消息
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/cnt/deload")
	public List<WebMsgCnt> deLoad(@JdbcConn Connection con, String sender, String reciver, @Nullable String sendTime, @DefaultValue("10") int rows,
			@DefaultValue("false") boolean both) throws SQLException {
		return both ? webMsgDao.queryAll4Desc(con, sender, reciver, sendTime, rows) : webMsgDao.query4Desc(con, sender, reciver, sendTime, rows);
	}
/**
 * 置消息为已读
 * @param con
 * @param sender
 * @param reciver
 * @param time  <=send_time 
 * @throws SQLException
 * @throws JfwBaseException
 */
	@Post
	@Path("/readed")
	public void readed(@JdbcConn(true) Connection con, String sender, String reciver, String time) throws SQLException, JfwBaseException {
@@ -230,6 +332,14 @@ public class Service {
		}
	}
	/**
	 * 删除会话
	 * @param con
	 * @param owner  要删除的会话的参与人ID
	 * @param actor    另一个参与人ID
	 * @throws SQLException
	 * @throws JfwBaseException
	 */
	@Post
	@Path("/disable/show")
	public void disableShow(@JdbcConn(true) Connection con, String owner, String actor) throws SQLException, JfwBaseException {

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

@@ -35,14 +35,14 @@ public class WebMsgCnt {
	public void setSendTime(String sendTime) {
		this.sendTime = sendTime;
	}
	@Column(DE.id_32)
	@Column(DE.text_de)
	public String getSender() {
		return sender;
	}
	public void setSender(String sender) {
		this.sender = sender;
	}
	@Column(DE.id_32)
	@Column(DE.text_de)
	public String getReciver() {
		return reciver;
	}

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;
@@ -12,12 +12,15 @@ import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.LimitSelect;
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.Alias;
import org.jfw.apt.orm.annotation.dao.param.GroupSqlColumn;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.LessThan;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
@@ -26,81 +29,91 @@ import org.jfw.util.PageQueryResult;
@DAO
public interface WebMsgDao {
	@Exclude({"showOfOwner","showOfActor"})
	@Exclude({ "showOfOwner", "showOfActor" })
	@SelectList
	@OrderBy("ORDER BY LAST_TIME DESC")
	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;
	
			"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"})
	WebMsgIdx query(Connection con, String owner, String actor) throws SQLException;
	@Exclude({ "showOfOwner", "showOfActor" })
	@PageSelect
	@OrderBy("ORDER BY LAST_TIME DESC,OWNER ASC")
	PageQueryResult<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,int pageSize,int pageNo) throws SQLException;
	
	
	
	
	@Insert 
	int insert(Connection con,WebMsgCnt cnt)throws SQLException;
	@OrderBy("ORDER BY LAST_TIME DESC,OWNER DESC")
	PageQueryResult<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, int pageSize, int pageNo) throws SQLException;
	@Insert
	int insert(Connection con,WebMsgIdx idx)throws SQLException;
	
	int insert(Connection con, WebMsgCnt cnt) throws SQLException;
	@Insert
	int insert(Connection con, WebMsgIdx idx) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("NUM_OF_ACTOR = NUM_OF_ACTOR + 1,SHOW_OF_ACTOR='1'")
	int incActorNum(Connection con,String owner,String actor,@Set String lastCnt,@Set long lastTime) throws SQLException;
	
	
	
	int incActorNum(Connection con, String owner, String actor, @Set String lastCnt, @Set long lastTime) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("NUM_OF_OWNER = NUM_OF_OWNER + 1,SHOW_OF_OWNER='1'")
	int incOwnerNum(Connection con,String owner,String actor,@Set String lastCnt,@Set long lastTime) throws SQLException;
	
	
	
	
	int incOwnerNum(Connection con, String owner, String actor, @Set String lastCnt, @Set long lastTime) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	int decActorNum(Connection con,String owner,String actor,@Set("= NUM_OF_ACTOR - ?") int numOfActor) throws SQLException;
	
	
	
	int decActorNum(Connection con, String owner, String actor, @Set("= NUM_OF_ACTOR - ?") int numOfActor) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	int decOwnerNum(Connection con,String owner,String actor,@Set("= NUM_OF_OWNER - ?") int numOfOwner) throws SQLException;
	int decOwnerNum(Connection con, String owner, String actor, @Set("= NUM_OF_OWNER - ?") int numOfOwner) throws SQLException;
	@SelectList
	@OrderBy("ORDER BY SEND_TIME ASC")
	List<WebMsgCnt> query(Connection con, String sender, String reciver, @Nullable @GtEq @Alias("sendTime") String bt,
			@Nullable @LtEq @Alias("sendTime") String et) throws SQLException;
	
	
	@SelectList
	@OrderBy("ORDER BY SEND_TIME SEND_TIME ASC")
	List<WebMsgCnt> query(Connection con,String sender,String reciver,@Nullable @GtEq String sendTime)throws SQLException;
	
	@LimitSelect
	@OrderBy("ORDER BY SEND_TIME DESC")
	List<WebMsgCnt> query4Desc(Connection con, String sender, String reciver,@Nullable @LessThan String sendTime,int rows) throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY SEND_TIME SEND_TIME ASC")
	List<WebMsgCnt> queryAll(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, value = { "SENDER=?","RECIVER=?" },isAnd=false) String actor1,@GroupSqlColumn(handlerClass = StringHandler.class, value = { "SENDER=?","RECIVER=?" },isAnd=false) String actor2,@Nullable @GtEq String sendTime)throws SQLException;
	@OrderBy("ORDER BY SEND_TIME ASC")
	List<WebMsgCnt> queryAll(Connection con,
			@GroupSqlColumn(handlerClass = StringHandler.class, value = { "SENDER=?", "RECIVER=?" }, isAnd = false) String actor1,
			@GroupSqlColumn(handlerClass = StringHandler.class, value = { "SENDER=?", "RECIVER=?" }, isAnd = false) String actor2,
			@Nullable @GtEq @Alias("sendTime") String bt, @Nullable @LtEq @Alias("sendTime") String et) throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY SEND_TIME DESC")
	List<WebMsgCnt> queryAll4Desc(Connection con,
			@GroupSqlColumn(handlerClass = StringHandler.class, value = { "SENDER=?", "RECIVER=?" }, isAnd = false) String actor1,
			@GroupSqlColumn(handlerClass = StringHandler.class, value = { "SENDER=?", "RECIVER=?" }, isAnd = false) String actor2,
			@Nullable @LessThan String sendTime,int rows) throws SQLException;
	
	
	@UpdateWith
	@From(WebMsgCnt.class)
	@SetSentence("READED='1'")
	int readed(Connection con,String sender,String reciver,@LtEq String sendTime)throws SQLException;
	
	@Where("READED='0'")
	int readed(Connection con, String sender, String reciver, @LtEq String sendTime) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("SHOW_OF_OWNER='0'")
	@Where("SHOW_OF_OWNER='1'")
	int disableOwnerShow(Connection con,String owner,String actor) throws SQLException;
	
	int disableOwnerShow(Connection con, String owner, String actor) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("SHOW_OF_ACTOR='0'")
	@Where("SHOW_OF_ACTOR='1'")
	int disableActorShow(Connection con,String owner,String actor) throws SQLException;
	
	int disableActorShow(Connection con, String owner, String actor) throws SQLException;
}

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

@@ -24,7 +24,7 @@ public class WebMsgIdx {
	 * 所有者(两个ID相比小的是Owner)
	 * @return
	 */
	@Column(DE.id_32)
	@Column(DE.text_de)
	public String getOwner() {
		return owner;
	}
@@ -35,7 +35,7 @@ public class WebMsgIdx {
	 *参与者
	 * @return
	 */
	@Column(DE.id_32)
	@Column(DE.text_de)
	public String getActor() {
		return actor;
	}

src/main/resources/database.sql

@@ -2069,10 +2069,36 @@ COMMENT ON COLUMN organization.res_mgr IS '是否是资源管理者 0：不是
--- modify begin at version 2.1
CREATE TABLE WEB_MSG_IDX (OWNER CHAR(32) NOT NULL,ACTOR CHAR(32) NOT NULL,LAST_TIME BIGINT NOT NULL,NUM_OF_OWNER INTEGER NOT NULL,NUM_OF_ACTOR INTEGER NOT NULL,LAST_CNT TEXT NOT NULL,SHOW_OF_OWNER CHAR(1) NOT NULL,SHOW_OF_ACTOR CHAR(1) NOT NULL);
CREATE TABLE WEB_MSG_IDX (
	OWNER TEXT NOT NULL,
	ACTOR TEXT NOT NULL,
	LAST_TIME BIGINT NOT NULL,
	NUM_OF_OWNER INTEGER NOT NULL,
	NUM_OF_ACTOR INTEGER NOT NULL,
	LAST_CNT TEXT NOT NULL,
	SHOW_OF_OWNER CHAR(1) NOT NULL,
	SHOW_OF_ACTOR CHAR(1) NOT NULL);
ALTER TABLE WEB_MSG_IDX ADD PRIMARY KEY (OWNER,ACTOR);
CREATE TABLE WEB_MSG_CNT (CNT TEXT NOT NULL,SEND_TIME TEXT NOT NULL,SENDER CHAR(32) NOT NULL,RECIVER CHAR(32) NOT NULL,READED CHAR(1) NOT NULL);
CREATE TABLE WEB_MSG_CNT (CNT TEXT NOT NULL,SEND_TIME TEXT NOT NULL,SENDER TEXT NOT NULL,RECIVER TEXT NOT NULL,READED CHAR(1) NOT NULL);
ALTER TABLE WEB_MSG_CNT ADD PRIMARY KEY (SENDER,RECIVER,SEND_TIME);
COMMENT ON TABLE WEB_MSG_IDX is '消息会话表';
COMMENT ON COLUMN WEB_MSG_IDX.OWNER IS '会话所有人ID(两个人中ID小的为会话所有人)';
COMMENT ON COLUMN WEB_MSG_IDX.ACTOR IS '会话参与人ID(两个人中ID大的为会话参与人)';
COMMENT ON COLUMN WEB_MSG_IDX.LAST_TIME IS '会话最后活动时间';
COMMENT ON COLUMN WEB_MSG_IDX.NUM_OF_OWNER IS '会话所有人未读消息数';
COMMENT ON COLUMN WEB_MSG_IDX.NUM_OF_ACTOR IS '会话参与人未读消息数';
COMMENT ON COLUMN WEB_MSG_IDX.LAST_CNT IS '会话最后内容';
COMMENT ON COLUMN WEB_MSG_IDX.SHOW_OF_OWNER IS '是否存在与所有的人会话列表中';
COMMENT ON COLUMN WEB_MSG_IDX.SHOW_OF_ACTOR IS '是否存在与参与的人会话列表中';
COMMENT ON TABLE WEB_MSG_CNT IS '消息内容表';
COMMENT ON COLUMN WEB_MSG_CNT.SENDER is '消息发送人ID';
COMMENT ON COLUMN WEB_MSG_CNT.RECIVER is '消息接收人ID';
COMMENT ON COLUMN WEB_MSG_CNT.CNT is '消息内容';
COMMENT ON COLUMN WEB_MSG_CNT.SEND_TIME is '消息发送时间';
COMMENT ON COLUMN WEB_MSG_CNT.READED is '消息是否已读';