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

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

@@ -9,9 +9,11 @@ import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
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.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;
@@ -20,6 +22,7 @@ import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2018/8/8.
@@ -43,6 +46,10 @@ public interface BridgeDao {
    @Nullable
    Bridge query(Connection con, String id) throws SQLException;
    @SelectOne
    @Nullable
    Bridge queryByCode(Connection con, String code) throws SQLException;
    @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;
@@ -50,4 +57,8 @@ public interface BridgeDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN(SELECT BCODE FROM USER_BRIDGE WHERE UID=?)") String uid, int pageSize, int pageNo) throws SQLException;
    @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;
}

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

@@ -11,7 +11,7 @@ import com.ekexiu.project.bridge.base.po.BaseTable;
@Table(descp="采集盒")
public class CollectDevice implements BaseTable {
	private String id;
	private String seq;
	private int seq;
	private String code;
	private String serverId;
	private int	channels;
@@ -35,11 +35,11 @@ public class CollectDevice implements BaseTable {
	public void setId(String id) {
		this.id = id;
	}
	@Column(descp="内部编号",value=DE.text_de)
	public String getSeq() {
	@Column(descp="内部编号",value=DE.int_de)
	public int getSeq() {
		return seq;
	}
	public void setSeq(String seq) {
	public void setSeq(int seq) {
		this.seq = seq;
	}
	@Column(descp="采集盒编号",value=DE.text_de)

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

@@ -12,7 +12,7 @@ public class Transducer implements BaseTable {
	private String id;
	private String code;
	private String deviceId;
	private String seq;
	private int seq;
	private String cableType;
	private String locType;
	private String remark;
@@ -32,10 +32,10 @@ public class Transducer implements BaseTable {
		this.id = id;
	}
	@Column(descp="内部编号",value=DE.text_de)
	public String getSeq() {
	public int getSeq() {
		return seq;
	}
	public void setSeq(String seq) {
	public void setSeq(int seq) {
		this.seq = seq;
	}
	@Column(descp="采集盒编号",value=DE.text_de)

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

@@ -83,6 +83,13 @@ public class BridgeService {
        this.transducerDao = transducerDao;
    }
    public File getImgPath() {
        return imgPath;
    }
    public void setImgPath(File imgPath) {
        this.imgPath = imgPath;
    }
    /**
     * 上传文件
@@ -167,6 +174,12 @@ public class BridgeService {
        return this.bridgeDao.query(con, id);
    }
    @Get
    @Path("/bridge/byCode")
    public Bridge queryByCode(@JdbcConn Connection con,String code)throws SQLException {
        return this.bridgeDao.queryByCode(con, code);
    }
    @Get
    @Path("/bridge/delete")
    public void delete(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
@@ -186,6 +199,12 @@ public class BridgeService {
        return this.bridgeDao.pageQuery(con, active, name == null ? null : "%" + name + "%", code, pageSize, pageNo);
    }
    @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 + "%");
    }
    @Post
    @Path("/server")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {

src/main/java/com/ekexiu/project/bridge/right/po/UserBridge.java

@@ -8,7 +8,7 @@ import org.jfw.apt.orm.core.enums.DE;
public class UserBridge {
	private String uid;
	private String bcode;
	private String bridge;
	
	@Column(descp="用户ID",value= DE.rtext_de)
	public String getUid() {
@@ -18,13 +18,11 @@ public class UserBridge {
	public void setUid(String uid) {
		this.uid = uid;
	}
	@Column(descp="桥梁编号",value= DE.rtext_de)
	public String getBcode() {
		return bcode;
	@Column(descp="桥梁ID",value= DE.rtext_de)
	public String getBridge() {
		return bridge;
	}
	public void setBcode(String bcode) {
		this.bcode = bcode;
	public void setBridge(String bridge) {
		this.bridge = bridge;
	}
	
	
}

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

@@ -1,8 +1,10 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.right.po.UserBridge;
import com.ekexiu.project.bridge.system.po.Notice;
import com.ekexiu.project.bridge.system.po.User;
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.Dynamic;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
@@ -10,6 +12,7 @@ import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
@@ -69,4 +72,12 @@ public interface UserDao {
    @Nullable
    @SelectOne
    User queryByAccount(Connection con,String account)throws SQLException;
    @Insert
    @Batch
    int[] insert(Connection con, UserBridge[] userBridges) throws SQLException;
    @DeleteWith
    @From(UserBridge.class)
    int delete(Connection con, String uid) throws SQLException;
}

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

@@ -1,12 +1,10 @@
package com.ekexiu.project.bridge.system.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import com.ekexiu.project.bridge.mobile.MobilePhoneService;
import com.ekexiu.project.bridge.right.po.UserBridge;
import com.ekexiu.project.bridge.system.dao.UserDao;
import com.ekexiu.project.bridge.system.po.User;
import com.ekexiu.project.bridge.system.vo.SessionUser;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -21,14 +19,13 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.SessionVal;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.state.StateCode;
import com.ekexiu.project.bridge.mobile.MobilePhoneService;
import com.ekexiu.project.bridge.system.dao.UserDao;
import com.ekexiu.project.bridge.system.po.User;
import com.ekexiu.project.bridge.system.vo.SessionUser;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
/**
 * Created by TT on 2018/8/7.
@@ -66,26 +63,26 @@ public class SysService {
	@SetSession("JFW_SESSION_LOGIN_USER=result")
	@Path("/login")
	@Post
	public SessionUser login(@JdbcConn Connection con, String account, String pw, String vc, @Nullable @SessionVal(value ="PIC_LOGIN",remove= true) String code,
			@Nullable @SessionVal(value ="TIMEOUT_PIC_LOGIN",remove=true) Long timeout) throws SQLException {
		if (code == null || timeout == null) {
			return null;
		}
		if (!vc.equals(code)) {
			return null;
		}
		if (System.currentTimeMillis() > timeout) {
			return null;
		}
		User user = userDao.login(con, account, StringUtil.md5(pw));
		if (user != null) {
			return makeSessionUser(user);
		}
		return null;
    public SessionUser login(@JdbcConn Connection con, String account, String pw, String vc, @Nullable @SessionVal(value = "PIC_LOGIN", remove = true) String code,
                             @Nullable @SessionVal(value = "TIMEOUT_PIC_LOGIN", remove = true) Long timeout) throws SQLException, JfwBaseException {
        if (code == null || timeout == null) {
            throw new JfwBaseException(-60001, "not found sessionVal");
        }
        if (!vc.equals(code)) {
            throw new JfwBaseException(-60003, "vc not right");
        }
        if (System.currentTimeMillis() > timeout) {
            throw new JfwBaseException(-60002, "timeout");
        }
        User user = userDao.login(con, account, StringUtil.md5(pw));
        if (user != null) {
            return makeSessionUser(user);
        }
        return null;
	}
	@Get
	@Path("")
	@Path("/user")
	public SessionUser get(@LoginUser SessionUser user) {
		return user;
	}
@@ -98,14 +95,15 @@ public class SysService {
	@Post
	@Path("/insert")
	public void insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
		user.setId(StringUtil.buildUUID());
	public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
		String id = StringUtil.buildUUID();
		user.setId(id);
		user.setActive(true);
		user.setPasswd(DEFAULT_PW_STR);
		user.setType(0);
		user.setCreator(sessionUser.getId());
		user.setModifier(sessionUser.getId());
		this.userDao.insert(con, user);
		return id;
	}
	@Get
@@ -172,11 +170,11 @@ public class SysService {
		this.userDao.updateNotice(con, cnt, sessionUser.getId());
	}
	@SetSession({ "RESET_PW_MOBILE=result[0]", "RESET_PW_VC=result[1]", "RESET_PW_TO=result[2]" })
	@ResultToNull
	@Get
	@Path("/regmobilephone")
	public Object[] regMobilePhone(@JdbcConn(false) Connection con, String account, @DefaultValue("false") boolean checkExists) throws Exception {
    @SetSession({"RESET_PW_MOBILE=result[0]", "RESET_PW_VC=result[1]", "RESET_PW_TO=result[2]"})
    @ResultToNull
    @Get
    @Path("/resetPwMobile")
    public Object[] resetpwMobile(@JdbcConn(false) Connection con, String account, @DefaultValue("false") boolean checkExists) throws Exception {
		if (checkExists) {
			User user = this.userDao.queryByAccount(con, account);
			if (null != user) {
@@ -200,17 +198,33 @@ public class SysService {
	public boolean resetPassword(@JdbcConn(true) Connection con, String pw, String vc,
			@Nullable @SessionVal(value = "RESET_PW_MOBILE", remove = true) String account,
			@Nullable @SessionVal(value = "RESET_PW_VC", remove = true) String vcode, @Nullable @SessionVal(value = "RESET_PW_TO", remove = true) Long timeout)
			throws SQLException, JfwBaseException {
			throws SQLException,JfwBaseException {
		if (vcode == null || account == null || timeout == null) {
			return false;
			throw  new JfwBaseException(-60001,"not found sessionVal");
		}
		if (System.currentTimeMillis() > timeout) {
			return false;
			throw new JfwBaseException(-60002,"timout");
		}
		this.userDao.updatePasswdWithMobile(con, StringUtil.md5(pw), account);
		return true;
	}
	@Post
	@Path("/userBridge/refresh")
	public void refresh(@JdbcConn(true)Connection con,String id,String[] bridges)throws SQLException {
		this.userDao.delete(con, id);
		if (bridges != null && bridges.length > 0) {
			UserBridge[] userBridges = new UserBridge[bridges.length];
			for (int i = 0; i < bridges.length; ++i) {
				UserBridge ub = new UserBridge();
				ub.setUid(id);
				ub.setBridge(bridges[i]);
				userBridges[i] = ub;
			}
			this.userDao.insert(con, userBridges);
		}
	}
	private static SessionUser makeSessionUser(User user) {
		SessionUser sessionUser = new SessionUser();
		sessionUser.setAccount(user.getAccount());