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

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

@@ -60,7 +60,7 @@ 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;
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN(SELECT BRIDGE FROM USER_BRIDGE WHERE UID=?)") String uid, int pageSize, int pageNo) throws SQLException;
    @SelectList
    @OrderBy("ORDER BY CODE")

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

@@ -164,8 +164,8 @@ public class BridgeService {
    @Get
    @Path("/bridge/byUser")
    public PageQueryResult<Bridge> query(@JdbcConn Connection con, String uid, @Nullable Boolean active, int pageSize, int pageNo) throws SQLException {
        return this.bridgeDao.pageQuery(con, active, uid, pageSize, pageNo);
    public PageQueryResult<Bridge> query(@JdbcConn Connection con, @LoginUser SessionUser user, @Nullable Boolean active, int pageSize, int pageNo) throws SQLException {
        return this.bridgeDao.pageQuery(con, active, user.getId(), pageSize, pageNo);
    }
@@ -395,9 +395,9 @@ public class BridgeService {
    @Get
    @Path("/all/byUser")
    public Map<String,Object> queryAll(@JdbcConn Connection con,@Nullable Boolean active, String id)throws SQLException {
    public Map<String,Object> queryAll(@JdbcConn Connection con,@Nullable Boolean active,@LoginUser SessionUser user)throws SQLException {
        Map<String, Object> map = new HashMap<>();
        List<Bridge> bridges = this.bridgeDao.listQueryByUser(con, active, id);
        List<Bridge> bridges = this.bridgeDao.listQueryByUser(con, active, user.getId());
        String[] bridgeId = new String[bridges.size()];
        for(int i = 0 ; i < bridges.size() ; ++i) {
            bridgeId[i] = bridges.get(i).getId();

src/main/java/com/ekexiu/project/bridge/servlet/AlarmDataServlet.java

@@ -145,7 +145,6 @@ public class AlarmDataServlet extends HttpServlet {
											at = at.substring(0, 14);
											msg.setAlarmTime(at);
										}
									} else {
										items.clear();
										break;
@@ -175,7 +174,6 @@ public class AlarmDataServlet extends HttpServlet {
			in.close();
		}
		if (items.size() > 0) {
			Connection con = null;
			try {
				con = this.dataSource.getConnection();
@@ -215,10 +213,9 @@ public class AlarmDataServlet extends HttpServlet {
				}
				if (items.size() > 0) {
					con.commit();
					JfwAppContext.getScheduledExecutorService().equals(new Runnable() {
					JfwAppContext.getScheduledExecutorService().execute(new Runnable() {
						@Override
						public void run() {
							for (Map.Entry<User, String> entry : notices.entrySet()) {
								User u = entry.getKey();
								String to = u.getEmail();

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

@@ -171,10 +171,10 @@ public class SysService {
	@Post
	@Path("/changePw")
	public void changePw(@JdbcConn(true) Connection con, String id, String oldPw, String newPw) throws SQLException, JfwBaseException {
		User user = this.userDao.query(con, id);
	public void changePw(@JdbcConn(true) Connection con, @LoginUser SessionUser u, String oldPw, String newPw) throws SQLException, JfwBaseException {
		User user = this.userDao.query(con, u.getId());
		if (user != null && StringUtil.md5(oldPw).equals(StringUtil.md5(user.getPasswd()))) {
			this.userDao.changePw(con, StringUtil.md5(newPw), id);
			this.userDao.changePw(con, StringUtil.md5(newPw), u.getId());
		} else {
			throw new JfwBaseException(100001, "用户不存在或密码不匹配");
		}