Merge branch 'master' of http://121.42.53.174:3000/jiapeng/bridge.git

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

@@ -17,6 +17,7 @@ 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;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -66,4 +67,8 @@ public interface BridgeDao {
    @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;
    @SelectOne
    @Nullable
    Bridge queryByCode(Connection con, String code, @Nullable @UnEquals String id) throws SQLException;
}

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

@@ -19,7 +19,6 @@ public class BridgeServer implements BaseTable {
	private String code;
	private String seq;
	private String bridgeId;
	private String ip;
	private int devices;
	private String remark;
	private boolean active;
@@ -62,13 +61,6 @@ public class BridgeServer implements BaseTable {
	public void setBridgeId(String bridgeId) {
		this.bridgeId = bridgeId;
	}
	@Column(descp="采集服务器IP",value=DE.text_de)
	public String getIp() {
		return ip;
	}
	public void setIp(String ip) {
		this.ip = ip;
	}
	@Column(descp="采集盒数量",value=DE.int_de)
	public int getDevices() {
		return devices;

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

@@ -182,6 +182,11 @@ public class BridgeService {
        return this.bridgeDao.queryByCode(con, code);
    }
    @Get
    @Path("/bridge/checkCode")
    public Bridge queryByCode(@JdbcConn Connection con,String code,@Nullable String id)throws SQLException {
        return this.bridgeDao.queryByCode(con, code, id);
    }
    @Get
    @Path("/bridge/delete")
    public void delete(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {

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

@@ -169,12 +169,6 @@ public class SysService {
		return null;
	}
	@Get
	@Path("/resetPw")
	public void resetPw(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.userDao.changePw(con, DEFAULT_PW_STR, id);
	}
	@Post
	@Path("/changePw")
	public void changePw(@JdbcConn(true) Connection con, String id, String oldPw, String newPw) throws SQLException, JfwBaseException {
@@ -225,7 +219,7 @@ public class SysService {
			throw  new JfwBaseException(-60001,"not found sessionVal");
		}
		if (System.currentTimeMillis() > timeout) {
			throw new JfwBaseException(-60002,"timout");
			throw new JfwBaseException(-60002,"timeout");
		}
		if(!vc.equals(vcode)){
			throw new JfwBaseException(-60004, "Verification code error");