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

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

@@ -0,0 +1,41 @@
package com.ekexiu.project.bridge.alarm;
import java.sql.Connection;
import java.sql.SQLException;
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.From;
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.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.util.PageQueryResult;
@DAO
public interface AlarmDao {
	@Insert
	int insert(Connection con,AlarmMsg msg)throws SQLException;
	@Insert
	@Batch
	int[] insertAlarmDataItems(Connection con, List<AlarmDataItem> items)throws SQLException;
	
	@PageSelect
	@OrderBy("ORDER BY ALARM_TIME DESC,AID DESC")
	PageQueryResult<AlarmMsg> queryAlarmMsg(Connection con,String uid,int pageSize,int pageNo)throws SQLException;
	
	
	@UpdateWith
	@From(AlarmMsg.class)
	@SetSentence("READED='1',READ_TIME=TO_CHAR(NOW(),'YYYYMMDDHH24MISS')")
	@Where("READED='0'")
	int readed(Connection con,String uid,String aid)throws SQLException;
	
	@SelectList
	List<AlarmDataItem> query(Connection con,String id)throws SQLException;
	
	
}

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

@@ -0,0 +1,61 @@
package com.ekexiu.project.bridge.alarm;
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({"id","seq"})
@Table(descp="报警数据")
public class AlarmDataItem {
    private String id;
    private int seq;
    private String stime;
    private String atime;
    private String data;
    
    @Column(descp="报警编号",value=DE.text_de)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(descp="传感内部编号",value=DE.int_de)
	public int getSeq() {
		return seq;
	}
	public void setSeq(int seq) {
		this.seq = seq;
	}
    @Column(descp="起始时间",value=DE.text_de)
	public String getStime() {
		return stime;
	}
	public void setStime(String stime) {
		this.stime = stime;
	}
    @Column(descp="报警时间",value=DE.text_de)
	public String getAtime() {
		return atime;
	}
	public void setAtime(String atime) {
		this.atime = atime;
	}
    @Column(descp="报警数据，共300个数据点，以英文逗号分隔",value=DE.text_de)
	public String getData() {
		return data;
	}
	public void setData(String data) {
		this.data = data;
	}
    
	
	
    
}

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

@@ -0,0 +1,82 @@
package com.ekexiu.project.bridge.alarm;
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.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey({"uid","aid"})
@Table(descp="报警消息")
public class AlarmMsg {
	private String uid;
	private String aid;
	private String server;
	private int  device;
	private boolean readed;
	private String readTime;
	private String alarmTime;
	private String createTime;
	
	@Column(descp="用户ID",value=DE.refid_32)
	public String getUid() {
		return uid;
	}
	public void setUid(String uid) {
		this.uid = uid;
	}
	@Column(descp="报警ID",value=DE.text_de)
	public String getAid() {
		return aid;
	}
	public void setAid(String aid) {
		this.aid = aid;
	}
	@Column(descp="采集服务器内部编号",value=DE.text_de)
	public String getServer() {
		return server;
	}
	public void setServer(String server) {
		this.server = server;
	}
	@Column(descp="采集盒内部编号",value=DE.int_de)
	public int getDevice() {
		return device;
	}
	public void setDevice(int device) {
		this.device = device;
	}
	@Column(descp="是否已读",value=DE.boolean_de,fixSqlValueWithInsert="'0'")
	public boolean isReaded() {
		return readed;
	}
	public void setReaded(boolean readed) {
		this.readed = readed;
	}
	@Column(descp="读取时间",value=DE.Text_de)
	public String getReadTime() {
		return readTime;
	}
	public void setReadTime(String readTime) {
		this.readTime = readTime;
	}
	@Column(descp="创建时间（YYYYMMDDHH24MISS）不可修改", handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", fixSqlValueWithInsert = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", insertable = true, nullable = false, queryable = true, renewable = false)
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(descp="报警时间",value=DE.text_de)
	public String getAlarmTime() {
		return alarmTime;
	}
	public void setAlarmTime(String alarmTime) {
		this.alarmTime = alarmTime;
	}
	
	
	
	
}

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

@@ -0,0 +1,90 @@
package com.ekexiu.project.bridge.alarm;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.LoginUser;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import org.jfw.util.jdbc.ResultSetExtractor;
import com.ekexiu.project.bridge.system.vo.SessionUser;
@Path("/alarm")
public class AlarmService {
	@Autowrie
	private AlarmDao alarmDao;
	
	public AlarmDao getAlarmDao() {
		return alarmDao;
	}
	public void setAlarmDao(AlarmDao alarmDao) {
		this.alarmDao = alarmDao;
	}
	@Get
	@Path("/msg")
	public PageQueryResult<AlarmMsg> query(@JdbcConn Connection con,final @LoginUser SessionUser user,int pageSize,int pageNo)throws SQLException{
		return this.alarmDao.queryAlarmMsg(con,user.getId(), pageSize, pageNo);
	}
	
	@Get
	@Path("/msg/unread")
	public Object query(@JdbcConn Connection con,@LoginUser final SessionUser user,final String[] server)throws SQLException{
		StringBuilder sb = new StringBuilder();
		sb.append("SELECT server,count(1) FROM ALARM_MSG WHERE SERVER IN (?");
		for(int i = 1 ; i < server.length;++i){
			sb.append(",?");
		}
		sb.append(") AND UID=? AND READED='0' GROUP BY SERVER");
		
		return JdbcUtil.queryList(con, sb.toString(), new ResultSetExtractor<Map<String,Integer>>() {
			@Override
			public Map<String, Integer> extractData(ResultSet rs) throws SQLException {
				Map<String,Integer> map = new HashMap<String,Integer>();
				String s= rs.getString(1);
				int c = rs.getInt(2);
				map.put(s, c);
				return map;
			}
		}, new PreparedStatementConfig() {
			
			@Override
			public void config(PreparedStatement ps) throws SQLException {
				int i =0;
				for(;i < server.length;++i ){
					ps.setString(i+1,server[i]);
				}
				ps.setString(i,user.getId());
			}
		});
		
	}
	@LoginUser
	@Get
	@Path("/detail")
	public List<AlarmDataItem> query(@JdbcConn Connection con,String aid)throws SQLException{
		return this.alarmDao.query(con, aid);
	}
	
	@Post
	@Path("/msg/read")
	public void read(@JdbcConn(true) Connection con,String aid,@LoginUser SessionUser user)throws SQLException{
		this.alarmDao.readed(con,user.getId(), aid);
	}
}

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

@@ -1,21 +0,0 @@
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

@@ -11,6 +11,7 @@ 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.In;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
@DAO
@@ -18,11 +19,11 @@ public interface CollectDao {
	@Insert
	@Batch
	int[] insert(Connection con,List<WaveDataItem> items)throws SQLException;
	int[] insertWaveDataItems(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;
	@OrderBy("ORDER BY SEQ,CTIME,DIC,CID")
	List<WaveDataItem> query(Connection con,@In String[] seq,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY CTIME,CID")
@@ -31,4 +32,8 @@ public interface CollectDao {
	@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

@@ -46,14 +46,14 @@ public class CollectService {
	}
	
	@Get
	@Path("/wave/node/day")
	public List<WaveDataItem> waveByDay(@JdbcConn Connection con,String seq,String day)throws SQLException{
	@Path("/wave/server/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{
	@Path("/wave/server/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
@@ -67,5 +67,6 @@ public class CollectService {
		return this.collectDao.query(con, seq,box,channel,begin,end);
	}
	
	
}

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

@@ -14,8 +14,7 @@ public class WaveDataItem {
	private int cid;
	private int hvalue;
	private int lvalue;
	private String htime;
	private String ltime;
	
	
	@Column(descp="采集服务器内部编号",value=DE.text_de)
@@ -60,19 +59,4 @@ public class WaveDataItem {
	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;
	}
	public void setLtime(String ltime) {
		this.ltime = ltime;
	}
	
}

src/main/java/com/ekexiu/project/bridge/resource/dao/BridgeDao.java

@@ -50,6 +50,7 @@ public interface BridgeDao {
    @Nullable
    Bridge queryByCode(Connection con, String code) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @Nullable @Like String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;

src/main/java/com/ekexiu/project/bridge/resource/dao/BridgeServerDao.java

@@ -44,6 +44,10 @@ public interface BridgeServerDao {
    @SelectOne
    @Nullable
    BridgeServer query(Connection con, String id) throws SQLException;
    
    @SelectOne
    @Nullable
    BridgeServer queryBySeq(Connection con,String seq) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")

src/main/java/com/ekexiu/project/bridge/resource/dao/CollectDeviceDao.java

@@ -44,6 +44,10 @@ public interface CollectDeviceDao {
    @SelectOne
    @Nullable
    CollectDevice query(Connection con, String id) throws SQLException;
    
    @SelectOne
    @Nullable
    CollectDevice query(Connection con, String serverId,int seq) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")

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

@@ -0,0 +1,272 @@
package com.ekexiu.project.bridge.servlet;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.sql.Connection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import org.jfw.util.ConstData;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.io.IoUtil;
import org.jfw.util.jdbc.JdbcUtil;
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.AlarmDataItem;
import com.ekexiu.project.bridge.alarm.AlarmMsg;
import com.ekexiu.project.bridge.mail.MailService;
import com.ekexiu.project.bridge.mobile.MobilePhoneService;
import com.ekexiu.project.bridge.resource.dao.BridgeDao;
import com.ekexiu.project.bridge.resource.dao.BridgeServerDao;
import com.ekexiu.project.bridge.resource.dao.CollectDeviceDao;
import com.ekexiu.project.bridge.resource.po.Bridge;
import com.ekexiu.project.bridge.resource.po.BridgeServer;
import com.ekexiu.project.bridge.resource.po.CollectDevice;
import com.ekexiu.project.bridge.system.dao.UserDao;
import com.ekexiu.project.bridge.system.po.User;
public class AlarmDataServlet extends HttpServlet {
	private static final long serialVersionUID = 4989044137656168797L;
	public static Type DATA_TYPE = new TypeReference<Map<Object, Object>>() {
	}.getType();
	private DataSource dataSource;
	private AlarmDao alarmDao;
	private UserDao userDao;
	private BridgeServerDao bridgeServerDao;
	private BridgeDao bridgeDao;
	private CollectDeviceDao collectDeviceDao;
	private MailService mailService;
	private MobilePhoneService phoneService;
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		response.sendError(400);
	}
	@SuppressWarnings({ "rawtypes", "unchecked" })
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		ByteArrayOutputStream baos = new ByteArrayOutputStream();
		InputStream in = request.getInputStream();
		List<AlarmDataItem> items = new LinkedList<AlarmDataItem>();
		final AlarmMsg msg = new AlarmMsg();
		StringBuilder sb = new StringBuilder();
		final Map<User, String> notices = new HashMap<User, String>();
		List<Object> datas = null;
		AlarmDataItem item = 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) {
						}
					}
				}
			}
			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;
						}
						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);
					}
				}
			}
		} 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);
							}
							this.alarmDao.insertAlarmDataItems(con, items);
						} else {
							items.clear();
						}
					} else {
						items.clear();
					}
				} else {
					items.clear();
				}
			} else {
				items.clear();
			}
			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, "桥梁临控报警");
								}
							} catch (Throwable thr) {
							}
							to = u.getPhone();
							try {
								if (to != null && to.length() > 0) {
									phoneService.sendMessage(to, "【__USERNAME__】您好：" + entry.getValue(), "__USERNAME__", u.getName());
								}
							} catch (Throwable thr) {
							}
						}
					}
				});
			}
		} catch (Exception e) {
			if (null != con)
				JdbcUtil.rollback(con);
			items.clear();
		} finally {
			if (null != con)
				JdbcUtil.close(con);
		}
		response.setDateHeader("Expires", 0);
		response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
		response.addHeader("Cache-Control", "post-check=0, pre-check=0");
		response.setHeader("Pragma", "no-cache");
		if (null == request.getCharacterEncoding()) {
			request.setCharacterEncoding("UTF-8");
			request.setCharacterEncoding("UTF-8");
		}
		response.setContentType("application/json");
		java.io.PrintWriter out = response.getWriter();
		if (items.isEmpty()) {
			out.write("{\"status\":0,}");
			return;
		}
		out.write("{\"status\":1,}");
	}
	@Override
	public void init() throws ServletException {
		this.dataSource = JfwAppContext.getDataSource();
		if (this.dataSource == null) {
			throw new ServletException("not found datasource");
		}
		this.alarmDao = (AlarmDao) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_alarm_AlarmDao");
		if (this.alarmDao == null) {
			throw new ServletException("not found alarmDao");
		}
		this.userDao = (UserDao) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_system_dao_UserDao");
		if (userDao == null) {
			throw new ServletException("not found userDao");
		}
		this.bridgeServerDao = (BridgeServerDao) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_resource_dao_BridgeServerDao");
		if (null == this.bridgeServerDao) {
			throw new ServletException("not found bridgeServerDao");
		}
		this.bridgeDao = (BridgeDao) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_resource_dao_BridgeDao");
		if (null == this.bridgeDao) {
			throw new ServletException("not found bridgeDao");
		}
		this.collectDeviceDao = (CollectDeviceDao) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_resource_dao_CollectDeviceDao");
		if (null == this.collectDeviceDao) {
			throw new ServletException("not found collectDeviceDao");
		}
		this.mailService = (MailService) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_mail_MailService");
		if (null == mailService) {
			throw new ServletException("not found mailService");
		}
		this.phoneService = (MobilePhoneService) JfwAppContext.getBeanFactory().getBean("com_ekexiu_project_bridge_mobile_MobilePhoneService");
		if (null == phoneService) {
			throw new ServletException("not found mobilePhoneService");
		}
	}
}

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

@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import org.jfw.util.ConstData;
import org.jfw.util.DateUtil;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.io.IoUtil;
import org.jfw.util.json.JsonService;
@@ -36,8 +35,7 @@ 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<Map<String, Object>>() {
	}.getType();
	public static Type DATA_TYPE=new TypeReference<List<Object>>(){}.getType();
	private DataSource dataSource;
	private CollectDao collectDao;
@@ -46,95 +44,83 @@ public class WaveDataServlet extends HttpServlet {
		response.sendError(400);
	}
	@SuppressWarnings("unchecked")
	@SuppressWarnings({ "rawtypes" })
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		ByteArrayOutputStream baos = new ByteArrayOutputStream();
		InputStream in = request.getInputStream();
		final List<WaveDataItem> items = new LinkedList<WaveDataItem>();
		long currTime = System.currentTimeMillis();
		String ctime = DateUtil.formatDateTime(currTime);
		// String otime = DateUtil.formatDateTime(currTime -(5* 60*1000));
		String serverId = null;
		try {
			byte[] buf = new byte[8192];
			IoUtil.copy(in, baos, buf);
			Map<String, Object> map = JsonService.fromJson(new String(baos.toByteArray(), ConstData.UTF8), DATA_TYPE);
			Object tmpObj = map.get("node_id");
			if (null != tmpObj && (tmpObj instanceof String)) {
				serverId = (String) tmpObj;
				tmpObj = map.get("data");
				if (null != tmpObj && (tmpObj instanceof List)) {
					List<Object> ds = (List<Object>) tmpObj;
					for (Object wo : ds) {
						WaveDataItem item = new WaveDataItem();
						item.setCtime(ctime);
						item.setSeq(serverId);
						if (wo instanceof Map) {
							Map<Object, Object> im = (Map<Object, Object>) wo;
							tmpObj = im.get("box_id");
							if (tmpObj == null || (!(tmpObj instanceof Double))) {
								items.clear();
								break;
							}
							item.setDid(((Double) tmpObj).intValue());
							tmpObj = im.get("box_id");
							if (tmpObj == null || (!(tmpObj instanceof Double))) {
								items.clear();
								break;
							}
							item.setCid(((Double) tmpObj).intValue());
							tmpObj = im.get("value");
							if (null == tmpObj && (!(tmpObj instanceof List))) {
								items.clear();
								break;
							}
							List<Object> vs = (List<Object>) tmpObj;
							if (vs.size() != 2) {
								items.clear();
								break;
							}
							tmpObj = vs.get(0);
							if (tmpObj == null || (!(tmpObj instanceof List)) || (2 != ((List<?>) tmpObj).size())) {
								items.clear();
								break;
							}
							List<Object> vi = (List<Object>) tmpObj;
							tmpObj = vi.get(0);
							if (tmpObj == null || (!(tmpObj instanceof String))) {
								items.clear();
								break;
							}
							item.setLtime((String) tmpObj);
							tmpObj = vi.get(1);
							if (tmpObj == null || (!(tmpObj instanceof Double))) {
								items.clear();
								break;
							}
							item.setLvalue(((Double) tmpObj).intValue());
							tmpObj = vs.get(1);
							if (tmpObj == null || (!(tmpObj instanceof List)) || (2 != ((List<?>) tmpObj).size())) {
								items.clear();
								break;
							}
							vi = (List<Object>) tmpObj;
							tmpObj = vi.get(0);
							if (tmpObj == null || (!(tmpObj instanceof String))) {
								items.clear();
								break;
							}
							item.setHtime((String) tmpObj);
							tmpObj = vi.get(1);
							if (tmpObj == null || (!(tmpObj instanceof Double))) {
								items.clear();
								break;
							}
							item.setHvalue(((Double) tmpObj).intValue());
							items.add(item);
						} else {
			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;
					}
					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;
					}
				} else {
					items.clear();
					break;
				}
			}
		} finally {
@@ -154,38 +140,31 @@ public class WaveDataServlet extends HttpServlet {
			out.write("{\"status\":0,}");
			return;
		}
		List<WaveDataItem> olist = null;
		out.write("{\"status\":1,}");
		synchronized (DATA_CACHE) {
			olist = DATA_CACHE.get(serverId);
			DATA_CACHE.put(items.get(0).getSeq(), items);
		}
		if (olist == null || olist.get(0).getCtime().compareTo(ctime) < 0) {
			synchronized (DATA_CACHE) {
				DATA_CACHE.put(serverId, items);
			}
			JfwAppContext.getScheduledExecutorService().execute(new Runnable() {
				@Override
				public void run() {
		JfwAppContext.getScheduledExecutorService().execute(new Runnable() {
			@Override
			public void run() {
				try {
					Connection con = dataSource.getConnection();
					try {
						Connection con = dataSource.getConnection();
						try {
							collectDao.insert(con, items);
							con.commit();
						} catch (SQLException e) {
							con.rollback();
						} finally {
							con.close();
						}
					} catch (Throwable thr) {
						collectDao.insertWaveDataItems(con, items);
						con.commit();
					} catch (SQLException e) {
						con.rollback();
					} finally {
						con.close();
					}
				} catch (Throwable thr) {
				}
			});
		}
		out.write("{\"status\":1,}");
		return;
			}
		});
	}
	@Override
	public void init() throws ServletException {
		this.dataSource = JfwAppContext.getDataSource();
@@ -202,66 +181,4 @@ public class WaveDataServlet extends HttpServlet {
		}
		s.setWaveCache(DATA_CACHE);
	}
	public static void main(String args[]) throws Exception {
		Map<Object, Object> map = JsonService.fromJson("{\r\n" + "\"node_id\": \"12345\",\r\n" + "    \"data\": [	\r\n" + "        {		\r\n"
				+ "            \"box_id\": 1, \r\n" + "            \"channel_id\": 1, 	\r\n" + "            \"value\": [	\r\n" + "                [\r\n"
				+ "                    \"20180101101010.000\",	\r\n" + "                    -12	\r\n" + "                ], \r\n" + "                [\r\n"
				+ "                    \"20180101101011.500\", \r\n" + "                    13			\r\n" + "                ]\r\n" + "            ]\r\n"
				+ "        }, \r\n" + "        {\r\n" + "            \"box_id\": 2, \r\n" + "            \"channel_id\": 9, \r\n"
				+ "            \"value\": [\r\n" + "                [\r\n" + "                    \"20180101101010.100\", \r\n" + "                    -2\r\n"
				+ "                ], \r\n" + "                [\r\n" + "                    \"20180101101011.200\", \r\n" + "                    34\r\n"
				+ "                ]\r\n" + "            ]\r\n" + "        }\r\n" + "    ]\r\n" + "}", DATA_TYPE);
		outMap(0, map);
	}
	@SuppressWarnings("unchecked")
	public static void outList(int left, List<Object> list) {
		for (Object obj : list) {
			for (int i = 0; i < left; ++i) {
				System.out.print(" ");
			}
			System.out.print(obj.getClass().getName() + "  ");
			if (obj instanceof List) {
				System.out.println("===>List");
				outList(left + 8, (List<Object>) obj);
			} else if (obj instanceof Map) {
				System.out.println("===>Map");
				outMap(left + 8, (Map<Object, Object>) obj);
			} else {
				System.out.println("===>" + ((obj instanceof Double) ? ((Double) obj).intValue() : obj.toString()));
			}
		}
	}
	@SuppressWarnings("unchecked")
	public static void outMap(int left, Map<Object, Object> map) {
		for (Map.Entry<Object, Object> entry : map.entrySet()) {
			for (int i = 0; i < left; ++i) {
				System.out.print(" ");
			}
			Object obj = entry.getKey();
			System.out.println("KEY:" + obj.getClass().getName() + "    " + obj.toString());
			for (int i = 0; i < left; ++i) {
				System.out.print(" ");
			}
			obj = entry.getValue();
			System.out.print("VALUE:");
			if (obj instanceof List) {
				System.out.println("===>List");
				outList(left + 8, (List<Object>) obj);
			} else if (obj instanceof Map) {
				System.out.println("===>Map");
				outMap(left + 8, (Map<Object, Object>) obj);
			} else {
				System.out.println("===>" + obj.getClass().getName() + "       " + obj.toString());
			}
		}
	}
}

src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java

@@ -15,15 +15,19 @@ import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
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.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2018/8/7.
@@ -31,53 +35,61 @@ import java.sql.SQLException;
@DAO
public interface UserDao {
    @Nullable
    @SelectOne
    User query(Connection con, String id)throws SQLException;
    @Nullable
    @SelectOne
    @Where("active = '1'")
    User login(Connection con, String account,String passwd) throws SQLException;
    @Insert
    int insert(Connection con, User user) throws SQLException;
    @Update
    @Exclude("passwd")
    @Dynamic
    int update(Connection con, User user) throws SQLException;
    @UpdateWith
    @From(User.class)
    int updatePasswdWithMobile(Connection con,@Set String passwd,String account) throws SQLException;
    @UpdateWith
    @From(User.class)
    @SetSentence("active = '0'")
    int ban(Connection con,@Set String modifier, String id) throws SQLException;
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<User> pageQuery(Connection con, @Nullable String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize, int pageNo) throws SQLException;
    @UpdateWith
    @From(User.class)
    int changePw(Connection con, @Set String passwd, String id) throws SQLException;
    @UpdateWith
    @From(Notice.class)
    @IncludeFixSet("modifyTime")
    int updateNotice(Connection con, @Set String cnt,@Set String modifier) throws SQLException;
    @Nullable
    @SelectOne
    User queryByAccount(Connection con,String account)throws SQLException;
    @Insert
    @Batch
    int[] insert(Connection con, UserBridge[] userBridges) throws SQLException;
    @DeleteWith
    @From(UserBridge.class)
    int delete(Connection con, String uid) throws SQLException;
	@Nullable
	@SelectOne
	User query(Connection con, String id) throws SQLException;
	@Nullable
	@SelectOne
	@Where("active = '1'")
	User login(Connection con, String account, String passwd) throws SQLException;
	@Insert
	int insert(Connection con, User user) throws SQLException;
	@Update
	@Exclude("passwd")
	@Dynamic
	int update(Connection con, User user) throws SQLException;
	@UpdateWith
	@From(User.class)
	int updatePasswdWithMobile(Connection con, @Set String passwd, String account) throws SQLException;
	@UpdateWith
	@From(User.class)
	@SetSentence("active = '0'")
	int ban(Connection con, @Set String modifier, String id) throws SQLException;
	@PageSelect
	@Where("active = '1'")
	PageQueryResult<User> pageQuery(Connection con, @Nullable String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize,
			int pageNo) throws SQLException;
	@UpdateWith
	@From(User.class)
	int changePw(Connection con, @Set String passwd, String id) throws SQLException;
	@UpdateWith
	@From(Notice.class)
	@IncludeFixSet("modifyTime")
	int updateNotice(Connection con, @Set String cnt, @Set String modifier) throws SQLException;
	@Nullable
	@SelectOne
	User queryByAccount(Connection con, String account) throws SQLException;
	@Insert
	@Batch
	int[] insert(Connection con, UserBridge[] userBridges) throws SQLException;
	@DeleteWith
	@From(UserBridge.class)
	int delete(Connection con, String uid) throws SQLException;
	@SelectList
	@From(User.class)
	List<User> queryByBridgeId(Connection con,
			@SqlColumn(value = "ID IN (SELECT UID FROM USER_BRIDGE WHERE BRIDGE=?", handlerClass = StringHandler.class) String bridge, @Nullable Boolean active)
			throws SQLException;
}

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

@@ -34,6 +34,11 @@
		<servlet-class>com.ekexiu.project.bridge.servlet.WaveDataServlet</servlet-class>
		<load-on-startup>3</load-on-startup>
	</servlet>
	<servlet>
		<servlet-name>alarm</servlet-name>
		<servlet-class>com.ekexiu.project.bridge.servlet.AlarmDataServlet</servlet-class>
		<load-on-startup>4</load-on-startup>
	</servlet>
	<servlet-mapping>
		<servlet-name>ajax</servlet-name>
		<url-pattern>/ajax/*</url-pattern>
@@ -42,8 +47,12 @@
		<servlet-name>PictureVC</servlet-name>
		<url-pattern>/ajax/PictureVC</url-pattern>
	</servlet-mapping>
		<servlet-mapping>
	<servlet-mapping>
		<servlet-name>wave</servlet-name>
		<url-pattern>/waveData</url-pattern>
	</servlet-mapping>
		<servlet-mapping>
		<servlet-name>alarm</servlet-name>
		<url-pattern>/alarmData</url-pattern>
	</servlet-mapping>
</web-app>