111

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

@@ -14,6 +14,7 @@ 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.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;
@@ -49,6 +50,10 @@ public interface BridgeServerDao {
    @Nullable
    BridgeServer queryBySeq(Connection con,String seq) throws SQLException;
    @SelectOne
    @Nullable
    BridgeServer queryByCode(Connection con,String code) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE WHERE CODE = ?)"}) String bridgeCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
@@ -58,6 +63,9 @@ public interface BridgeServerDao {
    @SelectList
    List<BridgeServer> queryByBridges(Connection con, @Nullable Boolean active, @In String[] bridgeId) throws SQLException;
    @SelectList
    List<BridgeServer> queryByCode(Connection con, @Nullable Boolean active, @Nullable @Like String code) throws SQLException;
}

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

@@ -14,6 +14,7 @@ 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.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;
@@ -49,6 +50,14 @@ public interface CollectDeviceDao {
    @Nullable
    CollectDevice query(Connection con, String serverId,int seq) throws SQLException;
    @SelectOne
    @Nullable
    CollectDevice queryBySeqAndServer(Connection con,@SqlColumn(handlerClass = StringHandler.class,value = "SERVER_ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)")String serverCode, int seq) throws SQLException;
    @SelectOne
    @Nullable
    CollectDevice queryByCode(Connection con,String code) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)"}) String serverCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
@@ -58,4 +67,7 @@ public interface CollectDeviceDao {
    @SelectList
    List<CollectDevice> queryByServers(Connection con, @Nullable Boolean active, @In String[] serverId) throws SQLException;
    @SelectList
    List<CollectDevice> queryByCode(Connection con, @Nullable Boolean active, @Nullable @Like String code) throws SQLException;
}

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

@@ -44,6 +44,14 @@ public interface TransducerDao {
    @Nullable
    Transducer query(Connection con, String id) throws SQLException;
    @SelectOne
    @Nullable
    Transducer queryBySeqAndDevice(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 CODE = ?))")String deviceCode, int seq) throws SQLException;
    @SelectOne
    @Nullable
    Transducer queryByCode(Connection con,String code) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<Transducer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM COLLECT_DEVICE WHERE CODE = ?)"}) String collectDeviceCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;

src/main/java/com/ekexiu/project/bridge/resource/po/Transducer.java

@@ -4,8 +4,11 @@ import com.ekexiu.project.bridge.base.po.BaseTable;
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.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.enums.DE;
@Uniques({@Unique(clolumns ={"serverId","seq"},name="UC_TRANSDUCER_SERVER"),@Unique(clolumns = "code",name="UC_TRANSDUCER_CODE")})
@PrimaryKey("id")
@Table(descp="传感器")
public class Transducer implements BaseTable {
@@ -16,6 +19,7 @@ public class Transducer implements BaseTable {
	private String cableType;
	private String locType;
	private String remark;
	private String serverId;
	private boolean active;
	
	private String createTime;
@@ -73,6 +77,13 @@ public class Transducer implements BaseTable {
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(descp="服务器ID",value = DE.text_de)
	public String getServerId() {
		return serverId;
	}
	public void setServerId(String serverId) {
		this.serverId = serverId;
	}
	@Column(descp="是否可用",value=DE.boolean_de)	
	public boolean isActive() {
		return active;

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

@@ -251,6 +251,19 @@ public class BridgeService {
        this.bridgeServerDao.logicDelete(con, sessionUser.getId(), id);
    }
    @Get
    @Path("/server/listByCode")
    public List<BridgeServer> serverListByCode(@JdbcConn Connection con,@Nullable Boolean active,@Nullable String code)throws SQLException {
        return this.bridgeServerDao.queryByCode(con, active, code == null ? null : "%" + code + "%");
    }
    @Get
    @Path("/server/qoBySeq")
    public BridgeServer serverBySeq(@JdbcConn Connection con,String seq)throws SQLException {
        return this.bridgeServerDao.queryBySeq(con, seq);
    }
    @Post
    @Path("/device")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
@@ -294,6 +307,24 @@ public class BridgeService {
        return this.collectDeviceDao.queryByServer(con,active, id);
    }
    @Get
    @Path("/device/listByCode")
    public List<CollectDevice> deviceListByCode(@JdbcConn Connection con,@Nullable Boolean active,@Nullable String code)throws SQLException {
        return this.collectDeviceDao.queryByCode(con, active, code == null ? null : "%" + code + "%");
    }
    @Get
    @Path("/device/qoByCode")
    public CollectDevice deviceByCode(@JdbcConn Connection con,String code)throws SQLException {
        return this.collectDeviceDao.queryByCode(con, code);
    }
    @Get
    @Path("/device/serverDevice")
    public CollectDevice serverDevice(@JdbcConn Connection con,String serverCode,int seq) throws SQLException {
        return this.collectDeviceDao.queryBySeqAndServer(con, serverCode, seq);
    }
    @Post
    @Path("/transducer")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
@@ -302,6 +333,8 @@ public class BridgeService {
        transducer.setActive(true);
        transducer.setCreator(sessionUser.getId());
        transducer.setModifier(sessionUser.getId());
        CollectDevice device = this.collectDeviceDao.query(con, transducer.getDeviceId());
        transducer.setServerId(device.getServerId());
        this.transducerDao.insert(con, transducer);
        return id;
    }
@@ -337,6 +370,18 @@ public class BridgeService {
        return this.transducerDao.queryByDevice(con,active,id);
    }
    @Get
    @Path("/transducer/qoByCode")
    public Transducer qoByCode(@JdbcConn Connection con,String code)throws SQLException{
        return this.transducerDao.queryByCode(con, code);
    }
    @Get
    @Path("/transducer/deviceTransducer")
    public Transducer deviceTransducer(@JdbcConn Connection con,String deviceCode,int seq)throws SQLException {
        return this.transducerDao.queryBySeqAndDevice(con, deviceCode, seq);
    }
    @Get
    @Path("/all/byUser")
    public Map<String,Object> queryAll(@JdbcConn Connection con,@Nullable Boolean active, String id)throws SQLException {