11

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

@@ -76,9 +76,9 @@ public interface BridgeDao {
    @SelectOne
    @Nullable
    Bridge queryByName(Connection con, String name, @Nullable @UnEquals String id) throws SQLException;
    Bridge queryByName(Connection con, String name, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @SelectOne
    @Nullable
    Bridge queryByShortName(Connection con, String shortName, @Nullable @UnEquals String id) throws SQLException;
    Bridge queryByShortName(Connection con, String shortName, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
}

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

@@ -41,6 +41,12 @@ public interface BridgeServerDao {
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @From(BridgeServer.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDeleteByBridge(Connection con, @Set String modifier,String bridgeId) throws SQLException;
    @Update
    @Exclude("active")
    int update(Connection con, BridgeServer bridgeServer) throws SQLException;

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

@@ -41,6 +41,12 @@ public interface CollectDeviceDao {
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @From(CollectDevice.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDeleteByServers(Connection con, @Set String modifier,@In String[] serverId) throws SQLException;
    @Update
    @Exclude("active")
    int update(Connection con, CollectDevice collectDevice) throws SQLException;

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

@@ -40,6 +40,12 @@ public interface TransducerDao {
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @From(Transducer.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDeleteByDevices(Connection con, @Set String modifier,@In String[] deviceId) throws SQLException;
    @Update
    @Exclude("active")
    int update(Connection con, Transducer transducer) throws SQLException;

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

@@ -189,6 +189,25 @@ public class BridgeService {
    @Path("/bridge/delete")
    public void delete(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
        this.bridgeDao.logicDelete(con, sessionUser.getId(), id);
        this.bridgeServerDao.logicDeleteByBridge(con, sessionUser.getId(), id);
        String[] bridgeId = new String[1];
        bridgeId[0] = id;
        List<BridgeServer> bridgeServers = this.bridgeServerDao.queryByBridges(con, null, bridgeId);
        if (bridgeServers.size() > 0) {
            String[] serverId = new String[bridgeServers.size()];
            for (int i = 0; i < bridgeServers.size(); ++i) {
                serverId[i] = bridgeServers.get(i).getId();
            }
            this.collectDeviceDao.logicDeleteByServers(con, sessionUser.getId(), serverId);
            List<CollectDevice> collectDevices = this.collectDeviceDao.queryByServers(con, null, serverId);
            if (collectDevices.size() > 0) {
                String[] deviceId = new String[collectDevices.size()];
                for (int i = 0; i < collectDevices.size(); ++i) {
                    deviceId[i] = collectDevices.get(i).getId();
                }
                this.transducerDao.logicDeleteByDevices(con, null, deviceId);
            }
        }
    }
    @Post
@@ -218,14 +237,14 @@ public class BridgeService {
    @Get
    @Path("/bridge/checkName")
    public Bridge queryByName(@JdbcConn Connection con, String name,@Nullable String id)throws SQLException {
        return this.bridgeDao.queryByName(con, name, id);
    public Bridge queryByName(@JdbcConn Connection con, String name,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.bridgeDao.queryByName(con, name, id,active);
    }
    @Get
    @Path("/bridge/checkShortName")
    public Bridge queryByShortName(@JdbcConn Connection con,String shortName,@Nullable String id)throws SQLException {
        return this.bridgeDao.queryByShortName(con, shortName, id);
    public Bridge queryByShortName(@JdbcConn Connection con,String shortName,@Nullable String id,@Nullable Boolean active)throws SQLException {
        return this.bridgeDao.queryByShortName(con, shortName, id,active);
    }
    @Post
@@ -270,6 +289,17 @@ public class BridgeService {
    public void deleteServer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser
            , String id) throws SQLException {
        this.bridgeServerDao.logicDelete(con, sessionUser.getId(), id);
        String[] serverId = new String[1];
        serverId[0] = id;
        this.collectDeviceDao.logicDeleteByServers(con, sessionUser.getId(), serverId);
        List<CollectDevice> collectDevices = this.collectDeviceDao.queryByServers(con, null, serverId);
        if (collectDevices.size() > 0) {
            String[] deviceId = new String[collectDevices.size()];
            for (int i = 0; i < collectDevices.size(); ++i) {
                deviceId[i] = collectDevices.get(i).getId();
            }
            this.transducerDao.logicDeleteByDevices(con, null, deviceId);
        }
    }
    @Get
@@ -326,6 +356,9 @@ public class BridgeService {
    @Path("/device/delete")
    public void deleteDevice(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
        this.collectDeviceDao.logicDelete(con, sessionUser.getId(), id);
        String[] deviceId = new String[1];
        deviceId[0] = id;
        this.transducerDao.logicDeleteByDevices(con, null, deviceId);
    }
    @Get

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

@@ -249,6 +249,12 @@ public class SysService {
		}
	}
	@Get
	@Path("/sys/serviceTime")
	public long serviceTime() {
		return System.currentTimeMillis();
	}
	private static SessionUser makeSessionUser(User user) {
		SessionUser sessionUser = new SessionUser();
		sessionUser.setAccount(user.getAccount());