Merge branch 'master' of http://121.42.53.174:3000/jiapeng/bridge

src/main/java/com/ekexiu/project/bridge/alarm/AlarmDao.java

@@ -17,6 +17,9 @@ import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.util.PageQueryResult;
@DAO
public interface AlarmDao {
	@Insert
	int insert(Connection con,AlarmDataError cnt)throws SQLException;
	
	@Insert
	int insert(Connection con,AlarmMsg msg)throws SQLException;
	@Insert

src/main/java/com/ekexiu/project/bridge/alarm/AlarmDataError.java

@@ -0,0 +1,36 @@
package com.ekexiu.project.bridge.alarm;
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 AlarmDataError {
	private String cnt;
	private long  rtime;
	private String reason;
	
	@Column(descp="接口数据",value=DE.text_de)
	public String getCnt() {
		return cnt;
	}
	public void setCnt(String cnt) {
		this.cnt = cnt;
	}
	@Column(descp="接口数据接收时间",value=DE.long_de)
	public long getRtime() {
		return rtime;
	}
	public void setRtime(long rtime) {
		this.rtime = rtime;
	}
	@Column(descp="接口数据错误原因",value=DE.text_de)
	public String getReason() {
		return reason;
	}
	public void setReason(String reason) {
		this.reason = reason;
	}
	
	
}

src/main/java/com/ekexiu/project/bridge/alarm/AlarmService.java

@@ -51,14 +51,15 @@ public class AlarmService {
		}
		sb.append(") AND UID=? AND READED='0' GROUP BY SERVER");
		
		return JdbcUtil.queryList(con, sb.toString(), new ResultSetExtractor<Map<String,Integer>>() {
		return JdbcUtil.queryList(con, sb.toString(), new ResultSetExtractor<Map<String,Object>>() {
			@Override
			public Map<String, Integer> extractData(ResultSet rs) throws SQLException {
				Map<String,Integer> map = new HashMap<String,Integer>();
			public Map<String, Object> extractData(ResultSet rs) throws SQLException {
				Map<String,Object> map = new HashMap<String,Object>();
				String s= rs.getString(1);
				int c = rs.getInt(2);
				map.put(s, c);
				map.put("server",s);
				map.put("num",c);
				return map;
			}
		}, new PreparedStatementConfig() {

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

@@ -17,6 +17,9 @@ import org.jfw.apt.orm.annotation.dao.param.LtEq;
@DAO
public interface CollectDao {
	@Insert
	int insertWaveDataError(Connection con,WaveDataError cnt)throws SQLException;
	
	@Insert
	@Batch
	int[] insertWaveDataItems(Connection con,List<WaveDataItem> items)throws SQLException;

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

@@ -0,0 +1,37 @@
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 WaveDataError {
	private String cnt;
	private long  rtime;
	private String reason;
	
	@Column(descp="接口数据",value=DE.text_de)
	public String getCnt() {
		return cnt;
	}
	public void setCnt(String cnt) {
		this.cnt = cnt;
	}
	@Column(descp="接口数据接收时间",value=DE.long_de)
	public long getRtime() {
		return rtime;
	}
	public void setRtime(long rtime) {
		this.rtime = rtime;
	}
	@Column(descp="接口数据错误原因",value=DE.text_de)
	public String getReason() {
		return reason;
	}
	public void setReason(String reason) {
		this.reason = reason;
	}
	
	
}

src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneService.java

@@ -24,8 +24,8 @@ import java.util.Map;
public class MobilePhoneService {
	private static final Map<String, String> errorReason = new HashMap<String, String>();
	private String accountSid = "a9e818c5ffb547c6a1db15ce45381ab0";
	private String authToken = "d34f7d9bccd74d67abe8a62263a73fda";
	private String accountSid = "6f5c2612d691480a9bbbee0c64e10872";
	private String authToken = "4fac48f2d37d4ba89cc037e7d012348e";
	private String restUrl = "https://api.miaodiyun.com/20150822/industrySMS/sendSMS";
	private String marketUrl = "https://api.miaodiyun.com/20150822/affMarkSMS/sendSMS";
	private int sendTimeout = 10 * 1000;

src/main/java/com/ekexiu/project/bridge/servlet/AlarmDataServlet.java

@@ -5,6 +5,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import org.jfw.apt.util.Base64;
import org.jfw.util.ConstData;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.io.IoUtil;
@@ -24,6 +26,7 @@ import org.jfw.util.json.JsonService;
import org.jfw.util.reflect.TypeReference;
import com.ekexiu.project.bridge.alarm.AlarmDao;
import com.ekexiu.project.bridge.alarm.AlarmDataError;
import com.ekexiu.project.bridge.alarm.AlarmDataItem;
import com.ekexiu.project.bridge.alarm.AlarmMsg;
import com.ekexiu.project.bridge.mail.MailService;
@@ -64,157 +67,190 @@ public class AlarmDataServlet extends HttpServlet {
		final AlarmMsg msg = new AlarmMsg();
		StringBuilder sb = new StringBuilder();
		final Map<User, String> notices = new HashMap<User, String>();
		List<Object> datas = null;
		Map<Object, Object> map = null;
		AlarmDataItem item = null;
		final Map<String, String> errorData = new HashMap<String, String>();
		String pcnt = null;
		List<Object> datas = null;
		try {
			byte[] buf = new byte[8192];
			IoUtil.copy(in, baos, buf);
			Map<Object, Object> map = JsonService.fromJson(new String(baos.toByteArray(), ConstData.UTF8), DATA_TYPE);
			Object tmpObj = map.get("node_id");
			if (tmpObj != null && tmpObj instanceof String) {
				msg.setServer((String) tmpObj);
				tmpObj = map.get("alarm_no");
				if (tmpObj != null && tmpObj instanceof String) {
					msg.setAid((String) tmpObj);
					tmpObj = map.get("box_id");
					if (tmpObj != null && tmpObj instanceof String) {
						try {
							msg.setDevice(Integer.parseInt((String) tmpObj));
							tmpObj = map.get("data");
							if (tmpObj != null && tmpObj instanceof List) {
								datas = (List<Object>) tmpObj;
							}
						} catch (Exception e) {
						}
					}
			byte[] ba = baos.toByteArray();
			if (ba.length == 0) {
				errorData.put(" ", "EMPTY");
			} else {
				try {
					pcnt = new String(baos.toByteArray(), ConstData.UTF8);
				} catch (Exception e) {
					errorData.put(new String(Base64.encodeBase64(ba), ConstData.UTF8), "CHARSET");
				}
			}
			if (datas != null) {
				for (Object obj : datas) {
					item = new AlarmDataItem();
					if (obj != null && obj instanceof Map) {
						map = (Map<Object, Object>) obj;
						item.setId(msg.getAid());
						tmpObj = map.get("channel_id");
				if (pcnt != null) {
					try {
						map = JsonService.fromJson(pcnt, DATA_TYPE);
					} catch (Exception e) {
						errorData.put(pcnt, "JSON_PARSE");
					}
					if (map != null) {
						Object tmpObj = map.get("node_id");
						if (tmpObj != null && tmpObj instanceof String) {
							try {
								item.setSeq(Integer.parseInt((String) tmpObj));
							} catch (Exception e) {
								items.clear();
								break;
							msg.setServer((String) tmpObj);
							tmpObj = map.get("alarm_no");
							if (tmpObj != null && tmpObj instanceof String) {
								msg.setAid((String) tmpObj);
								tmpObj = map.get("box_id");
								if (tmpObj != null && tmpObj instanceof String) {
									try {
										msg.setDevice(Integer.parseInt((String) tmpObj));
										tmpObj = map.get("data");
										if (tmpObj != null && tmpObj instanceof List) {
											datas = (List<Object>) tmpObj;
										}
									} catch (Exception e) {
									}
								}
							}
						} else {
							items.clear();
							break;
						}
						tmpObj = map.get("start_time");
						if (tmpObj != null && tmpObj instanceof String) {
							item.setStime((String) tmpObj);
						} else {
							items.clear();
							break;
						}
						tmpObj = map.get("alarm_time");
						if (tmpObj != null && tmpObj instanceof String) {
							item.setStime((String) tmpObj);
							if (msg.getAlarmTime() == null) {
								String at = (String) tmpObj;
								at = at.substring(0, 14);
								msg.setAlarmTime(at);
							}
						if (datas != null) {
							for (Object obj : datas) {
								item = new AlarmDataItem();
								if (obj != null && obj instanceof Map) {
									map = (Map<Object, Object>) obj;
									item.setId(msg.getAid());
									tmpObj = map.get("channel_id");
									if (tmpObj != null && tmpObj instanceof String) {
										try {
											item.setSeq(Integer.parseInt((String) tmpObj));
										} catch (Exception e) {
											items.clear();
											break;
										}
									} else {
										items.clear();
										break;
									}
									tmpObj = map.get("start_time");
									if (tmpObj != null && tmpObj instanceof String) {
										item.setStime((String) tmpObj);
									} else {
										items.clear();
										break;
									}
									tmpObj = map.get("alarm_time");
									if (tmpObj != null && tmpObj instanceof String) {
										item.setStime((String) tmpObj);
										if (msg.getAlarmTime() == null) {
											String at = (String) tmpObj;
											at = at.substring(0, 14);
											msg.setAlarmTime(at);
										}
						} else {
							items.clear();
							break;
						}
									} else {
										items.clear();
										break;
									}
						sb.setLength(0);
						tmpObj = map.get("value");
						if (tmpObj != null && tmpObj instanceof List) {
							for (Object val : ((List) tmpObj)) {
								sb.append(val.toString()).append(",");
									sb.setLength(0);
									tmpObj = map.get("value");
									if (tmpObj != null && tmpObj instanceof List) {
										for (Object val : ((List) tmpObj)) {
											sb.append(val.toString()).append(",");
										}
									}
									if (sb.length() > 0) {
										item.setData(sb.substring(0, sb.length() - 1));
									} else {
										items.clear();
										break;
									}
									items.add(item);
								}
							}
						}
						if (sb.length() > 0) {
							item.setData(sb.substring(0, sb.length() - 1));
						} else {
							items.clear();
							break;
						}
						items.add(item);
					}
				}
			}
		} finally {
			in.close();
		}
		Connection con = null;
		try {
			con = this.dataSource.getConnection();
			BridgeServer server = this.bridgeServerDao.queryBySeq(con, msg.getServer());
			if (server != null) {
				Bridge bridge = this.bridgeDao.query(con, server.getBridgeId());
				if (bridge != null) {
					CollectDevice device = this.collectDeviceDao.query(con, server.getId(), msg.getDevice());
					if (device != null) {
						String atime = items.get(0).getAtime();
						String cnt = "您负责管理维护的桥梁：【" + bridge.getShortName() + "】，于【" + atime.substring(0, 4) + "-" + atime.substring(4, 6) + "-"
								+ atime.substring(6, 8) + " " + atime.substring(8, 10) + ":" + atime.substring(10, 12) + ":" + atime.substring(12, 14)
								+ "】，编号为【" + device.getCode() + "】的采集盒发生一起报警事件，请尽快登录平台查看详细的报警信息。";
						List<User> users = this.userDao.queryByBridgeId(con, bridge.getId(), true);
						if (users != null && users.size() > 0) {
							for (User u : users) {
								msg.setUid(u.getId());
								this.alarmDao.insert(con, msg);
								notices.put(u, cnt);
		if (items.size() > 0) {
			Connection con = null;
			try {
				con = this.dataSource.getConnection();
				BridgeServer server = this.bridgeServerDao.queryBySeq(con, msg.getServer());
				if (server != null) {
					Bridge bridge = this.bridgeDao.query(con, server.getBridgeId());
					if (bridge != null) {
						CollectDevice device = this.collectDeviceDao.query(con, server.getId(), msg.getDevice());
						if (device != null) {
							String atime = items.get(0).getAtime();
							String cnt = "您负责管理维护的桥梁：【" + bridge.getShortName() + "】，于【" + atime.substring(0, 4) + "-" + atime.substring(4, 6) + "-"
									+ atime.substring(6, 8) + " " + atime.substring(8, 10) + ":" + atime.substring(10, 12) + ":" + atime.substring(12, 14)
									+ "】，编号为【" + device.getCode() + "】的采集盒发生一起报警事件，请尽快登录平台查看详细的报警信息。";
							List<User> users = this.userDao.queryByBridgeId(con, bridge.getId(), true);
							if (users != null && users.size() > 0) {
								for (User u : users) {
									msg.setUid(u.getId());
									this.alarmDao.insert(con, msg);
									notices.put(u, cnt);
								}
								this.alarmDao.insertAlarmDataItems(con, items);
							} else {
								errorData.put(pcnt, "NOT FOUND USER");
								items.clear();
							}
							this.alarmDao.insertAlarmDataItems(con, items);
						} else {
							errorData.put(pcnt, "NOT FOUND DEVICE");
							items.clear();
						}
					} else {
						errorData.put(pcnt, "NOT FOUND BRIDGE");
						items.clear();
					}
				} else {
					errorData.put(pcnt, "NOT FOUND SERVER");
					items.clear();
				}
			} else {
				items.clear();
			}
			if (items.size() > 0) {
				con.commit();
				JfwAppContext.getScheduledExecutorService().equals(new Runnable() {
					@Override
					public void run() {
				if (items.size() > 0) {
					con.commit();
					JfwAppContext.getScheduledExecutorService().equals(new Runnable() {
						@Override
						public void run() {
						for (Map.Entry<User, String> entry : notices.entrySet()) {
							User u = entry.getKey();
							String to = u.getEmail();
							try {
								if (to != null && to.length() > 0) {
									mailService.sendSimpleMail(to, "【" + u.getName() + "】您好：<br>" + entry.getValue(), null, "桥梁临控报警");
							for (Map.Entry<User, String> entry : notices.entrySet()) {
								User u = entry.getKey();
								String to = u.getEmail();
								try {
									if (to != null && to.length() > 0) {
										mailService.sendSimpleMail(to, "【" + u.getName() + "】您好：<br>" + entry.getValue(), null, "桥梁临控报警");
									}
								} catch (Throwable thr) {
								}
							} catch (Throwable thr) {
							}
							to = u.getPhone();
							try {
								if (to != null && to.length() > 0) {
									phoneService.sendMessage(to, "【__USERNAME__】您好：" + entry.getValue(), "__USERNAME__", u.getName());
								to = u.getPhone();
								try {
									if (to != null && to.length() > 0) {
										phoneService.sendMessage(to, "【__USERNAME__】您好：" + entry.getValue(), "__USERNAME__", u.getName());
									}
								} catch (Throwable thr) {
								}
							} catch (Throwable thr) {
							}
						}
					}
				});
						}
					});
				}
			} catch (Exception e) {
				if (null != con)
					JdbcUtil.rollback(con);
				items.clear();
			} finally {
				if (null != con)
					JdbcUtil.close(con);
			}
		} catch (Exception e) {
			if (null != con)
				JdbcUtil.rollback(con);
			items.clear();
		} finally {
			if (null != con)
				JdbcUtil.close(con);
		} else {
			if (errorData.isEmpty())
				errorData.put(pcnt, "ALARMDATA_PARSE");
		}
		response.setDateHeader("Expires", 0);
@@ -228,10 +264,29 @@ public class AlarmDataServlet extends HttpServlet {
		response.setContentType("application/json");
		java.io.PrintWriter out = response.getWriter();
		if (items.isEmpty()) {
			out.write("{\"status\":0,}");
			out.write("{\"status\":0}");
			try {
				Connection con = dataSource.getConnection();
				try {
					for (Map.Entry<String, String> entry : errorData.entrySet()) {
						AlarmDataError wde = new AlarmDataError();
						wde.setCnt(entry.getKey());
						wde.setReason(entry.getValue());
						wde.setRtime(System.currentTimeMillis());
						alarmDao.insert(con, wde);
					}
					con.commit();
				} catch (SQLException e) {
					con.rollback();
				} finally {
					con.close();
				}
			} catch (Throwable thr) {
			}
			return;
		}
		out.write("{\"status\":1,}");
		out.write("{\"status\":1}");
	}
	@Override

src/main/java/com/ekexiu/project/bridge/servlet/WaveDataServlet.java

@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import org.jfw.apt.util.Base64;
import org.jfw.util.ConstData;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.io.IoUtil;
@@ -25,6 +26,7 @@ import org.jfw.util.reflect.TypeReference;
import com.ekexiu.project.bridge.collect.CollectDao;
import com.ekexiu.project.bridge.collect.CollectService;
import com.ekexiu.project.bridge.collect.WaveDataError;
import com.ekexiu.project.bridge.collect.WaveDataItem;
public class WaveDataServlet extends HttpServlet {
@@ -35,7 +37,8 @@ public class WaveDataServlet extends HttpServlet {
	@SuppressWarnings("unused")
	private static final LinkedList<List<WaveDataItem>> EMPTY_LIST = new LinkedList<List<WaveDataItem>>();
	public static Type DATA_TYPE=new TypeReference<List<Object>>(){}.getType();
	public static Type DATA_TYPE = new TypeReference<List<Object>>() {
	}.getType();
	private DataSource dataSource;
	private CollectDao collectDao;
@@ -49,78 +52,104 @@ public class WaveDataServlet extends HttpServlet {
		ByteArrayOutputStream baos = new ByteArrayOutputStream();
		InputStream in = request.getInputStream();
		final List<WaveDataItem> items = new LinkedList<WaveDataItem>();
		final Map<String, String> errorData = new HashMap<String, String>();
		String cnt = null;
		List<Object> param = null;
		try {
			byte[] buf = new byte[8192];
			IoUtil.copy(in, baos, buf);
			List<Object> param = JsonService.fromJson(new String(baos.toByteArray(), ConstData.UTF8), DATA_TYPE);
			for (Object obj : param) {
				if (obj instanceof List) {
					WaveDataItem item = new WaveDataItem();
					Object tmpObj = ((List) obj).get(0);
					if (tmpObj instanceof String) {
						item.setSeq((String) tmpObj);
					} else {
						items.clear();
						break;
					}
					tmpObj = ((List) obj).get(3);
					if (tmpObj instanceof String) {
						item.setCtime((String) tmpObj);
					} else {
						items.clear();
						break;
					}
					tmpObj = ((List) obj).get(1);
					if (tmpObj instanceof String) {
						try {
							item.setDid(Integer.parseInt((String) tmpObj));
						} catch (Exception e) {
							items.clear();
							break;
						}
					} else {
						items.clear();
						break;
					}
					tmpObj = ((List) obj).get(2);
					if (tmpObj instanceof String) {
						try {
							item.setCid(Integer.parseInt((String) tmpObj));
						} catch (Exception e) {
							items.clear();
							break;
						}
					} else {
						items.clear();
						break;
			byte[] ba = baos.toByteArray();
			if (ba.length == 0) {
				errorData.put(" ", "EMPTY");
			} else {
				try {
					cnt = new String(baos.toByteArray(), ConstData.UTF8);
				} catch (Exception e) {
					errorData.put(new String(Base64.encodeBase64(ba), ConstData.UTF8), "CHARSET");
				}
				if (cnt != null) {
					try {
						param = JsonService.fromJson(cnt, DATA_TYPE);
					} catch (Exception e) {
						errorData.put(cnt, "JSON_PARSE");
					}
					tmpObj = ((List) obj).get(4);
					if (tmpObj instanceof String) {
						try {
							item.setLvalue(Integer.parseInt((String) tmpObj));
						} catch (Exception e) {
							items.clear();
							break;
					if (param != null) {
						for (Object obj : param) {
							if (obj instanceof List && ((List)obj).size()>5) {
								WaveDataItem item = new WaveDataItem();
								Object tmpObj = ((List) obj).get(0);
								if (tmpObj instanceof String) {
									item.setSeq((String) tmpObj);
								} else {
									items.clear();
									break;
								}
								tmpObj = ((List) obj).get(3);
								if (tmpObj instanceof String) {
									item.setCtime((String) tmpObj);
								} else {
									items.clear();
									break;
								}
								tmpObj = ((List) obj).get(1);
								if (tmpObj instanceof String) {
									try {
										item.setDid(Integer.parseInt((String) tmpObj));
									} catch (Exception e) {
										items.clear();
										break;
									}
								} else {
									items.clear();
									break;
								}
								tmpObj = ((List) obj).get(2);
								if (tmpObj instanceof String) {
									try {
										item.setCid(Integer.parseInt((String) tmpObj));
									} catch (Exception e) {
										items.clear();
										break;
									}
								} else {
									items.clear();
									break;
								}
								tmpObj = ((List) obj).get(4);
								if (tmpObj instanceof String) {
									try {
										item.setLvalue(Integer.parseInt((String) tmpObj));
									} catch (Exception e) {
										items.clear();
										break;
									}
								} else {
									items.clear();
									break;
								}
								tmpObj = ((List) obj).get(5);
								if (tmpObj instanceof String) {
									try {
										item.setHvalue(Integer.parseInt((String) tmpObj));
									} catch (Exception e) {
										items.clear();
										break;
									}
								} else {
									items.clear();
									break;
								}
								items.add(item);
							} else {
								items.clear();
								break;
							}
						}
					} else {
						items.clear();
						break;
					}
					tmpObj = ((List) obj).get(5);
					if (tmpObj instanceof String) {
						try {
							item.setHvalue(Integer.parseInt((String) tmpObj));
						} catch (Exception e) {
							items.clear();
							break;
					
						if(items.isEmpty()){
							errorData.put(cnt,"WAVEDATA_PARSE");
						}
					} else {
						items.clear();
						break;
					}
				} else {
					items.clear();
					break;
				}
			}
		} finally {
@@ -137,10 +166,35 @@ public class WaveDataServlet extends HttpServlet {
		response.setContentType("application/json");
		java.io.PrintWriter out = response.getWriter();
		if (items.isEmpty()) {
			out.write("{\"status\":0,}");
			out.write("{\"status\":0}");
			JfwAppContext.getScheduledExecutorService().execute(new Runnable() {
				@Override
				public void run() {
					try {
						Connection con = dataSource.getConnection();
						try {
							for(Map.Entry<String,String> entry:errorData.entrySet()){
								WaveDataError wde = new WaveDataError();
								wde.setCnt(entry.getKey());
								wde.setReason(entry.getValue());
								wde.setRtime(System.currentTimeMillis());
								collectDao.insertWaveDataError(con, wde);
							}
							con.commit();
						} catch (SQLException e) {
							con.rollback();
						} finally {
							con.close();
						}
					} catch (Throwable thr) {
					}
				}
			});
			
			return;
		}
		out.write("{\"status\":1,}");
		out.write("{\"status\":1}");
		synchronized (DATA_CACHE) {
			DATA_CACHE.put(items.get(0).getSeq(), items);
		}
@@ -164,7 +218,6 @@ public class WaveDataServlet extends HttpServlet {
		});
	}
	@Override
	public void init() throws ServletException {
		this.dataSource = JfwAppContext.getDataSource();

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

@@ -122,7 +122,7 @@ public class DictService {
	@Post
	@Path("/modify")
	public int update(@JdbcConn(true) Connection con, String code, String dict, @Nullable String bcode, String caption, @Nullable String fullCaption,
			@Nullable String shortCut, @Nullable String remark, boolean readonly, @AfterCommit List<Runnable> runs) throws SQLException {
			@Nullable String shortCut, @Nullable String remark, @AfterCommit List<Runnable> runs) throws SQLException {
		int num = this.dictDao.update(con, bcode, caption, fullCaption, shortCut, remark, code, dict);
		if (num > 0) {
			final DictItem item = new DictItem();

src/main/resources/database.sql

@@ -0,0 +1,282 @@
CREATE TABLE SYS_DICT (
        CODE TEXT NOT NULL,
        BCODE TEXT,
        DICT_CODE TEXT NOT NULL,
        CAPTION TEXT NOT NULL,
        FULL_CAPTION TEXT,
        SHORT_CUT TEXT,
        REMARK TEXT,
        READONLY CHAR(1) NOT NULL,
        ACTIVE CHAR(1) NOT NULL);
ALTER TABLE SYS_DICT ADD PRIMARY KEY (DICT_CODE,CODE);
COMMENT ON TABLE SYS_DICT IS '数据字典表';
COMMENT ON COLUMN SYS_DICT.CODE IS '字典项编码';
COMMENT ON COLUMN SYS_DICT.BCODE IS '字典项编码(业务编码)';
COMMENT ON COLUMN SYS_DICT.DICT_CODE IS '字典编码';
COMMENT ON COLUMN SYS_DICT.CAPTION IS '字典项显示';
COMMENT ON COLUMN SYS_DICT.FULL_CAPTION IS '字典项显示(全)';
COMMENT ON COLUMN SYS_DICT.SHORT_CUT IS '助记码';
COMMENT ON COLUMN SYS_DICT.REMARK IS '备注';
COMMENT ON COLUMN SYS_DICT.READONLY IS '是否只读';
COMMENT ON COLUMN SYS_DICT.ACTIVE IS '是否有效';
CREATE TABLE NOTICE (
        CNT TEXT,
        MODIFIER CHAR(32) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL);
COMMENT ON TABLE NOTICE IS '系统公告';
COMMENT ON COLUMN NOTICE.CNT IS '备注';
COMMENT ON COLUMN NOTICE.MODIFIER IS '最后修改人ID';
COMMENT ON COLUMN NOTICE.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
CREATE TABLE LUSER (
        ACTIVE CHAR(1) NOT NULL,
        PASSWD TEXT NOT NULL,
        ID CHAR(32) NOT NULL,
        NAME TEXT NOT NULL,
        ACCOUNT TEXT NOT NULL,
        COMP TEXT NOT NULL,
        JOB TEXT NOT NULL,
        PHONE TEXT,
        EMAIL TEXT,
        REMARK TEXT,
        TYPE INTEGER NOT NULL,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE LUSER ADD PRIMARY KEY (ID);
ALTER TABLE LUSER ADD UNIQUE (ACCOUNT);
COMMENT ON TABLE LUSER IS '用户表';
COMMENT ON COLUMN LUSER.ACTIVE IS '是否可用';
COMMENT ON COLUMN LUSER.PASSWD IS '密码（MD5）';
COMMENT ON COLUMN LUSER.ID IS '用户ID';
COMMENT ON COLUMN LUSER.NAME IS '用户姓名';
COMMENT ON COLUMN LUSER.ACCOUNT IS '用户帐号';
COMMENT ON COLUMN LUSER.COMP IS '用户所属单位';
COMMENT ON COLUMN LUSER.JOB IS '用户职位';
COMMENT ON COLUMN LUSER.PHONE IS '联系电话';
COMMENT ON COLUMN LUSER.EMAIL IS '联系邮件';
COMMENT ON COLUMN LUSER.REMARK IS '备注';
COMMENT ON COLUMN LUSER.TYPE IS '账户类型';
COMMENT ON COLUMN LUSER.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN LUSER.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN LUSER.CREATOR IS '创建人ID';
COMMENT ON COLUMN LUSER.MODIFIER IS '最后修改人ID';
CREATE TABLE BRIDGE (
        ID CHAR(32) NOT NULL,
        ACTIVE CHAR(1) NOT NULL,
        CODE TEXT NOT NULL,
        SHORT_NAME TEXT NOT NULL,
        NAME TEXT NOT NULL,
        ADDR_CODE TEXT NOT NULL,
        SERVICE_DAY TEXT NOT NULL,
        LOCATION TEXT NOT NULL,
        DESCP TEXT,
        REMARK TEXT,
        IMG TEXT NOT NULL,
        ORG TEXT NOT NULL,
        PHONE TEXT NOT NULL,
        EMAIL TEXT NOT NULL,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE BRIDGE ADD PRIMARY KEY (ID);
ALTER TABLE BRIDGE ADD UNIQUE (SHORT_NAME);
ALTER TABLE BRIDGE ADD UNIQUE (NAME);
COMMENT ON TABLE BRIDGE IS '桥梁信息';
COMMENT ON COLUMN BRIDGE.ID IS 'id';
COMMENT ON COLUMN BRIDGE.ACTIVE IS '是否可用';
COMMENT ON COLUMN BRIDGE.CODE IS '桥梁编号';
COMMENT ON COLUMN BRIDGE.SHORT_NAME IS '桥梁简称';
COMMENT ON COLUMN BRIDGE.NAME IS '桥梁名称（全称）';
COMMENT ON COLUMN BRIDGE.ADDR_CODE IS '桥梁政区划编码';
COMMENT ON COLUMN BRIDGE.SERVICE_DAY IS '桥梁开通日期（YYYYMMDD）';
COMMENT ON COLUMN BRIDGE.LOCATION IS '桥梁定位';
COMMENT ON COLUMN BRIDGE.DESCP IS '桥梁详细描述';
COMMENT ON COLUMN BRIDGE.REMARK IS '桥梁备注';
COMMENT ON COLUMN BRIDGE.ORG IS '桥梁维护机构名称';
COMMENT ON COLUMN BRIDGE.PHONE IS '桥梁维护机构电话';
COMMENT ON COLUMN BRIDGE.EMAIL IS '桥梁维护机构电邮';
COMMENT ON COLUMN BRIDGE.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN BRIDGE.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN BRIDGE.CREATOR IS '创建人ID';
COMMENT ON COLUMN BRIDGE.MODIFIER IS '最后修改人ID';
CREATE TABLE USER_BRIDGE (
        UID TEXT NOT NULL,
        BRIDGE TEXT NOT NULL);
COMMENT ON TABLE USER_BRIDGE IS '用户桥梁';
COMMENT ON COLUMN USER_BRIDGE.UID IS '用户ID';
COMMENT ON COLUMN USER_BRIDGE.BRIDGE IS '桥梁ID';
CREATE TABLE BRIDGE_SERVER (
        ID CHAR(32) NOT NULL,
        SEQ TEXT NOT NULL,
        ACTIVE CHAR(1) NOT NULL,
        CODE TEXT NOT NULL,
        BRIDGE_ID TEXT NOT NULL,
        IP TEXT NOT NULL,
        DEVICES INTEGER NOT NULL,
        REMARK TEXT,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE BRIDGE_SERVER ADD PRIMARY KEY (ID);
COMMENT ON TABLE BRIDGE_SERVER IS '采集服务器';
COMMENT ON COLUMN BRIDGE_SERVER.ID IS 'id';
COMMENT ON COLUMN BRIDGE_SERVER.SEQ IS '内部编号';
COMMENT ON COLUMN BRIDGE_SERVER.ACTIVE IS '是否可用';
COMMENT ON COLUMN BRIDGE_SERVER.CODE IS '采集服务器编号';
COMMENT ON COLUMN BRIDGE_SERVER.BRIDGE_ID IS '采集服务器所属桥梁Id';
COMMENT ON COLUMN BRIDGE_SERVER.IP IS '采集服务器IP';
COMMENT ON COLUMN BRIDGE_SERVER.DEVICES IS '采集盒数量';
COMMENT ON COLUMN BRIDGE_SERVER.REMARK IS '备注';
COMMENT ON COLUMN BRIDGE_SERVER.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN BRIDGE_SERVER.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN BRIDGE_SERVER.CREATOR IS '创建人ID';
COMMENT ON COLUMN BRIDGE_SERVER.MODIFIER IS '最后修改人ID';
CREATE TABLE COLLECT_DEVICE (
        ID CHAR(32) NOT NULL,
        SEQ INTEGER NOT NULL,
        CODE TEXT NOT NULL,
        SERVER_ID TEXT NOT NULL,
        CHANNELS INTEGER NOT NULL,
        REMARK TEXT,
        ACTIVE CHAR(1) NOT NULL,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE COLLECT_DEVICE ADD PRIMARY KEY (ID);
COMMENT ON TABLE COLLECT_DEVICE IS '采集盒';
COMMENT ON COLUMN COLLECT_DEVICE.ID IS 'id';
COMMENT ON COLUMN COLLECT_DEVICE.SEQ IS '内部编号';
COMMENT ON COLUMN COLLECT_DEVICE.CODE IS '采集盒编号';
COMMENT ON COLUMN COLLECT_DEVICE.SERVER_ID IS '采集盒所属服务器ID';
COMMENT ON COLUMN COLLECT_DEVICE.CHANNELS IS '采集盒信道数量';
COMMENT ON COLUMN COLLECT_DEVICE.REMARK IS '备注';
COMMENT ON COLUMN COLLECT_DEVICE.ACTIVE IS '是否可用';
COMMENT ON COLUMN COLLECT_DEVICE.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN COLLECT_DEVICE.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN COLLECT_DEVICE.CREATOR IS '创建人ID';
COMMENT ON COLUMN COLLECT_DEVICE.MODIFIER IS '最后修改人ID';
CREATE TABLE TRANSDUCER (
        ID CHAR(32) NOT NULL,
        SEQ INTEGER NOT NULL,
        CODE TEXT NOT NULL,
        DEVICE_ID TEXT NOT NULL,
        CABLE_TYPE TEXT NOT NULL,
        LOC_TYPE TEXT NOT NULL,
        REMARK TEXT,
        ACTIVE CHAR(1) NOT NULL,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE TRANSDUCER ADD PRIMARY KEY (ID);
COMMENT ON TABLE TRANSDUCER IS '传感器';
COMMENT ON COLUMN TRANSDUCER.ID IS 'id';
COMMENT ON COLUMN TRANSDUCER.SEQ IS '内部编号';
COMMENT ON COLUMN TRANSDUCER.CODE IS '采集盒编号';
COMMENT ON COLUMN TRANSDUCER.DEVICE_ID IS '传感器编号';
COMMENT ON COLUMN TRANSDUCER.CABLE_TYPE IS '传感器所在主缆(dict)';
COMMENT ON COLUMN TRANSDUCER.LOC_TYPE IS '传感器所在位置(dict)';
COMMENT ON COLUMN TRANSDUCER.REMARK IS '备注';
COMMENT ON COLUMN TRANSDUCER.ACTIVE IS '是否可用';
COMMENT ON COLUMN TRANSDUCER.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN TRANSDUCER.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN TRANSDUCER.CREATOR IS '创建人ID';
COMMENT ON COLUMN TRANSDUCER.MODIFIER IS '最后修改人ID';
CREATE TABLE ALARM_DATA_ITEM (
        ID TEXT NOT NULL,
        SEQ INTEGER NOT NULL,
        STIME TEXT NOT NULL,
        ATIME TEXT NOT NULL,
        DATA TEXT NOT NULL);
ALTER TABLE ALARM_DATA_ITEM ADD PRIMARY KEY (ID,SEQ);
COMMENT ON TABLE ALARM_DATA_ITEM IS '报警数据';
COMMENT ON COLUMN ALARM_DATA_ITEM.ID IS '报警编号';
COMMENT ON COLUMN ALARM_DATA_ITEM.SEQ IS '传感内部编号';
COMMENT ON COLUMN ALARM_DATA_ITEM.STIME IS '起始时间';
COMMENT ON COLUMN ALARM_DATA_ITEM.ATIME IS '报警时间';
COMMENT ON COLUMN ALARM_DATA_ITEM.DATA IS '报警数据，共300个数据点，以英文逗号分隔';
CREATE TABLE ALARM_MSG (
        UID CHAR(32) NOT NULL,
        AID TEXT NOT NULL,
        SERVER TEXT NOT NULL,
        DEVICE INTEGER NOT NULL,
        READED CHAR(1) NOT NULL,
        READ_TIME TEXT,
        CREATE_TIME CHAR(14) NOT NULL,
        ALARM_TIME TEXT NOT NULL);
ALTER TABLE ALARM_MSG ADD PRIMARY KEY (UID,AID);
COMMENT ON TABLE ALARM_MSG IS '报警消息';
COMMENT ON COLUMN ALARM_MSG.UID IS '用户ID';
COMMENT ON COLUMN ALARM_MSG.AID IS '报警ID';
COMMENT ON COLUMN ALARM_MSG.SERVER IS '采集服务器内部编号';
COMMENT ON COLUMN ALARM_MSG.DEVICE IS '采集盒内部编号';
COMMENT ON COLUMN ALARM_MSG.READED IS '是否已读';
COMMENT ON COLUMN ALARM_MSG.READ_TIME IS '读取时间';
COMMENT ON COLUMN ALARM_MSG.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN ALARM_MSG.ALARM_TIME IS '报警时间';
CREATE TABLE WAVE_DATA_ITEM (
        SEQ TEXT NOT NULL,
        CTIME TEXT NOT NULL,
        DID INTEGER NOT NULL,
        CID INTEGER NOT NULL,
        HVALUE INTEGER NOT NULL,
        LVALUE INTEGER NOT NULL);
ALTER TABLE WAVE_DATA_ITEM ADD PRIMARY KEY (CTIME,SEQ,DID,CID);
COMMENT ON TABLE WAVE_DATA_ITEM IS '监控历史数据';
COMMENT ON COLUMN WAVE_DATA_ITEM.SEQ IS '采集服务器内部编号';
COMMENT ON COLUMN WAVE_DATA_ITEM.CTIME IS '上传时间（YYYYMMDDHH24MISS';
COMMENT ON COLUMN WAVE_DATA_ITEM.DID IS '采集盒内部编号';
COMMENT ON COLUMN WAVE_DATA_ITEM.CID IS '传感器内部编号';
COMMENT ON COLUMN WAVE_DATA_ITEM.HVALUE IS '一秒内最大幅度值';
COMMENT ON COLUMN WAVE_DATA_ITEM.LVALUE IS '一秒内最小幅度值';
INSERT INTO LUSER (active, passwd, id, name,account, comp,job,phone,email,remark,type, create_time,modify_time, creator, modifier) 
VALUES 
('1', 'E10ADC3949BA59ABBE56E057F20F883E', '77005D20EAB44360918AFD2EA5B867AE', 'admin', '18888888888', 'kexiu', 'a', '18888888888', 
'admin@ekexiu.com', NULL, '1', '20180801123001', '20000101010101', '77005D20EAB44360918AFD2EA5B867AE', '77005D20EAB44360918AFD2EA5B867AE');
INSERT INTO sys_dict (code, bcode, dict_code, caption, full_caption, short_cut, remark, readonly, active) VALUES ('01', NULL, 'ZLLX', '上游主缆', NULL, NULL, NULL, '0', '1');
INSERT INTO sys_dict (code, bcode, dict_code, caption, full_caption, short_cut, remark, readonly, active) VALUES ('02', NULL, 'ZLLX', '下游主缆', NULL, NULL, NULL, '0', '1');
INSERT INTO sys_dict (code, bcode, dict_code, caption, full_caption, short_cut, remark, readonly, active) VALUES ('01', NULL, 'ZLWZ', '东跨', NULL, NULL, NULL, '0', '1');
INSERT INTO sys_dict (code, bcode, dict_code, caption, full_caption, short_cut, remark, readonly, active) VALUES ('02', NULL, 'ZLWZ', '西跨', NULL, NULL, NULL, '0', '1');
CREATE TABLE ALARM_DATA_ERROR (
        CNT TEXT NOT NULL,
        RTIME BIGINT NOT NULL,
        REASON TEXT NOT NULL);
COMMENT ON TABLE ALARM_DATA_ERROR IS '报警数据错误表';
COMMENT ON COLUMN ALARM_DATA_ERROR.CNT IS '接口数据';
COMMENT ON COLUMN ALARM_DATA_ERROR.RTIME IS '接口数据接收时间';
COMMENT ON COLUMN ALARM_DATA_ERROR.REASON IS '接口数据错误原因';
CREATE TABLE WAVE_DATA_ERROR (
        CNT TEXT NOT NULL,
        RTIME BIGINT NOT NULL,
        REASON TEXT NOT NULL);
COMMENT ON TABLE WAVE_DATA_ERROR IS '实时数据错误表';
COMMENT ON COLUMN WAVE_DATA_ERROR.CNT IS '接口数据';
COMMENT ON COLUMN WAVE_DATA_ERROR.RTIME IS '接口数据接收时间';
COMMENT ON COLUMN WAVE_DATA_ERROR.REASON IS '接口数据错误原因';
INSERT INTO notice(cnt,modifier,modify_time) VALUES ('欢迎使用本系统！', '111                             ', '20180101010101');

src/main/resources/project.properties

@@ -1,8 +1,8 @@
dataSource=com.alibaba.druid.pool.DruidDataSource
#数据库连接地址、名称、密码
dataSource.url=jdbc:postgresql://localhost:5432/bridge
dataSource.url=jdbc:postgresql://47.100.53.9:5432/bridge
dataSource.username=postgres
dataSource.password=postgres
dataSource.password=postgres_bridge
#连接池启动时的初始值（初始化连接）
dataSource.initialSize::int=1
#最小空闲连接值
@@ -30,4 +30,4 @@ dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
com_ekexiu_portal_ware_WareService.imgPath::java.io.File=D:/tmp/data/bridge
com_ekexiu_project_bridge_resource_service_BridgeService.imgPath::java.io.File=/bridge/web_data/data/bridge