11

src/main/java/com/ekexiu/project/bridge/collect/CollectDao.java

@@ -1,9 +1,5 @@
package com.ekexiu.project.bridge.collect;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
@@ -14,6 +10,10 @@ import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public interface CollectDao {
@@ -25,7 +25,7 @@ public interface CollectDao {
	int[] insertWaveDataItems(Connection con,List<WaveDataItem> items)throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY SEQ,CTIME,DIC,CID")
	@OrderBy("ORDER BY SEQ,CTIME,DID,CID")
	List<WaveDataItem> query(Connection con,@In String[] seq,@Alias("ctime") @GtEq String btime,@Alias("ctime") @LtEq String etime)throws SQLException;
	
	@SelectList

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

@@ -11,7 +11,6 @@ import org.jfw.apt.orm.annotation.dao.method.Exclude;
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;
@@ -22,6 +21,7 @@ import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
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;
@@ -61,8 +61,7 @@ public interface UserDao {
	int ban(Connection con, @Set String modifier, String id) throws SQLException;
	@PageSelect
	@Where("active = '1'")
	PageQueryResult<User> pageQuery(Connection con, @Nullable String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize,
	PageQueryResult<User> pageQuery(Connection con,@Nullable Boolean active, @Nullable String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize,
			int pageNo) throws SQLException;
	@UpdateWith
@@ -76,7 +75,7 @@ public interface UserDao {
	@Nullable
	@SelectOne
	User queryByAccount(Connection con, String account) throws SQLException;
	User queryByAccount(Connection con, String account, @Nullable @UnEquals String id) throws SQLException;
	@Insert
	@Batch

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

@@ -128,8 +128,8 @@ public class SysService {
	@Get
	@Path("/check")
	public Boolean check(@JdbcConn Connection con,String account)throws SQLException {
		return this.userDao.queryByAccount(con, accountid) == null;
	public Boolean check(@JdbcConn Connection con,String account,@Nullable String id)throws SQLException {
		return this.userDao.queryByAccount(con, account,idid)==null;
	}
	@Get
@@ -153,9 +153,9 @@ public class SysService {
	@Get
	@Path("/pq")
	public PageQueryResult<SessionUser> pageQuery(@JdbcConn Connection con, @Nullable String account, @Nullable String name, @Nullable String comp,
	public PageQueryResult<SessionUser> pageQuery(@JdbcConn Connection con,@Nullable Boolean active, @Nullable String account, @Nullable String name, @Nullable String comp,
			int pageSize, int pageNo) throws SQLException {
		PageQueryResult<User> pageQueryResult = this.userDao.pageQuery(con, account, name == null ? null : "%" + name + "%",
		PageQueryResult<User> pageQueryResult = this.userDao.pageQuery(con,active, account, name == null ? null : "%" + name + "%",
				comp == null ? null : "%" + comp + "%", pageSize, pageNo);
		List<User> users = pageQueryResult.getData();
		List<SessionUser> sessionUsers = new ArrayList<>();
@@ -197,7 +197,7 @@ public class SysService {
    @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);
			User user = this.userDao.queryByAccount(con, account,null);
			if (null == user) {
				throw new JfwBaseException(-60000, "not found account");
			}