11

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

@@ -1,5 +1,17 @@
package com.ekexiu.project.bridge.collect;
import com.ekexiu.project.bridge.resource.dao.BridgeServerDao;
import com.ekexiu.project.bridge.resource.po.BridgeServer;
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;
import org.jfw.util.ConstData;
import org.jfw.util.DateUtil;
import org.jfw.util.ListUtil;
import org.jfw.util.io.IoUtil;
import org.jfw.util.jdbc.JdbcUtil;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -13,23 +25,11 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList;
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;
import org.jfw.util.ConstData;
import org.jfw.util.DateUtil;
import org.jfw.util.ListUtil;
import org.jfw.util.io.IoUtil;
import org.jfw.util.jdbc.JdbcUtil;
import com.ekexiu.project.bridge.resource.dao.BridgeServerDao;
import com.ekexiu.project.bridge.resource.po.BridgeServer;
@Path("/collect")
public class CollectService {
@@ -82,12 +82,18 @@ public class CollectService {
	@Get
	@Path("/wave/curr")
	public List<WaveDataItem> wave(String seq) {
	public List<WaveDataItem> wave(String[] seq) {
		List<WaveDataItem> ret = null;
		synchronized (this.waveCache) {
			ret = waveCache.get(seq);
		List<WaveDataItem> retAll = new ArrayList<>();
		for (String aseq : seq) {
			synchronized (this.waveCache) {
				ret = waveCache.get(aseq);
			}
			if(ret!=null) {
				retAll.addAll(ret);
			}
		}
		return ret;
		return retAll;
	}
	@Get