jiapeng 6 anos atrás
pai
commit
1dccc5663a

+ 21 - 0
src/main/java/com/ekexiu/project/bridge/collect/AlarmDataItem.java

1
package com.ekexiu.project.bridge.collect;
2

3
import org.jfw.apt.orm.annotation.entry.Column;
4
import org.jfw.apt.orm.annotation.entry.Table;
5
import org.jfw.apt.orm.core.enums.DE;
6

7
@Table(descp="报警数据")
8
public class AlarmDataItem {
9
    private String id;
10

11
    @Column(descp="报警编号",value=DE.text_de)
12
	public String getId() {
13
		return id;
14
	}
15

16
	public void setId(String id) {
17
		this.id = id;
18
	}
19
    
20
    
21
}

+ 17 - 0
src/main/java/com/ekexiu/project/bridge/collect/CollectDao.java

6

6

7
import org.jfw.apt.orm.annotation.dao.Batch;
7
import org.jfw.apt.orm.annotation.dao.Batch;
8
import org.jfw.apt.orm.annotation.dao.DAO;
8
import org.jfw.apt.orm.annotation.dao.DAO;
9
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
9
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
10
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
11
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
12
import org.jfw.apt.orm.annotation.dao.param.Alias;
13
import org.jfw.apt.orm.annotation.dao.param.GtEq;
14
import org.jfw.apt.orm.annotation.dao.param.LtEq;
10

15

11
@DAO
16
@DAO
12
public interface CollectDao {
17
public interface CollectDao {
14
	@Insert
19
	@Insert
15
	@Batch
20
	@Batch
16
	int[] insert(Connection con,List<WaveDataItem> items)throws SQLException;
21
	int[] insert(Connection con,List<WaveDataItem> items)throws SQLException;
22
	
23
	@SelectList
24
	@OrderBy("ORDER BY CTIME,DIC,CID")
25
	List<WaveDataItem> query(Connection con,String seq,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
26
	
27
	@SelectList
28
	@OrderBy("ORDER BY CTIME,CID")
29
	List<WaveDataItem> query(Connection con,String seq,int did,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
30
	
31
	@SelectList
32
	@OrderBy("ORDER BY CTIME")
33
	List<WaveDataItem> query(Connection con,String seq,int did,int cid,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
17
}
34
}

+ 28 - 0
src/main/java/com/ekexiu/project/bridge/collect/CollectService.java

1
package com.ekexiu.project.bridge.collect;
1
package com.ekexiu.project.bridge.collect;
2

2

3
import java.sql.Connection;
4
import java.sql.SQLException;
3
import java.util.List;
5
import java.util.List;
4
import java.util.Map;
6
import java.util.Map;
5

7

6
import org.jfw.apt.annotation.Autowrie;
8
import org.jfw.apt.annotation.Autowrie;
7
import org.jfw.apt.web.annotation.Path;
9
import org.jfw.apt.web.annotation.Path;
8
import org.jfw.apt.web.annotation.operate.Get;
10
import org.jfw.apt.web.annotation.operate.Get;
11
import org.jfw.apt.web.annotation.param.JdbcConn;
12

9

13

10
@Path("/collect")
14
@Path("/collect")
11
public class CollectService {
15
public class CollectService {
40
		}
44
		}
41
		return ret;
45
		return ret;
42
	}
46
	}
47
	
48
	@Get
49
	@Path("/wave/node/day")
50
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,String day)throws SQLException{
51
		return this.collectDao.query(con, seq, day+"000000", day+"235959");
52
	}
53
	
54
	@Get
55
	@Path("/wave/node/time")
56
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,String begin,String end)throws SQLException{
57
		return this.collectDao.query(con, seq, begin,end);
58
	}
59
	@Get
60
	@Path("/wave/box/time")
61
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,int box,String begin,String end)throws SQLException{
62
		return this.collectDao.query(con, seq,box, begin,end);
63
	}
64
	@Get
65
	@Path("/wave/channel/time")
66
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,int box,int channel,String begin,String end)throws SQLException{
67
		return this.collectDao.query(con, seq,box,channel,begin,end);
68
	}
69
	
70
	
43
}
71
}

+ 15 - 1
src/main/java/com/ekexiu/project/bridge/collect/WaveDataItem.java

1
package com.ekexiu.project.bridge.collect;
1
package com.ekexiu.project.bridge.collect;
2

2

3
import org.jfw.apt.orm.annotation.entry.Column;
4
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
5
import org.jfw.apt.orm.annotation.entry.Table;
6
import org.jfw.apt.orm.core.enums.DE;
7

8
@PrimaryKey({"ctime","seq","did","cid"})
9
@Table(descp="监控历史数据")
3
public class WaveDataItem {
10
public class WaveDataItem {
4
	private String ctime;
11
	private String ctime;
5
	private String seq;
12
	private String seq;
11
	private String ltime;
18
	private String ltime;
12
	
19
	
13
	
20
	
14
	
21
	@Column(descp="采集服务器内部编号",value=DE.text_de)
15
	public String getSeq() {
22
	public String getSeq() {
16
		return seq;
23
		return seq;
17
	}
24
	}
18
	public void setSeq(String seq) {
25
	public void setSeq(String seq) {
19
		this.seq = seq;
26
		this.seq = seq;
20
	}
27
	}
28
	@Column(descp="上传时间(YYYYMMDDHH24MISS",value=DE.text_de)
21
	public String getCtime() {
29
	public String getCtime() {
22
		return ctime;
30
		return ctime;
23
	}
31
	}
24
	public void setCtime(String ctime) {
32
	public void setCtime(String ctime) {
25
		this.ctime = ctime;
33
		this.ctime = ctime;
26
	}
34
	}
35
	@Column(descp="采集盒内部编号",value=DE.int_de)
27
	public int getDid() {
36
	public int getDid() {
28
		return did;
37
		return did;
29
	}
38
	}
30
	public void setDid(int did) {
39
	public void setDid(int did) {
31
		this.did = did;
40
		this.did = did;
32
	}
41
	}
42
	@Column(descp="传感器内部编号",value=DE.int_de)
33
	public int getCid() {
43
	public int getCid() {
34
		return cid;
44
		return cid;
35
	}
45
	}
36
	public void setCid(int cid) {
46
	public void setCid(int cid) {
37
		this.cid = cid;
47
		this.cid = cid;
38
	}
48
	}
49
	@Column(descp="一秒内最大幅度值",value=DE.int_de)
39
	public int getHvalue() {
50
	public int getHvalue() {
40
		return hvalue;
51
		return hvalue;
41
	}
52
	}
42
	public void setHvalue(int hvalue) {
53
	public void setHvalue(int hvalue) {
43
		this.hvalue = hvalue;
54
		this.hvalue = hvalue;
44
	}
55
	}
56
	@Column(descp="一秒内最小幅度值",value=DE.int_de)
45
	public int getLvalue() {
57
	public int getLvalue() {
46
		return lvalue;
58
		return lvalue;
47
	}
59
	}
48
	public void setLvalue(int lvalue) {
60
	public void setLvalue(int lvalue) {
49
		this.lvalue = lvalue;
61
		this.lvalue = lvalue;
50
	}
62
	}
63
	@Column(descp="一秒内最大幅度值时间(YYYYMMDDHH24MISS.zzz)",value=DE.text_de)
51
	public String getHtime() {
64
	public String getHtime() {
52
		return htime;
65
		return htime;
53
	}
66
	}
54
	public void setHtime(String htime) {
67
	public void setHtime(String htime) {
55
		this.htime = htime;
68
		this.htime = htime;
56
	}
69
	}
70
	@Column(descp="一秒内最小幅度值时间(YYYYMMDDHH24MISS.zzz)",value=DE.text_de)
57
	public String getLtime() {
71
	public String getLtime() {
58
		return ltime;
72
		return ltime;
59
	}
73
	}

+ 10 - 3
src/main/java/com/ekexiu/project/bridge/system/service/DictService.java

26
	@Autowrie
26
	@Autowrie
27
	private DictDao dictDao;
27
	private DictDao dictDao;
28

28

29
	public void load(Connection con) throws SQLException {
29
	@Path("/load")
30
	@Get
31
	public void load(@JdbcConn Connection con) throws SQLException {
32
		HashMap<String, List<DictItem>> map = new HashMap<String, List<DictItem>>();
30
		List<DictItem> items = this.dictDao.query(con);
33
		List<DictItem> items = this.dictDao.query(con);
31
		for (DictItem item : items) {
34
		for (DictItem item : items) {
32
			List<DictItem> list = dictCache.get(item.getDictCode());
35
			List<DictItem> list = map.get(item.getDictCode());
33
			if (list == null) {
36
			if (list == null) {
34
				list = new LinkedList<DictItem>();
37
				list = new LinkedList<DictItem>();
35
				dictCache.put(item.getDictCode(), list);
38
				map.put(item.getDictCode(), list);
36
			}
39
			}
37
			list.add(item);
40
			list.add(item);
38
		}
41
		}
42
		synchronized(dictCache){
43
			dictCache.clear();
44
			dictCache.putAll(map);
45
		}
39
	}
46
	}
40

47

41
	@Path("/items")
48
	@Path("/items")

+ 10 - 1
src/main/webapp/WEB-INF/web.xml

27
	<servlet>
27
	<servlet>
28
		<servlet-name>PictureVC</servlet-name>
28
		<servlet-name>PictureVC</servlet-name>
29
		<servlet-class>com.ekexiu.project.bridge.servlet.VerifyCodeServlet</servlet-class>
29
		<servlet-class>com.ekexiu.project.bridge.servlet.VerifyCodeServlet</servlet-class>
30
		<load-on-startup>5</load-on-startup>
30
		<load-on-startup>2</load-on-startup>
31
	</servlet>
32
	<servlet>
33
		<servlet-name>wave</servlet-name>
34
		<servlet-class>com.ekxiu.project.bridge.servlet.WaveDataServlet</servlet-class>
35
		<load-on-startup>3</load-on-startup>
31
	</servlet>
36
	</servlet>
32
	<servlet-mapping>
37
	<servlet-mapping>
33
		<servlet-name>ajax</servlet-name>
38
		<servlet-name>ajax</servlet-name>
37
		<servlet-name>PictureVC</servlet-name>
42
		<servlet-name>PictureVC</servlet-name>
38
		<url-pattern>/ajax/PictureVC</url-pattern>
43
		<url-pattern>/ajax/PictureVC</url-pattern>
39
	</servlet-mapping>
44
	</servlet-mapping>
45
		<servlet-mapping>
46
		<servlet-name>wave</servlet-name>
47
		<url-pattern>/waveData</url-pattern>
48
	</servlet-mapping>
40
</web-app>
49
</web-app>