Skip to content

A
amos-boot-biz
Commit 8c219185 authored by wujiang's avatar wujiang
Browse files
Options

修复过滤问题

parent 806f5459
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 24 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @ 8c219185
......@@ -1471,14 +1471,28 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCarBelongAreaInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆归属信息接口", notes = "车辆统计-获取车辆归属信息接口")
public List<ChartIntegerDto> getCarBelongAreaInfo() {
return iCarService.getCarBelongAreaInfo();
ReginParams reginParams = JSONObject.parseObject(redisUtils
.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
ReginParams.class);
String orgCode = null;
if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
orgCode=reginParams.getCompany().getOrgCode();
}
return iCarService.getCarBelongAreaInfo(orgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getCarAreaInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取片区车辆归属信息接口", notes = "车辆统计-获取片区车辆归属信息接口")
public Page<CarAreaInfoDto> getCarAreaInfo(@RequestParam String areaName) {
return iCarService.getCarAreaInfo(areaName);
ReginParams reginParams = JSONObject.parseObject(redisUtils
.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
ReginParams.class);
String orgCode = null;
if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
orgCode=reginParams.getCompany().getOrgCode();
}
return iCarService.getCarAreaInfo(areaName,orgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ICarService.java
View file @ 8c219185
......@@ -196,8 +196,8 @@ public interface ICarService extends IService<Car> {
List<ChartIntegerDto> getCarCategoryInfo(String orgCode) ;
Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord,String orgCode);
Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord,String orgCode);
List<ChartIntegerDto>getCarBelongAreaInfo() ;
Page<CarAreaInfoDto> getCarAreaInfo(String areaName) ;
List<ChartIntegerDto>getCarBelongAreaInfo(String orgCode) ;
Page<CarAreaInfoDto> getCarAreaInfo(String areaName,String orgCode) ;
BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize,String keyWord,String orgCode);
List<CarExportDto> exportCarMileageInfoByMoth(String date,String keyWord,String orgCode);
ZZChartsDto getCarMileageInfoByMothOFDay(String iotCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ 8c219185
......@@ -1470,16 +1470,16 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public Map<String, Integer> getCountOfCar(String orgCode) {
Map<String, Integer> map = new HashMap<>();
map.put("countofCar",
this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getId)).size());
map.put("countofCar", this
.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getId)).size());
return map;
}
@Override
public Map<String, Integer> getCountOfCarBelongCompany(String orgCode) {
Map<String, Integer> map = new HashMap<>();
map.put("countofCompany",
this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode))
map.put("countofCompany", this
.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode))
.size());
return map;
}
......@@ -1492,7 +1492,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
ChartIntegerDto chartIntegerDto = new ChartIntegerDto();
Integer count = carMapper.getCarCategoryCountByCategoryID(list.get(i).getId(),orgCode);
Integer count = carMapper.getCarCategoryCountByCategoryID(list.get(i).getId(), orgCode);
chartIntegerDto.setName(list.get(i).getName());
chartIntegerDto.setValue(count);
list1.add(chartIntegerDto);
......@@ -1502,7 +1502,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord,String orgCode) {
public Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord, String orgCode) {
// BasicTableDataDto basicTableDataDto = new BasicTableDataDto();
// List<ColModel> colModels = new ArrayList<>();
// colModels.add(new ColModel("carNum","车牌号"));
......@@ -1556,7 +1556,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord,String orgCode) {
public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord, String orgCode) {
Page<CarEquipAlarmInfoDto> page = new Page<>();
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode)).stream()
.filter(car -> Integer.valueOf(car.getExtra2()) < carEquipAlarmBatteryNumber)
......@@ -1580,7 +1580,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public List<ChartIntegerDto> getCarBelongAreaInfo() {
public List<ChartIntegerDto> getCarBelongAreaInfo(String orgCode) {
List<ChartIntegerDto> list = new ArrayList<>();
FeignClientResult<java.util.Collection<CompanyModel>> de = Privilege.companyClient.queryAgencyTree(null);
// 如果是公司则获取所有片区
......@@ -1591,7 +1591,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
ChartIntegerDto chartIntegerDto = new ChartIntegerDto();
CompanyModel companyModel1 = JSON.parseObject(JSON.toJSONString(companyModels.get(i)),
CompanyModel.class);
Integer count = this.count(new QueryWrapper<Car>().like("biz_org_code", companyModel1.getOrgCode()));
Integer count = this.count(new QueryWrapper<Car>().like("biz_org_code", companyModel1.getOrgCode())
.like("biz_org_code", orgCode));
chartIntegerDto.setName(companyModel1.getCompanyName());
chartIntegerDto.setCompanyId(companyModel1.getSequenceNbr());
chartIntegerDto.setValue(count);
......@@ -1602,7 +1603,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarAreaInfoDto> getCarAreaInfo(String areaName) {
public Page<CarAreaInfoDto> getCarAreaInfo(String areaName, String orgCode) {
Page<CarAreaInfoDto> page = new Page<>();
List<CarAreaInfoDto> list = new ArrayList<>();
CompanyModel companyModelArea = Privilege.companyClient.queryByCompanyName(areaName).getResult();
......@@ -1615,7 +1616,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
for (int i = 0; i < companyModels.size(); i++) {
CompanyModel companyModel = companyModels.get(i);
CarAreaInfoDto carAreaInfoDto = new CarAreaInfoDto();
Integer count = this.count(new QueryWrapper<Car>().like("biz_org_code", companyModel.getOrgCode()));
Integer count = this.count(new QueryWrapper<Car>().like("biz_org_code", companyModel.getOrgCode())
.like("biz_org_code", orgCode));
carAreaInfoDto.setNo(i + 1);
carAreaInfoDto.setName(companyModel.getCompanyName());
carAreaInfoDto.setCountOfCar(count);
......@@ -1631,7 +1633,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize, String keyWord,String orgCode) {
public BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize, String keyWord,
String orgCode) {
BasicTableDataDto basicTableDataDto = new BasicTableDataDto();
List<ColModel> colModels = new ArrayList<>();
colModels.add(new ColModel("carNum", "车牌号"));
......@@ -1676,7 +1679,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public List<CarExportDto> exportCarMileageInfoByMoth(String date, String keyWord,String orgCode) {
public List<CarExportDto> exportCarMileageInfoByMoth(String date, String keyWord, String orgCode) {
List<CarExportDto> carExportDtos = new ArrayList<>();
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
if (StringUtils.isNotEmpty(keyWord)) {
......@@ -1737,7 +1740,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarExceptionDto> getCarExcepitonTrack(Integer type, String keyWord,String orgCode) {
public Page<CarExceptionDto> getCarExcepitonTrack(Integer type, String keyWord, String orgCode) {
Page<CarExceptionDto> page = new Page<>();
List<CarExceptionDto> carExceptionDtos = new ArrayList<>();
LocalDate localDate = LocalDate.now(ZoneId.of("+8"));
......@@ -1769,7 +1772,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public BasicTableDataDto getCarWarningRecord(String keyWord, Integer current, Integer pageSize,String orgCode) {
public BasicTableDataDto getCarWarningRecord(String keyWord, Integer current, Integer pageSize, String orgCode) {
BasicTableDataDto basicTableDataDto = new BasicTableDataDto();
Page<CarSpeedWarningRecord> carSpeedWarningRecordPage = new Page<>();
List<ColModel> colModels = new ArrayList<>();
......@@ -1788,11 +1791,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
queryWrapper.orderByDesc("over_speed");
queryWrapper.last("limit " + (current - 1) * pageSize + "," + current * pageSize);
//过滤车牌
// 过滤车牌
List<Car> clist = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
List<String> carnums = clist.stream().map(i->i.getCarNum()).collect(Collectors.toList());
if(carnums.size()>0)
{
List<String> carnums = clist.stream().map(i -> i.getCarNum()).collect(Collectors.toList());
if (carnums.size() > 0) {
queryWrapper.in("car_num", carnums);
}
......@@ -1807,7 +1809,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public List<Map<String, String>> getBizOrgName(String orgCode) {
List<Map<String, String>> result = new ArrayList<>();
List<Car> cars = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode));
List<Car> cars = this
.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode));
List<String> orgNames = cars.stream().map(car -> car.getBizOrgName()).collect(Collectors.toList());
Comparator comparator = Collator.getInstance(Locale.CHINA);
Collections.sort(orgNames, (p1, p2) -> comparator.compare(p1, p2));
......
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