11

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

@@ -5,6 +5,7 @@ import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
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.OrderBy;
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.Insert;
@@ -14,6 +15,8 @@ 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.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -30,7 +33,7 @@ public interface BridgeDao {
    @UpdateWith
    @From(Bridge.class)
    @SetSentence("active = false")
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
@@ -42,7 +45,13 @@ public interface BridgeDao {
    Bridge query(Connection con, String id) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")
    @Where("active = '1'")
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable @Like String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;
    
    @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;
    
}

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

@@ -52,7 +52,7 @@ public interface UserDao {
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<User> pageQuery(Connection con, @Nullable @Like String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<User> pageQuery(Connection con, @Nullable String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize, int pageNo) throws SQLException;
    @UpdateWith
    @From(User.class)

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

@@ -12,6 +12,7 @@ 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;
import org.jfw.apt.web.annotation.LoginUser;
import org.jfw.apt.web.annotation.Path;
@@ -20,6 +21,7 @@ import org.jfw.apt.web.annotation.method.SetSession;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.SessionVal;
import org.jfw.apt.web.annotation.param.Upload;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
@@ -160,8 +162,17 @@ public class SysService {
    @SetSession("JFW_SESSION_LOGIN_USER=result")
    @Path("/user/login")
    @Post
    public SessionUser login(@JdbcConn Connection con, String account, String pw) throws SQLException {
        User user = userDao.login(con, account, StringUtil.md5(pw));
    public SessionUser login(@JdbcConn Connection con, String account, String pw,String vc,@Nullable @SessionVal("PIC_LOGIN") String code,@DefaultValue("0") @SessionVal("TIMEOUT_PIC_LOGIN") long timeout) throws SQLException {
       if(code ==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);
        }
@@ -214,16 +225,20 @@ public class SysService {
    @Get
    @Path("/user/pq")
    public PageQueryResult<SessionUser> pageQuery(@JdbcConn Connection con, @Nullable String account, @Nullable String name, @Nullable String comp, int pageSize, int pageNo) throws SQLException {
        PageQueryResult<User> pageQueryResult = this.userDao.pageQuery(con, account == null ? null : "%" + account + "%", name == null ? null : "%" + name + "%", comp == null ? null : "%" + comp + "%", pageSize, pageNo);
        PageQueryResult<User> pageQueryResult = this.userDao.pageQuery(con, account, name == null ? null : "%" + name + "%", comp == null ? null : "%" + comp + "%", pageSize, pageNo);
        List<User> users = pageQueryResult.getData();
        List<SessionUser> sessionUsers = new ArrayList<>();
        if (!users.isEmpty()) {
            for (User user : users) {
                sessionUsers.add(makeSessionUser(user));
            }
            PageQueryResult<SessionUser> pageQueryResult1 = new PageQueryResult<>();
            pageQueryResult1.setData(sessionUsers);
            return pageQueryResult1;
            PageQueryResult<SessionUser> ret = new PageQueryResult<>();
            ret.setPageNo(pageQueryResult.getPageNo());
            ret.setPageSize(pageQueryResult.getPageSize());
            ret.setTotal(pageQueryResult.getTotal());
            
            ret.setData(sessionUsers);
            return ret;
        }
        return null;
    }
@@ -257,6 +272,12 @@ public class SysService {
        return id;
    }
    @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);
    }
    
    @Get
    @Path("/bridge/qo")
    public Bridge queryBridge(@JdbcConn Connection con, String id) throws SQLException {