Skip to content

C
cloud-platform
Commit 3dcd5beb authored by hanfeng's avatar hanfeng
Browse files
Options

修改会员列表

parent 1ed6d19b
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 18 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @ 3dcd5beb
......@@ -5,6 +5,8 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
import java.util.Set;
/**
* 用户信息表
......@@ -52,6 +54,11 @@ public class AppUserManageDTO {
*/
private Integer source;
/**
* 公司所在的城市数组
*/
private Set<Integer> citySet;
// /**
// * 接收前台时间范围
// */
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @ 3dcd5beb
......@@ -13,8 +13,10 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.vehicle.entity.SysRegion;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import javafx.print.Collation;
import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,6 +28,7 @@ import tk.mybatis.mapper.entity.Example;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
......@@ -59,12 +62,21 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
return pageInfo;
}
List<Integer> Citys = pageInfo.getList().parallelStream().map(AppUserManageVo::getCityCode).collect(Collectors.toList());
return getAppUserManageVoPageInfo(pageInfo);
}
/**
* 获取城市名并保存
* @param pageInfo
* @return
*/
private PageInfo<AppUserManageVo> getAppUserManageVoPageInfo(PageInfo<AppUserManageVo> pageInfo) {
List<Integer> citysCode = pageInfo.getList().parallelStream().map(AppUserManageVo::getCityCode).collect(Collectors.toList());
HashSet<Integer> set = new HashSet<>();
set.addAll(Citys);
set.addAll(citysCode);
ObjectRestResponse<List<SysRegion>> orr = vehicleFeign.getSysRegionByIds(set);
List<SysRegion> sysRegions = orr.getData();
if (!(sysRegions==null||sysRegions.size()==0)) {
if (CollectionUtils.isNotEmpty(sysRegions)) {
HashMap<Long, String> map = new HashMap<>();
for (SysRegion sysRegion : sysRegions) {
map.put(sysRegion.getId(),sysRegion.getName());
......@@ -76,6 +88,23 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
return pageInfo;
}
/**
* 根据用公司账号权限和公司所在城市查询用户情况
* @param appUserManageDTO
* @return
*/
public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) {
PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
if (CollectionUtils.isEmpty(appUserManageVos)) {
return new PageInfo<AppUserManageVo>();
}
Set<Integer> usSet = appUserManageDTO.getCitySet();
List<AppUserManageVo> results = appUserManageVos.parallelStream().filter(us -> usSet.contains(us.getCityCode())).collect(Collectors.toList());
PageInfo<AppUserManageVo> pageInfo = PageInfo.of(results);
return getAppUserManageVoPageInfo(pageInfo);
}
/**
* 禁用账户
* @param id
......@@ -150,4 +179,5 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @ 3dcd5beb
......@@ -7,13 +7,26 @@ import com.github.wxiaoqi.security.admin.constant.Status;
import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
import com.github.wxiaoqi.security.admin.entity.AppUserManage;
import com.github.wxiaoqi.security.admin.entity.User;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* app用户管理类
* @author Administrator
......@@ -25,26 +38,35 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
@Autowired
private AppUserLoginBiz appUserLoginBiz;
@Autowired
protected UserAuthConfig userAuthConfig;
@Autowired
private PublicController publicController;
@Autowired
private VehicleFeign vehicleFeign;
/**
* 查询所有
* @return
*/
@PostMapping("/findAll")
public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO){
return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO, HttpServletRequest request) throws Exception {
String token = userAuthConfig.getToken(request);
ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
User user = (User) objectRestResponse.getData();
if (user==null){
throw new BaseException("User error!");
}
if (user.getDataAll()==1) {
return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
}
ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
Set<Integer> cityList = setObjectRestResponse.getData();
appUserManageDTO.setCitySet(cityList);
return ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
}
// /**
// * 禁用
// * @param id
// * @return
// */
// @DeleteMapping("/deleteById/{id}/{isDel}")
// public ObjectRestResponse deleteById(@PathVariable Integer id,@PathVariable Integer isDel){
// baseBiz.deleteAppUser(id,isDel);
// return ObjectRestResponse.succ();
// }
/**
* 查询一条
* @param id
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
View file @ 3dcd5beb
......@@ -92,4 +92,14 @@ public interface VehicleFeign {
*/
@PostMapping("/sysRegion/getSysRegionByIds")
ObjectRestResponse<List<SysRegion>> getSysRegionByIds(@RequestBody Set<Integer> ids);
/**
* 获取公司所在的城市
* @param zoneList
* @param companyList
* @return
*/
@GetMapping("/city/corporationCity")
ObjectRestResponse<Set<Integer>> corporationCity( @RequestParam(value = "zoneList") String zoneList,
@RequestParam(value = "companyList") String companyList);
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
View file @ 3dcd5beb
......@@ -39,6 +39,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
......@@ -62,6 +63,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
@Value("${branchCompanyPic.baseUploadPath}")
private String baseUploadPath ;
@Autowired
private VehicleBiz vehicleBiz;
/**
* 按主键获取公司
* @param id
......@@ -276,4 +280,21 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
}
/**
* 通过片区片区和分公司id获取对应的城市信息
* @param zoneList
* @param companyList
* @return
*/
public Set<Integer> getCity(String zoneList, String companyList) {
List<Integer> list = vehicleBiz.dataCompany(zoneList, companyList);
Example exa =new Example(BranchCompany.class);
Example.Criteria criteria = exa.createCriteria();
criteria.andIn("id",list);
List<BranchCompany> result = mapper.selectByExample(exa);
return result.parallelStream().map(BranchCompany::getAddrCity).collect(Collectors.toSet());
}
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/SysRegionController.java
View file @ 3dcd5beb
......@@ -100,7 +100,7 @@ public class SysRegionController extends BaseController<SysRegionBiz> {
* @return
*/
@PostMapping("/getSysRegionByIds")
ObjectRestResponse<List<SysRegion>> getSysRegionByIds(@RequestBody Set<Integer> ids){
public ObjectRestResponse<List<SysRegion>> getSysRegionByIds(@RequestBody Set<Integer> ids){
Example exam = Example.builder(SysRegion.class)
.where(WeekendSqls.<SysRegion>custom()
.andIn(SysRegion::getId,ids)
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CityController.java 0 → 100644
View file @ 3dcd5beb
package com.xxfc.platform.vehicle.rest.admin;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.vehicle.biz.BranchCompanyBiz;
import com.xxfc.platform.vehicle.biz.VehicleBiz;
import com.xxfc.platform.vehicle.common.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Set;
/**
* 获取公司所在的城市
*
* @author Administrator
*/
@Slf4j
@RestController
@RequestMapping("/city")
public class CityController extends BaseController<VehicleBiz> {
@Autowired
private BranchCompanyBiz branchCompanyBiz;
/**
* 获取公司所在的城市
*
* @param zoneList
* @param companyList
* @return
*/
@GetMapping("/corporationCity")
public ObjectRestResponse<Set<Integer>> corporationCity(
@RequestParam("zoneList") String zoneList,
@RequestParam("companyList") String companyList) {
return ObjectRestResponse.succ(branchCompanyBiz.getCity(zoneList,companyList));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment