11

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

@@ -15,7 +15,6 @@ 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.GroupSqlColumn;
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.annotation.dao.param.UnEquals;
@@ -56,7 +55,7 @@ public interface BridgeDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @Nullable @Like String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"NAME LIKE ?", "SHORT_NAME LIKE ?"}, isAnd = false) String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")

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

@@ -69,7 +69,7 @@ public interface BridgeServerDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"BRIDGE_ID IN (SELECT ID FROM BRIDGE WHERE CODE = ?)"}) String bridgeCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"BRIDGE_ID IN (SELECT ID FROM BRIDGE WHERE SHORT_NAME LIKE ?)"}) String key, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    @SelectList
    List<BridgeServer> queryByBridge(Connection con,@Nullable Boolean active, String bridgeId) throws SQLException;

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

@@ -2,6 +2,7 @@ package com.ekexiu.project.bridge.resource.dao;
import com.ekexiu.project.bridge.resource.po.CollectDevice;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
@@ -42,10 +43,11 @@ public interface CollectDeviceDao {
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @Batch
    @From(CollectDevice.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDeleteByServers(Connection con, @Set String modifier,@In String[] serverId) throws SQLException;
    int[] logicDeleteByServers(Connection con, @Set String modifier,@Batch String[] serverId) throws SQLException;
    @Update
    @Exclude("active")
@@ -61,7 +63,7 @@ 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,@Nullable Boolean active) throws SQLException;
    CollectDevice queryBySeqAndServer(Connection con,String serverId, int seq, @Nullable @UnEquals String id,@Nullable Boolean active) throws SQLException;
    @SelectOne
    @Nullable

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

@@ -2,6 +2,7 @@ package com.ekexiu.project.bridge.resource.dao;
import com.ekexiu.project.bridge.resource.po.Transducer;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
@@ -41,10 +42,11 @@ public interface TransducerDao {
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @Batch
    @From(Transducer.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDeleteByDevices(Connection con, @Set String modifier,@In String[] deviceId) throws SQLException;
    int[] logicDeleteByDevices(Connection con, @Set String modifier,@Batch String[] deviceId) throws SQLException;
    @Update
    @Exclude("active")

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

@@ -205,7 +205,7 @@ public class BridgeService {
                for (int i = 0; i < collectDevices.size(); ++i) {
                    deviceId[i] = collectDevices.get(i).getId();
                }
                this.transducerDao.logicDeleteByDevices(con, null, deviceId);
                this.transducerDao.logicDeleteByDevices(con, sessionUser.getId(), deviceId);
            }
        }
    }
@@ -267,8 +267,8 @@ public class BridgeService {
    @Get
    @Path("/server/pq")
    public PageQueryResult<BridgeServer> pageQueryServer(@JdbcConn Connection con, @Nullable Boolean active, @Nullable String bcode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
        return this.bridgeServerDao.pageQuery(con, active, bcode, code, pageSize, pageNo);
    public PageQueryResult<BridgeServer> pageQueryServer(@JdbcConn Connection con, @Nullable Boolean active, @Nullable String key, @Nullable String code, int pageSize, int pageNo) throws SQLException {
        return this.bridgeServerDao.pageQuery(con, active, key == null ? null : "%" + key + "%", code, pageSize, pageNo);
    }
    @Post
@@ -298,7 +298,7 @@ public class BridgeService {
            for (int i = 0; i < collectDevices.size(); ++i) {
                deviceId[i] = collectDevices.get(i).getId();
            }
            this.transducerDao.logicDeleteByDevices(con, null, deviceId);
            this.transducerDao.logicDeleteByDevices(con, sessionUser.getId(), deviceId);
        }
    }
@@ -358,7 +358,7 @@ public class BridgeService {
        this.collectDeviceDao.logicDelete(con, sessionUser.getId(), id);
        String[] deviceId = new String[1];
        deviceId[0] = id;
        this.transducerDao.logicDeleteByDevices(con, null, deviceId);
        this.transducerDao.logicDeleteByDevices(con, sessionUser.getId(), deviceId);
    }
    @Get

src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java

@@ -47,7 +47,7 @@ public interface UserDao {
	int insert(Connection con, User user) throws SQLException;
	@Update
	@Exclude({"passwd","type","active"})
	@Exclude({"passwd","active"})
	@Dynamic
	int update(Connection con, User user) throws SQLException;