111

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

@@ -60,5 +60,9 @@ public interface BridgeDao {
    @SelectList
    @OrderBy("ORDER BY CODE")
    List<Bridge> listQuery(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, value = {"NAME LIKE ?", "SHORT_NAME LIKE ?"}, isAnd = false) String key) throws SQLException;
    List<Bridge> listQueryByKey(Connection con,@Nullable Boolean active, @GroupSqlColumn(handlerClass = StringHandler.class, value = {"NAME LIKE ?", "SHORT_NAME LIKE ?"}, isAnd = false) String key) throws SQLException;
    @SelectList
    @OrderBy("ORDER BY CODE")
    List<Bridge> listQueryByUser(Connection con,@Nullable Boolean active,  @SqlColumn(handlerClass = StringHandler.class, value = "ID IN(SELECT BRIDGE FROM USER_BRIDGE WHERE UID=?)") String uid) throws SQLException;
}

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

@@ -13,6 +13,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.core.defaultImpl.StringHandler;
@@ -49,7 +50,10 @@ public interface BridgeServerDao {
    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;
    @SelectList
    List<BridgeServer> queryByBridge(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM BRIDGE_SERVER WHERE BRIDGE_ID = ?)") String id) throws SQLException;
    List<BridgeServer> queryByBridge(Connection con,@Nullable Boolean active, String bridgeId) throws SQLException;
    @SelectList
    List<BridgeServer> queryByBridges(Connection con, @Nullable Boolean active, @In String[] bridgeId) throws SQLException;
}

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

@@ -13,6 +13,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.core.defaultImpl.StringHandler;
@@ -49,5 +50,8 @@ public interface CollectDeviceDao {
    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;
    @SelectList
    List<CollectDevice> querydByServer(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM COLLECT_DEVICE WHERE SERVER_ID = ?)") String id) throws SQLException;
    List<CollectDevice> queryByServer(Connection con,@Nullable Boolean active, String serverId) throws SQLException;
    @SelectList
    List<CollectDevice> queryByServers(Connection con, @Nullable Boolean active, @In String[] serverId) throws SQLException;
}

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

@@ -49,5 +49,5 @@ public interface TransducerDao {
    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;
    @SelectList
    List<Transducer> queryByDevice(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM TRANSDUCER WHERE DEVICE_ID = ?)") String id) throws SQLException;
    List<Transducer> queryByDevice(Connection con,@Nullable Boolean active, String deviceId) throws SQLException;
}

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

@@ -31,7 +31,7 @@ public class Transducer implements BaseTable {
	public void setId(String id) {
		this.id = id;
	}
	@Column(descp="内部编号",value=DE.text_de)
	@Column(descp="内部编号",value=DE.int_de)
	public int getSeq() {
		return seq;
	}

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

@@ -28,8 +28,10 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -201,8 +203,8 @@ public class BridgeService {
    @Get
    @Path("/bridge/list")
    public List<Bridge> listQuery(@JdbcConn Connection con,@Nullable String key)throws SQLException {
        return this.bridgeDao.listQuery(con, key == null ? null : "%" + key + "%");
    public List<Bridge> listQuery(@JdbcConn Connection con,@Nullable Boolean active,@Nullable String key)throws SQLException {
        return this.bridgeDao.listQueryByKey(con,active, key == null ? null : "%" + key + "%");
    }
    @Post
@@ -238,8 +240,8 @@ public class BridgeService {
    @Get
    @Path("/server/byBridge")
    public List<BridgeServer> queryByBridge(@JdbcConn Connection con,String id)throws SQLException {
        return this.bridgeServerDao.queryByBridge(con, id);
    public List<BridgeServer> queryByBridge(@JdbcConn Connection con,@Nullable Boolean active, String id)throws SQLException {
        return this.bridgeServerDao.queryByBridge(con,active, id);
    }
    @Get
@@ -288,8 +290,8 @@ public class BridgeService {
    @Get
    @Path("/device/byServer")
    public List<CollectDevice> queryByServer(@JdbcConn Connection con,String id)throws SQLException {
        return this.collectDeviceDao.querydByServer(con, id);
    public List<CollectDevice> queryByServer(@JdbcConn Connection con,@Nullable Boolean active,String id)throws SQLException {
        return this.collectDeviceDao.queryByServer(con,active, id);
    }
    @Post
@@ -331,8 +333,29 @@ public class BridgeService {
    @Get
    @Path("/transducer/byDevice")
    public List<Transducer> queryByDevcie(@JdbcConn Connection con,String id)throws SQLException {
        return this.transducerDao.queryByDevice(con, id);
    public List<Transducer> queryByDevcie(@JdbcConn Connection con,@Nullable Boolean active, String id)throws SQLException {
        return this.transducerDao.queryByDevice(con,active,id);
    }
    @Get
    @Path("/all/byUser")
    public Map<String,Object> queryAll(@JdbcConn Connection con,@Nullable Boolean active, String id)throws SQLException {
        Map<String, Object> map = new HashMap<>();
        List<Bridge> bridges = this.bridgeDao.listQueryByUser(con, active, id);
        String[] bridgeId = new String[bridges.size()];
        for(int i = 0 ; i < bridges.size() ; ++i) {
            bridgeId[i] = bridges.get(i).getId();
        }
        List<BridgeServer> bridgeServices = this.bridgeServerDao.queryByBridges(con, active, bridgeId);
        String[] serverId = new String[bridgeServices.size()];
        for (int i = 0; i < bridgeServices.size(); ++i) {
            serverId[i] = bridgeServices.get(i).getId();
        }
        List<CollectDevice> collectDevices = this.collectDeviceDao.queryByServers(con, active, serverId);
        map.put("bridge", bridges);
        map.put("server", bridgeServices);
        map.put("device", collectDevices);
        return map;
    }

src/main/java/com/ekexiu/project/bridge/system/service/SysService.java

@@ -106,6 +106,12 @@ public class SysService {
		return id;
	}
	@Get
	@Path("/check")
	public Boolean check(@JdbcConn Connection con,String account)throws SQLException {
		return this.userDao.queryByAccount(con, account) == null;
	}
	@Get
	@Path("/qo")
	public SessionUser query(@JdbcConn Connection con, String id) throws SQLException {
@@ -205,6 +211,9 @@ public class SysService {
		if (System.currentTimeMillis() > timeout) {
			throw new JfwBaseException(-60002,"timout");
		}
		if(!vc.equals(vcode)){
			throw new JfwBaseException(-60004, "Verification code error");
		}
		this.userDao.updatePasswdWithMobile(con, StringUtil.md5(pw), account);
		return true;
	}