11

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

@@ -1,15 +1,15 @@
package com.ekexiu.project.bridge.collect;
import java.sql.Connection;
import java.sql.SQLException;
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 java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
@Path("/collect")
public class CollectService {

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

@@ -72,7 +72,7 @@ public interface BridgeDao {
    @SelectOne
    @Nullable
    Bridge queryByCode(Connection con, String code, @Nullable @UnEquals String id) throws SQLException;
    Bridge queryByCode(Connection con, String code, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @SelectOne
    @Nullable

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

@@ -55,11 +55,11 @@ public interface BridgeServerDao {
    @SelectOne
    @Nullable
    BridgeServer queryByCode(Connection con, String code, @Nullable @UnEquals String id) throws SQLException;
    BridgeServer queryByCode(Connection con, String code, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @SelectOne
    @Nullable
    BridgeServer checkBySeq(Connection con, String seq, @Nullable @UnEquals String id) throws SQLException;
    BridgeServer checkBySeq(Connection con, String seq, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")

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

@@ -55,11 +55,11 @@ public interface CollectDeviceDao {
    @SelectOne
    @Nullable
    CollectDevice queryBySeqAndServer(Connection con, @SqlColumn(handlerClass = StringHandler.class,value = "SERVER_ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)")String serverId, int seq, @Nullable @UnEquals String id) throws SQLException;
    CollectDevice queryBySeqAndServer(Connection con, @SqlColumn(handlerClass = StringHandler.class,value = "SERVER_ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)")String serverId, int seq, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @SelectOne
    @Nullable
    CollectDevice queryByCode(Connection con,String code,@Nullable @UnEquals String id) throws SQLException;
    CollectDevice queryByCode(Connection con,String code,@Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")

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

@@ -50,11 +50,11 @@ public interface TransducerDao {
    @SelectOne
    @Nullable
    Transducer queryBySeqAndDeviceFromServer(Connection con,@SqlColumn(handlerClass = StringHandler.class,value = "DEVICE_ID IN (SELECT ID FROM COLLECT_DEVICE WHERE SERVER_ID IN (SELECT SERVER_ID FROM COLLECT_DEVICE WHERE ID = ?))")String deviceId, int seq,@Nullable @UnEquals String id) throws SQLException;
    Transducer queryBySeqAndDeviceFromServer(Connection con,@SqlColumn(handlerClass = StringHandler.class,value = "DEVICE_ID IN (SELECT ID FROM COLLECT_DEVICE WHERE SERVER_ID IN (SELECT SERVER_ID FROM COLLECT_DEVICE WHERE ID = ?))")String deviceId, int seq,@Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @SelectOne
    @Nullable
    Transducer queryByCode(Connection con,String code,@Nullable @UnEquals String id) throws SQLException;
    Transducer queryByCode(Connection con,String code,@Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")

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

@@ -182,8 +182,8 @@ public class BridgeService {
    @Get
    @Path("/bridge/checkCode")
    public Bridge queryByCode(@JdbcConn Connection con,String code,@Nullable String id)throws SQLException {
        return this.bridgeDao.queryByCode(con, code, id);
    public Bridge queryByCode(@JdbcConn Connection con,String code,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.bridgeDao.queryByCode(con, code, id,active);
    }
    @Get
    @Path("/bridge/delete")
@@ -281,14 +281,14 @@ public class BridgeService {
    @Get
    @Path("/server/checkSeq")
    public BridgeServer serverBySeq(@JdbcConn Connection con,String seq,@Nullable String id)throws SQLException {
        return this.bridgeServerDao.checkBySeq(con, seq,id);
    public BridgeServer serverBySeq(@JdbcConn Connection con,String seq,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.bridgeServerDao.checkBySeq(con, seq,id,active);
    }
    @Get
    @Path("/server/checkCode")
    public BridgeServer serverByCode(@JdbcConn Connection con,String code,@Nullable String id)throws SQLException {
        return this.bridgeServerDao.queryByCode(con, code, id);
    public BridgeServer serverByCode(@JdbcConn Connection con,String code,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.bridgeServerDao.queryByCode(con, code, id,active);
    }
    @Post
@@ -342,14 +342,14 @@ public class BridgeService {
    @Get
    @Path("/device/checkCode")
    public CollectDevice deviceByCode(@JdbcConn Connection con,String code,@Nullable String id)throws SQLException {
        return this.collectDeviceDao.queryByCode(con, code,id);
    public CollectDevice deviceByCode(@JdbcConn Connection con,String code,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.collectDeviceDao.queryByCode(con, code,id,active);
    }
    @Get
    @Path("/device/checkSeq")
    public CollectDevice serverDevice(@JdbcConn Connection con,String serverId,int seq,@Nullable String id) throws SQLException {
        return this.collectDeviceDao.queryBySeqAndServer(con, serverId, seq,id);
    public CollectDevice serverDevice(@JdbcConn Connection con,String serverId,int seq,@Nullable String id,@Nullable Boolean active) throws SQLException {
        return this.collectDeviceDao.queryBySeqAndServer(con, serverId, seq,id,active);
    }
    @Post
@@ -401,14 +401,14 @@ public class BridgeService {
    @Get
    @Path("/transducer/checkCode")
    public Transducer qoByCode(@JdbcConn Connection con,String code,@Nullable String id)throws SQLException{
        return this.transducerDao.queryByCode(con, code,id);
    public Transducer qoByCode(@JdbcConn Connection con,String code,@Nullable String id,@Nullable Boolean active)throws SQLException{
        return this.transducerDao.queryByCode(con, code,id,active);
    }
    @Get
    @Path("/transducer/checkSeq")
    public Transducer deviceTransducer(@JdbcConn Connection con,String deviceId,int seq,@Nullable String id)throws SQLException {
        return this.transducerDao.queryBySeqAndDeviceFromServer(con, deviceId, seq,id);
    public Transducer deviceTransducer(@JdbcConn Connection con,String deviceId,int seq,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.transducerDao.queryBySeqAndDeviceFromServer(con, deviceId, seq,id,active);
    }
    @Get