11

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

@@ -63,7 +63,7 @@ public interface BridgeServerDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"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 CODE = ?)"}) String bridgeCode, @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

@@ -63,7 +63,7 @@ public interface CollectDeviceDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)"}) String serverCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"SERVER_ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)"}) String serverCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    @SelectList
    List<CollectDevice> queryByServer(Connection con,@Nullable Boolean active, String serverId) throws SQLException;

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

@@ -58,7 +58,7 @@ public interface TransducerDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<Transducer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM COLLECT_DEVICE WHERE CODE = ?)"}) String collectDeviceCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<Transducer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"DEVICE_ID IN (SELECT ID FROM COLLECT_DEVICE WHERE CODE = ?)"}) String collectDeviceCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    @SelectList
    List<Transducer> queryByDevice(Connection con,@Nullable Boolean active, String deviceId) throws SQLException;

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

@@ -171,13 +171,8 @@ public class SysService {
	@Post
	@Path("/changePw")
	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), u.getId());
		} else {
			throw new JfwBaseException(100001, "用户不存在或密码不匹配");
		}
	public void changePw(@JdbcConn(true) Connection con, @LoginUser SessionUser u, String newPw) throws SQLException, JfwBaseException {
		this.userDao.changePw(con, StringUtil.md5(newPw), u.getId());
	}
	@Post