|
@@ -1,5 +1,6 @@
|
|
|
package com.yc.education.controller.admin;
|
|
|
|
|
|
+import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import com.yc.education.model.Authentication;
|
|
|
import com.yc.education.model.Provider;
|
|
@@ -8,6 +9,7 @@ import com.yc.education.service.IAuthenticationService;
|
|
|
import com.yc.education.service.IProviderService;
|
|
|
import com.yc.education.service.IUdaService;
|
|
|
import com.yc.education.service.IUserInfoService;
|
|
|
+import com.yc.education.util.MapUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -141,12 +143,28 @@ public class UserInfoAdminController {
|
|
|
district = null;
|
|
|
}
|
|
|
|
|
|
- Integer offset = (pageNum-1) * pageSize;
|
|
|
|
|
|
- List<UserInfo> listOwnerCarInfo = iUserInfoService.listOwnerCarInfo(province,city,nickName,phone,offset,pageSize);
|
|
|
-
|
|
|
- int total = iUserInfoService.listOwnerCarInfo(province, city, nickName, phone, null, null).size( );
|
|
|
- PageInfo< UserInfo > pager = new PageInfo<>( );
|
|
|
+ List<UserInfo> listOwnerCarInfo = iUserInfoService.listOwnerCarInfo(province,city,district,nickName,phone,pageNum,pageSize);
|
|
|
+
|
|
|
+ /*for (UserInfo userinfo:listOwnerCarInfo){
|
|
|
+ String url = MapUtils.getRegeoUrl(userinfo.getLongitude( ) + "," + userinfo.getLatitude( ));
|
|
|
+ String jsonStr = MapUtils.sendGet(url);
|
|
|
+ String province1 = MapUtils.getProvince(jsonStr); //市区
|
|
|
+ String city1 = MapUtils.getCity(jsonStr); //市区
|
|
|
+ if ("[]".equals(city1)){
|
|
|
+ city1=province1;
|
|
|
+ }
|
|
|
+ String district1 = MapUtils.getDistrict(jsonStr);
|
|
|
+ String street1 = MapUtils.getAddressNameByGeocoder(jsonStr);//详细 地址
|
|
|
+ userinfo.setProvince(province1);
|
|
|
+ userinfo.setCity(city1);
|
|
|
+ userinfo.setDistrict(district1);
|
|
|
+ userinfo.setStreet(street1);
|
|
|
+ iUserInfoService.updateNotNull(userinfo);
|
|
|
+ }*/
|
|
|
+
|
|
|
+ /*int total = iUserInfoService.listOwnerCarInfo(province, city,district, nickName, phone, null, null).size( );*/
|
|
|
+ /* PageInfo< UserInfo > pager = new PageInfo<>( );
|
|
|
pager.setList(listOwnerCarInfo);
|
|
|
pager.setTotal(total);
|
|
|
int jy = (total-1)/pageSize+1 >= 8 ? 8:(total-1)/pageSize+1;
|
|
@@ -164,8 +182,8 @@ public class UserInfoAdminController {
|
|
|
int nextPage = zym - pageNum > 0 ? pageNum +1 : pageNum;
|
|
|
int prePage = pageNum!= 1 ? pageNum - 1 : 1;
|
|
|
pager.setPrePage(prePage);
|
|
|
- pager.setNextPage(nextPage);
|
|
|
- mav.addObject("pageInfo",pager);
|
|
|
+ pager.setNextPage(nextPage);*/
|
|
|
+ mav.addObject("pageInfo", new PageInfo<UserInfo>(listOwnerCarInfo));
|
|
|
mav.addObject("province",province);
|
|
|
mav.addObject("city",city);
|
|
|
mav.addObject("district",district);
|