11

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

@@ -14,6 +14,7 @@ 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.In;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
@@ -61,4 +62,7 @@ public interface TransducerDao {
    @SelectList
    List<Transducer> queryByDevice(Connection con,@Nullable Boolean active, String deviceId) throws SQLException;
    @SelectList
    List<Transducer> queryByUser(Connection con, @Nullable Boolean active,@In String[] deviceId) throws SQLException;
}

src/main/java/com/ekexiu/project/bridge/resource/service/BridgeService.java

@@ -408,9 +408,15 @@ public class BridgeService {
            serverId[i] = bridgeServices.get(i).getId();
        }
        List<CollectDevice> collectDevices = this.collectDeviceDao.queryByServers(con, active, serverId);
        String[] deviceId = new String[collectDevices.size()];
        for (int i = 0; i < collectDevices.size(); ++i) {
            deviceId[i] = collectDevices.get(i).getId();
        }
        List<Transducer> transducers = this.transducerDao.queryByUser(con, active, deviceId);
        map.put("bridge", bridges);
        map.put("server", bridgeServices);
        map.put("device", collectDevices);
        map.put("transducer", transducers);
        return map;
    }