11

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

@@ -1,6 +1,8 @@
package com.ekexiu.portal.msg;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -18,7 +20,9 @@ import org.jfw.apt.web.annotation.operate.Post;
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.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import org.jfw.util.jdbc.ResultSetExtractor;
import org.jfw.util.json.JsonService;
import com.ekexiu.portal.util.WebMsgSocketServlet;
@@ -73,24 +77,23 @@ public class Service {
		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{
	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);
		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);
		if (wmi != null) {
			return build(wmi, id, sf);
		}
		return null;
		
	}
	
	
	@Get
	@Path("/idx/pq")
@@ -105,6 +108,29 @@ public class Service {
		return ret;
	}
	@Get
	@Path("/unReadedCount")
	public Integer queryUnReadedCount(@JdbcConn Connection con, final String id) throws SQLException {
		return JdbcUtil.query(con,
				"SELECT NUM_OF_OWNER FROM WEB_MSG_IDX WHERE OWNER ='' AND SHOW_OF_OWNER='1' UNION ALL SELECT NUM_OF_ACTOR FROM WEB_MSG_IDX WHERE ACTOR ='' AND SHOW_OF_ACTOR='1' ",
				new ResultSetExtractor<Integer>() {
					@Override
					public Integer extractData(ResultSet rs) throws SQLException {
						int ret = 0;
						while (rs.next()) {
							ret += rs.getInt(1);
						}
						return ret;
					}
				}, new PreparedStatementConfig() {
					@Override
					public void config(PreparedStatement ps) throws SQLException {
						ps.setString(1, id);
						ps.setString(2, id);
					}
				});
	}
	@Post
	@Path
	public void send(@JdbcConn Connection con, String sender, String reciver, String cnt) throws SQLException {
@@ -117,9 +143,7 @@ public class Service {
			owner = reciver;
			actor = sender;
		}
		String id = StringUtil.buildUUID();
		WebMsgCnt wmc = new WebMsgCnt();
		wmc.setId(id);
		wmc.setCnt(cnt);
		wmc.setReaded(false);
		wmc.setReciver(reciver);

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

@@ -3,29 +3,19 @@ package com.ekexiu.portal.msg;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.enums.DE;
@Uniques(@Unique(clolumns = { "sender","reciver","sendTime" }, name = "WEB_MSG_CNT_S_R_TIME"))
@PrimaryKey("id")
@PrimaryKey( { "sender","reciver","sendTime" })
@Table
public class WebMsgCnt {
	private String id;
	private String cnt;
	private String sendTime;
	private String sender;
	private String reciver;
	private boolean readed;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	
	/**
	 * 消息内容
	 * @return

src/main/resources/database.sql

@@ -2067,8 +2067,12 @@ COMMENT ON COLUMN  DEMAND.MODIFY_TIME IS '最后修改时间，=完成时间 =
ALTER TABLE organization ADD COLUMN res_mgr char(1) NOT NULL DEFAULT '0';
COMMENT ON COLUMN organization.res_mgr IS '是否是资源管理者 0：不是  1:是';
--- 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);
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);
ALTER TABLE WEB_MSG_CNT ADD PRIMARY KEY (SENDER,RECIVER,SEND_TIME);