Inicio Explorar Ayuda
Registro Iniciar sesión
bulomakaka
/
ekexiu.com.portal
Vigilar 7
Destacar 0
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 188 Releases 0 Wiki
Explorar el Código

资源搜索页面增加地址标签，搜索栏可以直接搜索应用行业、学术领域和所在地。

zzy.zhiyuan.foxmail %!s(int64=8) %!d(string=hace) años
padre
5b9bf715c5
commit
06c125a142
Se han modificado 4 ficheros con 44 adiciones y 42 borrados
Dividir vista Mostrar estadísticas de diff
  1. 7 1
      src/main/java/com/ekexiu/portal/dao/ProfessorDao.java
  2. 21 27
      src/main/java/com/ekexiu/portal/dao/ResourceDao.java
  3. 2 2
      src/main/java/com/ekexiu/portal/service/ResourceService.java
  4. 14 12
      src/main/java/com/ekexiu/portal/service/SysService.java

+ 7 - 1
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java
Ver fichero 

@ -200,7 +200,7 @@ public abstract class ProfessorDao {
200 200 
		boolean hasKey = null != key;
201 201 
		if (hasKey) {
202 202 
			sql.append(
203 
					" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) OR ( professor.NAME LIKE ?))");
203 
					" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) OR ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
204 204 
		}
205 205 
		boolean hasSubject = null != subject;
206 206 
		boolean hasIndustry = null != industry;

@ -229,6 +229,9 @@ public abstract class ProfessorDao {
229 229 
				ps.setString(paramIndex++, key);
230 230 
				ps.setString(paramIndex++, key);
231 231 
				ps.setString(paramIndex++, key);
232 
				ps.setString(paramIndex++, key);
233 
				ps.setString(paramIndex++, key);
234 
				ps.setString(paramIndex++, key);
232 235 
			}
233 236 
			if (hasSubject) {
234 237 
				ps.setString(paramIndex++, subject);

@ -297,6 +300,9 @@ public abstract class ProfessorDao {
297 300 
				ps.setString(paramIndex++, key);
298 301 
				ps.setString(paramIndex++, key);
299 302 
				ps.setString(paramIndex++, key);
303 
				ps.setString(paramIndex++, key);
304 
				ps.setString(paramIndex++, key);
305 
				ps.setString(paramIndex++, key);
300 306 
			}
301 307 
			if (hasSubject) {
302 308 
				ps.setString(paramIndex++, subject);

+ 21 - 27
src/main/java/com/ekexiu/portal/dao/ResourceDao.java
Ver fichero 

@ -346,23 +346,25 @@ public abstract class ResourceDao {
346 346 
	 * @param key 查询内容（搜索框搜索内容-模糊查询）
347 347 
	 * @param subject 学术领域
348 348 
	 * @param industry 研究方向
349 
	 * @param address 专家所在地
349 350 
	 * @param pageSize
350 351 
	 * @param pageNo
351 352 
	 * @return
352 353 
	 * @throws SQLException
353 354 
	 */
354 
	public org.jfw.util.PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,int pageSize,int pageNo) throws SQLException{
355 
	public org.jfw.util.PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
355 356 
        int _m_1 = 0;
356 357 
        org.jfw.util.PageQueryResult<Resource> _result = new org.jfw.util.PageQueryResult<Resource>();
357 358 
        int _m_3 = 1;
358 359 
        boolean _m_2 = null == key;
359 360 
        boolean _m_4 = null == subject;
360 361 
        boolean _m_5 = null == industry;
362 
        boolean _m6 = null == address;
361 363 
        StringBuilder sql = new StringBuilder();
362 364 
        boolean _m_7 = true;
363 365 
        if(!_m_2){
364 366 
            _m_7 =  false;
365 
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) OR (RESOURCE.DESCP LIKE ?) OR (COOPERATION_NOTES LIKE ?) OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?)) ");
367 
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?) OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?))) ");
366 368 
        }
367 369 
        if(!_m_4){
368 370 
            if(_m_7){

@ -380,9 +382,17 @@ public abstract class ResourceDao {
380 382 
                sql.append(" AND (RESOURCE.INDUSTRY LIKE ?) ");
381 383 
            }
382 384 
        }
385 
        if(!_m6){
386 
        	if(_m_7){
387 
        		_m_7 =  false;
388 
        		sql.append(" WHERE (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
389 
        	}else{
390 
        		sql.append(" AND (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
391 
        	}
392 
        }
383 393 
        StringBuilder _m_6 = sql;
384 394 
        sql = new StringBuilder();
385 
        sql.append("SELECT COUNT(1) FROM RESOURCE");
395 
        sql.append(" SELECT COUNT(1) FROM RESOURCE ");
386 396 
        if(_m_6.length()>0){
387 397 
            sql.append(_m_6);
388 398 
        }

@ -390,21 +400,10 @@ public abstract class ResourceDao {
390 400 
        try{
391 401 
            if(!_m_2){
392 402 
                ps.setString(_m_3++,key);
393 
            }
394 
            if(!_m_2){
395 403 
                ps.setString(_m_3++,key);
396 
            }
397 
            if(!_m_2){
398 404 
                ps.setString(_m_3++,key);
399 
            }
400 
            if(!_m_2){
401 405 
                ps.setString(_m_3++,key);
402 
            }
403 
            if(!_m_2){
404 
            	ps.setString(_m_3++,key);
405 
            }
406 
            if(!_m_2){
407 
            	ps.setString(_m_3++,key);
406 
                ps.setString(_m_3++,key);
408 407 
            }
409 408 
            if(!_m_4){
410 409 
                ps.setString(_m_3++,subject);

@ -412,6 +411,9 @@ public abstract class ResourceDao {
412 411 
            if(!_m_5){
413 412 
                ps.setString(_m_3++,industry);
414 413 
            }
414 
            if(!_m6){
415 
            	ps.setString(_m_3++,address);
416 
            }
415 417 
            _result.setPageSize(pageSize);
416 418 
            ResultSet _pageRs = ps.executeQuery();
417 419 
            try{

@ -463,21 +465,10 @@ public abstract class ResourceDao {
463 465 
        try{
464 466 
            if(!_m_2){
465 467 
                ps.setString(_m_3++,key);
466 
            }
467 
            if(!_m_2){
468 468 
                ps.setString(_m_3++,key);
469 
            }
470 
            if(!_m_2){
471 469 
                ps.setString(_m_3++,key);
472 
            }
473 
            if(!_m_2){
474 470 
                ps.setString(_m_3++,key);
475 
            }
476 
            if(!_m_2){
477 
            	ps.setString(_m_3++,key);
478 
            }
479 
            if(!_m_2){
480 
            	ps.setString(_m_3++,key);
471 
                ps.setString(_m_3++,key);
481 472 
            }
482 473 
            if(!_m_4){
483 474 
                ps.setString(_m_3++,subject);

@ -485,6 +476,9 @@ public abstract class ResourceDao {
485 476 
            if(!_m_5){
486 477 
                ps.setString(_m_3++,industry);
487 478 
            }
479 
            if(!_m6){
480 
            	ps.setString(_m_3++,address);
481 
            }
488 482 
            ResultSet rs = ps.executeQuery();
489 483 
            try{
490 484 
                List<Resource> _m_13 = new ArrayList<Resource>();

+ 2 - 2
src/main/java/com/ekexiu/portal/service/ResourceService.java
Ver fichero 

@ -141,11 +141,11 @@ public class ResourceService {
141 141
142 142 
	@Get
143 143 
	@Path("/pq")
144 
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
144 
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
145 145 
		if(key!=null) key="%"+key+"%";
146 146 
		if(subject!=null) subject ="%"+subject+"%";
147 147 
		if(industry!=null)industry="%"+industry+"%";
148 
		return this.resourceDao.queryPage(con, key, subject, industry, pageSize, pageNo);
148 
		return this.resourceDao.queryPage(con, key, subject, industry, address, pageSize, pageNo);
149 149 
	}
150 150
151 151 
}

+ 14 - 12
src/main/java/com/ekexiu/portal/service/SysService.java
Ver fichero 

@ -24,7 +24,6 @@ import com.ekexiu.portal.dao.ProfessorDao;
24 24 
import com.ekexiu.portal.dao.UserDao;
25 25 
import com.ekexiu.portal.mail.MailService;
26 26 
import com.ekexiu.portal.mobile.MobilePhoneService;
27 
import com.ekexiu.portal.po.Professor;
28 27 
import com.ekexiu.portal.po.User;
29 28 
import com.ekexiu.portal.pojo.SessionUser;
30 29 
@ -359,7 +358,8 @@ public class SysService {
359 358 
			"userType=result.getType()",
360 359 
			"userAuth=String.valueOf(result.isAuth())",
361 360 
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
362 
			"userName=result.getName()" })
361 
//			"userName=result.getName()"
362 
			})
363 363 
	@Post
364 364 
	@Path("/regmail/{key}")
365 365 
	public SessionUser regeMail(@JdbcConn(true) Connection con, @PathVar String key, String mail, 
@ -381,9 +381,9 @@ public class SysService {
381 381 
				return null;
382 382 
			SessionUser ret = new SessionUser();
383 383 
			ret.setId(user.getId());
384 
			if (null != this.professorDao.query(con, user.getId())) {
385 
				ret.setName(this.professorDao.query(con, user.getId()).getName());
386 
			}
384 
//			if (null != this.professorDao.query(con, user.getId())) {
385 
//				ret.setName(this.professorDao.query(con, user.getId()).getName());
386 
//			}
387 387 
			ret.setMobilePhone(user.getMobilePhone());
388 388 
			ret.setType(user.getUserType());
389 389 
			ret.setEmail(user.getEmail());
 
@ -460,7 +460,8 @@ public class SysService {
460 460 
			"userType=result.getType()",
461 461 
			"userAuth=String.valueOf(result.isAuth())",
462 462 
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
463 
			"userName=result.getName()" })
463 
//			"userName=result.getName()"
464 
			})
464 465 
	@Post
465 466 
	@Path("/slogin")
466 467 
	public SessionUser sLogin(@JdbcConn Connection con, String code,
 
@ -470,13 +471,13 @@ public class SysService {
470 471 
			return null;
471 472 
		if (!mobile.equals(user.getMobilePhone()))
472 473 
			return null;
473 
		Professor professor = this.professorDao.query(con, code);
474 
//		Professor professor = this.professorDao.query(con, code);
474 475 
		SessionUser ret = new SessionUser();
475 476 
		ret.setId(code);
476 477 
		ret.setMobilePhone(mobile);
477 478 
		ret.setType(user.getUserType());
478 479 
		ret.setEmail(user.getEmail());
479 
		ret.setName(professor.getName());
480 
//		ret.setName(professor.getName());
480 481 
		ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
481 482 
		return ret;
482 483 
	}
 
@ -486,7 +487,8 @@ public class SysService {
486 487 
			"userType=result.getType()",
487 488 
			"userAuth=String.valueOf(result.isAuth())",
488 489 
			"userEmail=result.getEmail()==null?\"\":result.getEmail()",
489 
			"userName=result.getName()" })
490 
//			"userName=result.getName()"
491 
			})
490 492 
	@Post
491 493 
	@Path("/login")
492 494 
	public SessionUser login(@JdbcConn Connection con, String lk, String pw)
 
@ -501,9 +503,9 @@ public class SysService {
501 503
502 504 
		SessionUser ret = new SessionUser();
503 505 
		ret.setId(user.getId());
504 
		if (null != this.professorDao.query(con, user.getId())) {
505 
			ret.setName(this.professorDao.query(con, user.getId()).getName());
506 
		}
506 
//		if (null != this.professorDao.query(con, user.getId())) {
507 
//			ret.setName(this.professorDao.query(con, user.getId()).getName());
508 
//		}
507 509 
		ret.setMobilePhone(user.getMobilePhone());
508 510 
		ret.setType(user.getUserType());
509 511 
		ret.setEmail(user.getEmail());