Просмотр исходного кода

增加按注册时间查询企业信息的接口,方法修改

hejq 8 лет назад
Родитель
Сommit
1af82e140a

+ 9 - 2
src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -18,6 +18,7 @@ import org.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.web.header.Header;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -25,6 +26,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
@@ -472,11 +474,16 @@ public class PublicQueryController {
 	 * 通过注册时间查询注册企业的UU号
 	 *
 	 * @param registerdate 注册时间
+	 * @param pageSize 分页大小
+	 * @param pageNumber 页码
 	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value = "/nameAndEnUU", method = RequestMethod.GET)
     @ResponseBody
-	public List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate) throws UnsupportedEncodingException {
-		return enterpriseService.getMembersByRegisterDate(registerdate);
+	public List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate, Integer pageSize, Integer pageNumber, HttpServletResponse response) throws UnsupportedEncodingException {
+		List<EnterpriseNameAndUU> list = enterpriseService.getMembersByRegisterDate(registerdate, pageSize, pageNumber);
+		String str = JSON.toJSONString(list);
+		response.addHeader("Content-Length", String.valueOf(str.length()));
+		return list;
 	}
 }

+ 3 - 1
src/main/java/com/uas/platform/b2b/service/EnterpriseService.java

@@ -218,7 +218,9 @@ public interface EnterpriseService {
 	 * 通过注册时间查询企业注册信息
 	 *
 	 * @param registerdate 注册时间
+	 * @param pageSize 分页大小
+	 * @param pageNumber 页码
 	 * @return
 	 */
-	List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate);
+	List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate, Integer pageSize, Integer pageNumber);
 }

+ 17 - 6
src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -756,15 +756,26 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	 * 通过注册时间查询企业注册信息
 	 *
 	 * @param registerdate 注册时间
+     * @param pageSize 分页大小
+     * @param pageNumber 页码
 	 * @return
 	 */
 	@Override
-	public List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate) {
-		String sql = "select en_name name, en_uu uu, to_char(en_time, 'yyyy-mm-dd') registerdate from sec$enterprises";
-		if (null != registerdate && !StringUtils.isEmpty(registerdate)) {
-			sql = sql + " where to_char(en_time, 'yyyy-mm-dd') >= '" + registerdate + "'";
-		}
-		sql = sql + " order by en_time asc";
+	public List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate, Integer pageSize, Integer pageNumber) {
+	    if (pageSize == 0 || pageSize == null) {
+	        pageSize = 20;
+        }
+        if (pageNumber == 0 || pageNumber == null) {
+	        pageNumber = 1;
+        }
+        int rn = pageSize * (pageNumber -1) + 1;
+	    int rownum = pageNumber * pageSize;
+		String sql = "select * from(" +
+                "select a.*,rownum rn from(select en_name name, en_uu uu, to_char(en_time, 'yyyy-mm-dd') registerdate from sec$enterprises " ;
+	    if (!StringUtils.isEmpty(registerdate)) {
+	        sql = sql + "where to_char(en_time, 'yyyy-mm-dd') >= '" + registerdate + "' ";
+        }
+        sql = sql + "order by en_time asc) a where rownum <= " + rownum + " ) where rn >= " + rn;
 		return commonDao.query(sql, EnterpriseNameAndUU.class);
 	}
 }