11

src/main/java/com/ekexiu/project/bridge/collect/AlarmDataItem.java

@@ -0,0 +1,21 @@
package com.ekexiu.project.bridge.collect;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table(descp="报警数据")
public class AlarmDataItem {
    private String id;
    @Column(descp="报警编号",value=DE.text_de)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
    
    
}

src/main/java/com/ekexiu/project/bridge/collect/CollectDao.java

@@ -6,7 +6,12 @@ import java.util.List;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
@DAO
public interface CollectDao {
@@ -14,4 +19,16 @@ public interface CollectDao {
	@Insert
	@Batch
	int[] insert(Connection con,List<WaveDataItem> items)throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY CTIME,DIC,CID")
	List<WaveDataItem> query(Connection con,String seq,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY CTIME,CID")
	List<WaveDataItem> query(Connection con,String seq,int did,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY CTIME")
	List<WaveDataItem> query(Connection con,String seq,int did,int cid,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
}

src/main/java/com/ekexiu/project/bridge/collect/CollectService.java

@@ -1,11 +1,15 @@
package com.ekexiu.project.bridge.collect;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.param.JdbcConn;
@Path("/collect")
public class CollectService {
@@ -40,4 +44,28 @@ public class CollectService {
		}
		return ret;
	}
	
	@Get
	@Path("/wave/node/day")
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,String day)throws SQLException{
		return this.collectDao.query(con, seq, day+"000000", day+"235959");
	}
	
	@Get
	@Path("/wave/node/time")
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,String begin,String end)throws SQLException{
		return this.collectDao.query(con, seq, begin,end);
	}
	@Get
	@Path("/wave/box/time")
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,int box,String begin,String end)throws SQLException{
		return this.collectDao.query(con, seq,box, begin,end);
	}
	@Get
	@Path("/wave/channel/time")
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,int box,int channel,String begin,String end)throws SQLException{
		return this.collectDao.query(con, seq,box,channel,begin,end);
	}
	
	
}

src/main/java/com/ekexiu/project/bridge/collect/WaveDataItem.java

@@ -1,5 +1,12 @@
package com.ekexiu.project.bridge.collect;
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.core.enums.DE;
@PrimaryKey({"ctime","seq","did","cid"})
@Table(descp="监控历史数据")
public class WaveDataItem {
	private String ctime;
	private String seq;
@@ -11,49 +18,56 @@ public class WaveDataItem {
	private String ltime;
	
	
	
	@Column(descp="采集服务器内部编号",value=DE.text_de)
	public String getSeq() {
		return seq;
	}
	public void setSeq(String seq) {
		this.seq = seq;
	}
	@Column(descp="上传时间（YYYYMMDDHH24MISS",value=DE.text_de)
	public String getCtime() {
		return ctime;
	}
	public void setCtime(String ctime) {
		this.ctime = ctime;
	}
	@Column(descp="采集盒内部编号",value=DE.int_de)
	public int getDid() {
		return did;
	}
	public void setDid(int did) {
		this.did = did;
	}
	@Column(descp="传感器内部编号",value=DE.int_de)
	public int getCid() {
		return cid;
	}
	public void setCid(int cid) {
		this.cid = cid;
	}
	@Column(descp="一秒内最大幅度值",value=DE.int_de)
	public int getHvalue() {
		return hvalue;
	}
	public void setHvalue(int hvalue) {
		this.hvalue = hvalue;
	}
	@Column(descp="一秒内最小幅度值",value=DE.int_de)
	public int getLvalue() {
		return lvalue;
	}
	public void setLvalue(int lvalue) {
		this.lvalue = lvalue;
	}
	@Column(descp="一秒内最大幅度值时间（YYYYMMDDHH24MISS.zzz）",value=DE.text_de)
	public String getHtime() {
		return htime;
	}
	public void setHtime(String htime) {
		this.htime = htime;
	}
	@Column(descp="一秒内最小幅度值时间（YYYYMMDDHH24MISS.zzz）",value=DE.text_de)
	public String getLtime() {
		return ltime;
	}

src/main/java/com/ekexiu/project/bridge/system/service/DictService.java

@@ -26,16 +26,23 @@ public class DictService {
	@Autowrie
	private DictDao dictDao;
	public void load(Connection con) throws SQLException {
	@Path("/load")
	@Get
	public void load(@JdbcConn Connection con) throws SQLException {
		HashMap<String, List<DictItem>> map = new HashMap<String, List<DictItem>>();
		List<DictItem> items = this.dictDao.query(con);
		for (DictItem item : items) {
			List<DictItem> list = dictCache.get(item.getDictCode());
			List<DictItem> list = map.get(item.getDictCode());
			if (list == null) {
				list = new LinkedList<DictItem>();
				dictCache.put(item.getDictCode(), list);
				map.put(item.getDictCode(), list);
			}
			list.add(item);
		}
		synchronized(dictCache){
			dictCache.clear();
			dictCache.putAll(map);
		}
	}
	@Path("/items")

src/main/webapp/WEB-INF/web.xml

@@ -27,7 +27,12 @@
	<servlet>
		<servlet-name>PictureVC</servlet-name>
		<servlet-class>com.ekexiu.project.bridge.servlet.VerifyCodeServlet</servlet-class>
		<load-on-startup>5</load-on-startup>
		<load-on-startup>2</load-on-startup>
	</servlet>
	<servlet>
		<servlet-name>wave</servlet-name>
		<servlet-class>com.ekxiu.project.bridge.servlet.WaveDataServlet</servlet-class>
		<load-on-startup>3</load-on-startup>
	</servlet>
	<servlet-mapping>
		<servlet-name>ajax</servlet-name>
@@ -37,4 +42,8 @@
		<servlet-name>PictureVC</servlet-name>
		<url-pattern>/ajax/PictureVC</url-pattern>
	</servlet-mapping>
		<servlet-mapping>
		<servlet-name>wave</servlet-name>
		<url-pattern>/waveData</url-pattern>
	</servlet-mapping>
</web-app>