Skip to content

A
amos-boot-biz
Commit 04aadfd1 authored by wujiang's avatar wujiang
Browse files
Options

修改车辆统计过滤

parent a3344114
Show whitespace changes
Inline Side-by-side
Showing with 219 additions and 103 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @ 04aadfd1
......@@ -1400,20 +1400,41 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCountOfCar", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆总数", notes = "车辆统计-获取车辆总数")
public Map<String, Integer> getCountOfCar() {
return iCarService.getCountOfCar();
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.getCountOfCar(orgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getCountOfCarBelongCompany", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆归属单位总数", notes = "车辆统计-获取车辆归属单位总数")
public ResponseModel<Integer> getCountOfCarBelongCompany() {
return CommonResponseUtil.success(iCarService.getCountOfCarBelongCompany());
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 CommonResponseUtil.success(iCarService.getCountOfCarBelongCompany(orgCode));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getCarCategoryInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆分类用途信息", notes = "车辆统计-获取车辆分类用途信息")
public List<ChartIntegerDto> getCarCategoryInfo() {
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.getCarCategoryInfo();
}
......@@ -1421,6 +1442,13 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCarEquipStateInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备状态信息", notes = "车辆统计-获取设备状态信息")
public Page<CarEquipStateInfoDto> getCarEquipStateInfo(@RequestParam(required = false) String keyWord) {
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.getCarEquipStateInfo(keyWord);
}
......@@ -1429,6 +1457,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备告警信息", notes = "车辆统计-获取设备告警信息")
public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(@RequestParam(required = false) String keyWord,
@RequestParam String flag) {
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.getCarEquipAlarmInfoDto(keyWord);
}
......@@ -1451,6 +1486,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计车辆里程", notes = "车辆统计-按照月份统计车辆里程")
public BasicTableDataDto getCarMileageInfoByMoth(@RequestParam(required = false) String date,
@RequestParam Integer current, @RequestParam Integer size, @RequestParam(required = false) String keyWord) {
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.getCarMileageInfoByMoth(date, current, size, keyWord);
}
......@@ -1459,6 +1501,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计导出车辆里程", notes = "车辆统计-按照月份统计导出车辆里程")
public void exportCarMileageInfoByMoth(@RequestParam(required = false) String date,
@RequestParam(required = false) String keyWord, HttpServletResponse response) {
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();
}
List<CarExportDto> list = this.iCarService.exportCarMileageInfoByMoth(date, keyWord);
if (org.springframework.util.StringUtils.isEmpty(date)) {
date = DateUtil.format(new Date(), "yyyy-MM");
......@@ -1471,7 +1520,7 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCarMileageInfoByMothOFDay", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计每天的车辆里程", notes = "车辆统计-按照月份统计每天的车辆里程")
public ZZChartsDto getCarMileageInfoByMothOFDay(@RequestParam String iotCode) {
return iCarService.getCarMileageInfoByMothOFDay(iotCode);
return iCarService.getCarMileageInfoByMothOFDay();
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
......@@ -1479,6 +1528,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照日期范围获取异常车辆", notes = "车辆统计-按照日期范围获取异常车辆")
public Page<CarExceptionDto> getCarExcepitonTrack(@RequestParam Integer type,
@RequestParam(required = false) String keyWord) {
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.getCarExcepitonTrack(type, keyWord);
}
......@@ -1487,6 +1543,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取超速信息", notes = "车辆统计-获取超速信息")
public BasicTableDataDto getCarWarningRecord(@RequestParam(required = false) String keyWord,
@RequestParam Integer current, @RequestParam Integer size) {
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.getCarWarningRecord(keyWord, current, size);
}
......@@ -1494,6 +1557,13 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getBizOrgName", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取归属单位下拉框值", notes = "车辆统计-获取归属单位下拉框值")
public List<Map<String, String>> getBizOrgName(@RequestParam(required = false) String keyWord) {
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.getBizOrgName();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java
View file @ 04aadfd1
......@@ -85,7 +85,7 @@ public interface CarMapper extends BaseMapper<Car> {
List<Map<String, Object>> getCarState();
List<Map<String, Object>> getFirePowerInfo();
Integer getCarCategoryCountByCategoryID(Long categoryID);
Integer getCarCategoryCountByCategoryID(@Param("categoryID")Long categoryID,@Param("orgCode")String orgCode);
List<CarEquipStateInfoDto> getCarEquipStateInfo();
List<CarEquipAlarmInfoDto> getCarEquipAlarmInfo(Integer batteryNumber);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ICarService.java
View file @ 04aadfd1
......@@ -190,21 +190,21 @@ public interface ICarService extends IService<Car> {
List<Car> location(String orgCode);
// 获取车辆总数
Map<String,Integer> getCountOfCar();
Map<String,Integer> getCountOfCar(String orgCode);
// 获取车辆归属单位总数
Map<String,Integer> getCountOfCarBelongCompany();
List<ChartIntegerDto> getCarCategoryInfo() ;
Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord);
Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord);
Map<String,Integer> getCountOfCarBelongCompany(String orgCode);
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 ) ;
BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize,String keyWord);
List<CarExportDto> exportCarMileageInfoByMoth(String date,String keyWord);
Page<CarAreaInfoDto> getCarAreaInfo(String areaName) ;
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);
Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord);
BasicTableDataDto getCarWarningRecord(String keyWord,Integer current, Integer pageSize);
Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord,String orgCode);
BasicTableDataDto getCarWarningRecord(String keyWord,Integer current, Integer pageSize,String orgCode);
List<Map<String,String>> getBizOrgName();
List<Map<String,String>> getBizOrgName(String orgCode);
/**
* 查询车辆启动状态，赋码
*/
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ 04aadfd1
......@@ -554,7 +554,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public Map<String, String> loadingExtinguishants(Long carId, List<ExtinguishantRequeset> extinguishants) {
Car car = this.getById(carId);
if (car.getCarState().equals(CarStatusEnum.WX.getCode()) || car.getCarState().equals(CarStatusEnum.BF.getCode())) {
if (car.getCarState().equals(CarStatusEnum.WX.getCode())
|| car.getCarState().equals(CarStatusEnum.BF.getCode())) {
throw new RuntimeException("报废维修车辆不能装载");
}
LoadingParams params = new LoadingParams(carId, extinguishants);
......@@ -623,11 +624,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
List<SystemDic> list = systemDicMapper.selectByMap(columnMap);
ParsePropertyUtil.setting(journal::setState, () -> list.get(0).getId().toString());
journal.setRemark(user.getRealName() + "将" + equipmentDetail.getName() + "装备装载到车牌号为【" + car.getCarNum() + "】的车辆上。");
journal.setRemark(
user.getRealName() + "将" + equipmentDetail.getName() + "装备装载到车牌号为【" + car.getCarNum() + "】的车辆上。");
journal.setWarehouseStructureId(detail.getWarehouseStructureId());
journal.setCarId(eq.getCarId());
} else if (typeEnum == OnBoardEquipmentEnum.UNLOAD) {
journal.setRemark(user.getRealName() + "从车牌号为【" + car.getCarNum() + "】的车辆上卸载了" + equipmentDetail.getName() + "装备。");
journal.setRemark(
user.getRealName() + "从车牌号为【" + car.getCarNum() + "】的车辆上卸载了" + equipmentDetail.getName() + "装备。");
journal.setWarehouseStructureId(shelfCellId);
journal.setCarId(eq.getCarId());
}
......@@ -679,7 +682,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
private void updateStockDetail(StockDetail detail, String type, Long warehouseId, Long shelfCellId) {
OnBoardEquipmentEnum typeEnum = OnBoardEquipmentEnum.getEnum(type);
if (typeEnum == OnBoardEquipmentEnum.LOAD) {
//TODO 更新为自己去反，之前为减去1，这样在设备管理方式为批量管理时，就不对了
// TODO 更新为自己去反，之前为减去1，这样在设备管理方式为批量管理时，就不对了
updateStock(detail, detail.getAmount() * -1);
detail.setAmount(0.0);
detail.setStatus(EquipStatusEnum.ONCAR.getCode().toString());
......@@ -694,7 +697,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
detail.setWarehouseStructureId(shelfCellId);
}
detail.setStatus(EquipStatusEnum.REPERTORY.getCode().toString());
//卸载将卸载的数量恢复
// 卸载将卸载的数量恢复
updateStock(detail, detail.getAmount());
}
stockDetailMapper.updateById(detail);
......@@ -704,11 +707,12 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
public void unloadEquipment(OnBoardEquipment equipment, AgencyUserModel user) {
List<Equip> eqs = generate(equipment);
String area = equipment.getArea();
//TODO: 是否返回原始位置：true-是 false -否 ，equipment.getShelfCellCode() 为空或者为null，代表，装备的卸载是，放回原位
// TODO: 是否返回原始位置：true-是 false -否 ，equipment.getShelfCellCode()
// 为空或者为null，代表，装备的卸载是，放回原位
boolean isOriPosition = StringUtil.isEmpty(equipment.getShelfCellCode());
//新存放的货位id,不放回原位使用
// 新存放的货位id,不放回原位使用
Long shelfCellId = null;
//TODO: 不放回原位，查询存放位置(正常逻辑，应该是前端返回操作类型及货位id,后端不需要进行查询)
// TODO: 不放回原位，查询存放位置(正常逻辑，应该是前端返回操作类型及货位id,后端不需要进行查询)
if (!isOriPosition && equipment.getWarehouseId() != null) {
shelfCellId = queryShelfCellId(equipment);
}
......@@ -723,9 +727,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
if (null == detail) {
throw new RuntimeException("二维码为【" + eq.getQrCode() + "】的装备未记录在库!");
}
//卸载将转载的数量回复回去
// 卸载将转载的数量回复回去
if (finalShelfCellId != null) {
iEquipmentDetailService.update(new UpdateWrapper<EquipmentDetail>().eq("id", eq.getEquipmentDetailId()).set("area", area));
iEquipmentDetailService.update(
new UpdateWrapper<EquipmentDetail>().eq("id", eq.getEquipmentDetailId()).set("area", area));
}
detail.setAmount(equipmentOnCar.getAmount());
unLoad(equipmentOnCar);
......@@ -763,7 +768,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
private Long queryShelfCellId(OnBoardEquipment equipment) {
//存放到其他位置
// 存放到其他位置
Map<String, Object> columnMap = new HashMap<String, Object>();
columnMap.put("warehouse_id", equipment.getWarehouseId());
columnMap.put("code", equipment.getShelfCellCode());
......@@ -812,7 +817,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public Car saveOne(Car car) {
//如果没有状态默认状态在位
// 如果没有状态默认状态在位
if (StringUtils.isEmpty(car.getCarState())) {
car.setCarState(CarStatusEnum.ZW.getCode());
}
......@@ -860,7 +865,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
wrapper.orderByDesc(BaseEntity::getCreateDate);
List<Car> carList = this.list(wrapper);
List<Equipment> equipmentList = iEquipmentService.list();
/*统一车辆图片使用装备定义图片 2021-10-27 陈召*/
/* 统一车辆图片使用装备定义图片 2021-10-27 陈召 */
equipmentList.stream().filter(e -> e.getName().contains("车")).forEach(e -> {
carList.forEach(car -> {
if (e.getId().equals(car.getEquipmentId())) {
......@@ -872,18 +877,19 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
});
});
/*统一车辆图片使用装备定义图片 2021-10-27 陈召*/
Map<Long, Equipment> keyMap = equipmentList.stream().collect(Collectors.toMap(BaseEntity::getId, Function.identity()));
/* 统一车辆图片使用装备定义图片 2021-10-27 陈召 */
Map<Long, Equipment> keyMap = equipmentList.stream()
.collect(Collectors.toMap(BaseEntity::getId, Function.identity()));
List<EquipmentCategory> categoryList = iEquipmentCategoryService.list();
Map<Long, String> categoryMap = categoryList.stream().collect(Collectors.toMap(BaseEntity::getId, EquipmentCategory::getName));
Map<Long, String> categoryMap = categoryList.stream()
.collect(Collectors.toMap(BaseEntity::getId, EquipmentCategory::getName));
List<UploadFile> fileList = iUploadFileService.list(new LambdaQueryWrapper<UploadFile>()
.eq(UploadFile::getObjectType, "car")
.eq(UploadFile::getFileType, "image"));
.eq(UploadFile::getObjectType, "car").eq(UploadFile::getFileType, "image"));
// 车载装备
List<Map<String, Object>> carResourceMapList = this.baseMapper.getCarResourceMapList(null);
Map<String, List<Map<String, Object>>> carResourceMap =
carResourceMapList.stream().collect(Collectors.groupingBy(car -> car.get("carId").toString()));
Map<String, List<Map<String, Object>>> carResourceMap = carResourceMapList.stream()
.collect(Collectors.groupingBy(car -> car.get("carId").toString()));
return carList.stream().map(car -> {
CarInfoDto carInfoVo = new CarInfoDto();
Bean.copyExistPropertis(car, carInfoVo);
......@@ -922,8 +928,11 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
CarIndexVo carIndexVo = new CarIndexVo();
carIndexVo.setId(car.getId());
List<CarPropertyVo> propertyList = carPropertyService.getCarPropertyList(carIndexVo);
List<CarPropertyVo> fireVehicleInfoList = propertyList.stream().filter(propertyVo -> 0 == propertyVo.getIsIot()).collect(Collectors.toList());
List<CarPropertyVo> fireVehicleMeasurementList = propertyList.stream().filter(propertyVo -> propertyVo.getIsIot() != null && 1 == propertyVo.getIsIot()).collect(Collectors.toList());
List<CarPropertyVo> fireVehicleInfoList = propertyList.stream().filter(propertyVo -> 0 == propertyVo.getIsIot())
.collect(Collectors.toList());
List<CarPropertyVo> fireVehicleMeasurementList = propertyList.stream()
.filter(propertyVo -> propertyVo.getIsIot() != null && 1 == propertyVo.getIsIot())
.collect(Collectors.toList());
syncDataService.syncCreatedFireVehicleInfo(fireVehicleInfoList);
syncDataService.syncCreatedFireVehicleMeasurement(fireVehicleMeasurementList);
}
......@@ -931,8 +940,11 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public void dataSyncDeletedIds(List<Long> carIds) {
List<CarPropertyVo> propertyList = carPropertyService.getCarPropertyListByCarIds(carIds);
List<Long> fireVehicleInfoList = propertyList.stream().filter(propertyVo -> 0 == propertyVo.getIsIot()).map(CarPropertyVo::getId).collect(Collectors.toList());
List<Long> fireVehicleMeasurementList = propertyList.stream().filter(propertyVo -> propertyVo.getIsIot() != null && 1 == propertyVo.getIsIot()).map(CarPropertyVo::getId).collect(Collectors.toList());
List<Long> fireVehicleInfoList = propertyList.stream().filter(propertyVo -> 0 == propertyVo.getIsIot())
.map(CarPropertyVo::getId).collect(Collectors.toList());
List<Long> fireVehicleMeasurementList = propertyList.stream()
.filter(propertyVo -> propertyVo.getIsIot() != null && 1 == propertyVo.getIsIot())
.map(CarPropertyVo::getId).collect(Collectors.toList());
syncDataService.syncDeletedFireVehicleInfo(fireVehicleInfoList);
syncDataService.syncDeletedFireVehicleMeasurement(fireVehicleMeasurementList);
}
......@@ -954,8 +966,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
public Car updateOneById(Car car) {
String orgCode = remoteSecurityService.getAgencyUser().getCompanys().get(0).getOrgCode();
car.setOrgCode(orgCode);
// @TableField(updateStrategy = FieldStrategy.IGNORED) 置空不生效 为空单独设置 by kongfm 2021-09-09
this.update(new LambdaUpdateWrapper<Car>().set(Car::getAgencyId, car.getAgencyId()).set(Car::getTeamId, car.getTeamId()).eq(Car::getId, car.getId()));
// @TableField(updateStrategy = FieldStrategy.IGNORED) 置空不生效 为空单独设置 by kongfm
// 2021-09-09
this.update(new LambdaUpdateWrapper<Car>().set(Car::getAgencyId, car.getAgencyId())
.set(Car::getTeamId, car.getTeamId()).eq(Car::getId, car.getId()));
boolean update = this.updateById(car);
// AST数据同步
if (update && syncSwitch) {
......@@ -1072,7 +1086,6 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
car.setImportStr(car.getIsImport() ? "进口" : "国产");
}
if (!ObjectUtils.isEmpty(car.getIotCode())) {
Double monthTravel = 0.0;
Double totalTravel = 0.0;
......@@ -1085,8 +1098,9 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
// .ge("travel", 0.5)
List<WlCarMileage> list = iWlCarMileageService.list(wrapper);
for (WlCarMileage wl : list) {
//判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
if (!ObjectUtils.isEmpty(wl.getTakeTime()) && !ObjectUtils.isEmpty(wl.getTravel()) && ((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED)) {
// 判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
if (!ObjectUtils.isEmpty(wl.getTakeTime()) && !ObjectUtils.isEmpty(wl.getTravel())
&& ((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED)) {
totalTravel += wl.getTravel();
if (DateUtil.format(wl.getStartTime(), "yyyy-MM").equals(currentYearAndMonth)) {
monthTravel += wl.getTravel();
......@@ -1099,7 +1113,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
.getOne(new LambdaQueryWrapper<WlCarMileage>().eq(WlCarMileage::getIotCode, car.getIotCode())
.orderByDesc(WlCarMileage::getEndTime).last("limit 1"));
car.setSpeed(last != null ? last.getEndSpeed() : null);
//产品 和 设备 各8位
// 产品 和 设备 各8位
if (car.getIotCode().length() >= 16) {
car.setIotMeasurement(car.getIotCode().substring(0, 8));
car.setIotDeviceName(car.getIotCode().substring(8, car.getIotCode().length()));
......@@ -1217,8 +1231,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
if (!ValidationUtil.isEmpty(cars)) {
List<String> carIdList = Lists.transform(cars, CarStatusInfoDto::getSequenceNbr);
List<Car> carList = carMapper.selectBatchIds(carIdList);
Map<String, String> carStatusMap =
cars.stream().collect(Collectors.toMap(CarStatusInfoDto::getSequenceNbr, CarStatusInfoDto::getStatus));
Map<String, String> carStatusMap = cars.stream()
.collect(Collectors.toMap(CarStatusInfoDto::getSequenceNbr, CarStatusInfoDto::getStatus));
carList.forEach(car -> {
String carStatusCode = carStatusMap.get(car.getId().toString());
// 可进行更新操作
......@@ -1245,9 +1259,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
List<CarPropertyVo> propertyList = getCarPropertyList(idList, null, nameKeys, 1);
if (!CollectionUtils.isEmpty(propertyList)) {
list.stream().forEach(x -> {
List<CarPropertyVo> collect = propertyList.stream().filter(y -> y.getCarId().equals(x.getSequenceNbr())).collect(Collectors.toList());
final Double[] longitudeVal = {null};
final Double[] latitudeVal = {null};
List<CarPropertyVo> collect = propertyList.stream()
.filter(y -> y.getCarId().equals(x.getSequenceNbr())).collect(Collectors.toList());
final Double[] longitudeVal = { null };
final Double[] latitudeVal = { null };
collect.stream().forEach(z -> {
String nameKey = z.getNameKey();
String value = z.getValue();
......@@ -1269,7 +1284,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
if (longitudeVal[0] != null && latitudeVal[0] != null) {
GlobalCoordinates source = new GlobalCoordinates(longitudeVal[0], latitudeVal[0]);
GlobalCoordinates target = new GlobalCoordinates(longitude, latitude);
double distance = new GeodeticCalculator().calculateGeodeticCurve(Ellipsoid.Sphere, source, target).getEllipsoidalDistance();
double distance = new GeodeticCalculator()
.calculateGeodeticCurve(Ellipsoid.Sphere, source, target).getEllipsoidalDistance();
BigDecimal decimal = new BigDecimal(distance / 1000);
x.setDistance(decimal.setScale(2, BigDecimal.ROUND_HALF_DOWN).doubleValue());
}
......@@ -1316,7 +1332,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carForUE4VO.setCarType(equipment.getEquipmentCategory().getName());
// 数据库字段（is_import 0->国产， 1->进口）
carForUE4VO.setIsImport(Boolean.TRUE.equals(car.getIsImport()) ? TrueOrFalseEnum.real.desc : TrueOrFalseEnum.fake.desc);
carForUE4VO.setIsImport(
Boolean.TRUE.equals(car.getIsImport()) ? TrueOrFalseEnum.real.desc : TrueOrFalseEnum.fake.desc);
carForUE4VO.setBrand(car.getBrand());
QueryWrapper<SystemDic> countryQueryWrapper = new QueryWrapper<>();
countryQueryWrapper.eq("id", car.getCountry());
......@@ -1325,7 +1342,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carForUE4VO.setStandard(car.getStandard());
ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(car.getManufacturerId());
carForUE4VO.setManufacturerName(manufacturerInfo.getName());
carForUE4VO.setCccAuth(Boolean.TRUE.equals(car.getCccAuth()) ? TrueOrFalseEnum.real.flag : TrueOrFalseEnum.fake.flag);
carForUE4VO.setCccAuth(
Boolean.TRUE.equals(car.getCccAuth()) ? TrueOrFalseEnum.real.flag : TrueOrFalseEnum.fake.flag);
QueryWrapper<SystemDic> chassisCountryQueryWrapper = new QueryWrapper<>();
chassisCountryQueryWrapper.eq("id", car.getChassisCountry());
SystemDic dic = iSystemDicService.getBaseMapper().selectOne(chassisCountryQueryWrapper);
......@@ -1335,24 +1353,25 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarInfoDto> equipmentCarList(Page<CarInfoDto> pag, Long teamId, String name, String code, Long id, Boolean isNo) {
public Page<CarInfoDto> equipmentCarList(Page<CarInfoDto> pag, Long teamId, String name, String code, Long id,
Boolean isNo) {
List<Car> carList = carMapper.equipmentCarList(pag.offset(), pag.getSize(), teamId, name, code, id, isNo);
int num = carMapper.equipmentCarListcount(teamId, name, code, id, isNo);
List<Equipment> equipmentList = iEquipmentService.list();
Map<Long, Equipment> keyMap = equipmentList.stream().collect(Collectors.toMap(BaseEntity::getId, Function.identity()));
Map<Long, Equipment> keyMap = equipmentList.stream()
.collect(Collectors.toMap(BaseEntity::getId, Function.identity()));
List<EquipmentCategory> categoryList = iEquipmentCategoryService.list();
Map<Long, String> categoryMap = categoryList.stream().collect(Collectors.toMap(BaseEntity::getId, EquipmentCategory::getName));
Map<Long, String> categoryMap = categoryList.stream()
.collect(Collectors.toMap(BaseEntity::getId, EquipmentCategory::getName));
List<UploadFile> fileList = iUploadFileService.list(new LambdaQueryWrapper<UploadFile>()
.eq(UploadFile::getObjectType, "car")
.eq(UploadFile::getFileType, "image"));
.eq(UploadFile::getObjectType, "car").eq(UploadFile::getFileType, "image"));
// 车载装备
List<Map<String, Object>> carResourceMapList = this.baseMapper.getCarResourceMapList(null);
Map<String, List<Map<String, Object>>> carResourceMap =
carResourceMapList.stream().collect(Collectors.groupingBy(car -> car.get("carId").toString()));
Map<String, List<Map<String, Object>>> carResourceMap = carResourceMapList.stream()
.collect(Collectors.groupingBy(car -> car.get("carId").toString()));
List<CarInfoDto> CarInfoDtoList = carList.stream().map(car -> {
CarInfoDto carInfoVo = new CarInfoDto();
Bean.copyExistPropertis(car, carInfoVo);
......@@ -1362,8 +1381,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carInfoVo.setCategoryId(equipment != null ? equipment.getCategoryId() : null);
carInfoVo.setCategoryName(categoryMap.get(carInfoVo.getCategoryId()));
carInfoVo.setImage(fileList.stream().filter(f -> f.getObjectId().equals(car.getId())).map(UploadFile::getUrl).collect(Collectors.toList()));
carInfoVo.setImage(fileList.stream().filter(f -> f.getObjectId().equals(car.getId()))
.map(UploadFile::getUrl).collect(Collectors.toList()));
if (equipment.getImg() != null) {
List<String> img = new ArrayList<>();
......@@ -1371,7 +1390,6 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carInfoVo.setImage(img);
}
carInfoVo.setResourceList(carResourceMap.get(car.getId().toString()));
return carInfoVo;
}).collect(Collectors.toList());
......@@ -1402,11 +1420,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
private String buildKey(Map<String, Object> row) {
return SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + row.get("bizOrgCode").toString() + "_" + SourceTypeEnum.CAR.getCode() + "_" + row.get("categoryCode").toString();
return SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + row.get("bizOrgCode").toString() + "_"
+ SourceTypeEnum.CAR.getCode() + "_" + row.get("categoryCode").toString();
}
private String iotbuildKey(Map<String, Object> row) {
return SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + row.get("bizOrgCode").toString() + "_" + SourceTypeEnum.IOT.getCode() + "_" + row.get("categoryCode").toString();
return SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + row.get("bizOrgCode").toString() + "_"
+ SourceTypeEnum.IOT.getCode() + "_" + row.get("categoryCode").toString();
}
@Override
......@@ -1443,32 +1463,36 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public List<Car> location(String orgCode) {
List<Car> list = this.list(new LambdaQueryWrapper<Car>().like(Car::getBizOrgCode, orgCode));
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
return list;
}
@Override
public Map<String, Integer> getCountOfCar() {
public Map<String, Integer> getCountOfCar(String orgCode) {
Map<String, Integer> map = new HashMap<>();
map.put("countofCar", this.list(new QueryWrapper<Car>().groupBy("id")).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() {
public Map<String, Integer> getCountOfCarBelongCompany(String orgCode) {
Map<String, Integer> map = new HashMap<>();
map.put("countofCompany", this.list(new QueryWrapper<Car>().groupBy("biz_org_code")).size());
map.put("countofCompany",
this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode).groupBy(Car::getBizOrgCode))
.size());
return map;
}
@Override
public List<ChartIntegerDto> getCarCategoryInfo() {
public List<ChartIntegerDto> getCarCategoryInfo(String orgCode) {
List<ChartIntegerDto> list1 = new ArrayList<>();
List<EquipmentCategory> list = equipmentCategoryMapper.selectList(new QueryWrapper<EquipmentCategory>().isNotNull("parent_id"));
List<EquipmentCategory> list = equipmentCategoryMapper
.selectList(new QueryWrapper<EquipmentCategory>().isNotNull("parent_id"));
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
ChartIntegerDto chartIntegerDto = new ChartIntegerDto();
Integer count = carMapper.getCarCategoryCountByCategoryID(list.get(i).getId());
Integer count = carMapper.getCarCategoryCountByCategoryID(list.get(i).getId(),orgCode);
chartIntegerDto.setName(list.get(i).getName());
chartIntegerDto.setValue(count);
list1.add(chartIntegerDto);
......@@ -1478,7 +1502,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord) {
public Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord,String orgCode) {
// BasicTableDataDto basicTableDataDto = new BasicTableDataDto();
// List<ColModel> colModels = new ArrayList<>();
// colModels.add(new ColModel("carNum","车牌号"));
......@@ -1487,11 +1511,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
// colModels.add(new ColModel("extra2","设备电量"));
Page<CarEquipStateInfoDto> page = new Page<>();
List<CarEquipStateInfoDto> result = new ArrayList<>();
List<Car> list = this.list();
if ((!ObjectUtils.isEmpty(keyWord))&&StringUtils.isNotEmpty(keyWord)) {
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
if ((!ObjectUtils.isEmpty(keyWord)) && StringUtils.isNotEmpty(keyWord)) {
list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
}
list = list.stream().filter(car->!ObjectUtils.isEmpty(car.getExtra2())).sorted(Comparator.comparing(Car::getExtra2, Comparator.comparingDouble(Double::valueOf)).reversed()).collect(Collectors.toList());
list = list.stream().filter(car -> !ObjectUtils.isEmpty(car.getExtra2()))
.sorted(Comparator.comparing(Car::getExtra2, Comparator.comparingDouble(Double::valueOf)).reversed())
.collect(Collectors.toList());
for (int i = 0; i < list.size(); i++) {
Car car = list.get(i);
CarEquipStateInfoDto carEquipStateInfoDto = new CarEquipStateInfoDto();
......@@ -1530,9 +1556,11 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord) {
public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord,String orgCode) {
Page<CarEquipAlarmInfoDto> page = new Page<>();
List<Car> list = this.list().stream().filter(car -> Integer.valueOf(car.getExtra2()) < carEquipAlarmBatteryNumber).collect(Collectors.toList());
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode)).stream()
.filter(car -> Integer.valueOf(car.getExtra2()) < carEquipAlarmBatteryNumber)
.collect(Collectors.toList());
if (StringUtils.isNotEmpty(keyWord)) {
list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
}
......@@ -1555,13 +1583,14 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
public List<ChartIntegerDto> getCarBelongAreaInfo() {
List<ChartIntegerDto> list = new ArrayList<>();
FeignClientResult<java.util.Collection<CompanyModel>> de = Privilege.companyClient.queryAgencyTree(null);
//如果是公司则获取所有片区
// 如果是公司则获取所有片区
CompanyModel[] companyModelList = de.getResult().toArray(new CompanyModel[0]);
if (companyModelList.length == 1 && companyModelList[0].getLevel().equals("headquarter")) {
List<CompanyModel> companyModels = new ArrayList<CompanyModel>(companyModelList[0].getChildren());
for (int i = 0; i < companyModels.size(); i++) {
ChartIntegerDto chartIntegerDto = new ChartIntegerDto();
CompanyModel companyModel1 = JSON.parseObject(JSON.toJSONString(companyModels.get(i)), CompanyModel.class);
CompanyModel companyModel1 = JSON.parseObject(JSON.toJSONString(companyModels.get(i)),
CompanyModel.class);
Integer count = this.count(new QueryWrapper<Car>().like("biz_org_code", companyModel1.getOrgCode()));
chartIntegerDto.setName(companyModel1.getCompanyName());
chartIntegerDto.setCompanyId(companyModel1.getSequenceNbr());
......@@ -1578,8 +1607,9 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
List<CarAreaInfoDto> list = new ArrayList<>();
CompanyModel companyModelArea = Privilege.companyClient.queryByCompanyName(areaName).getResult();
if (companyModelArea != null) {
FeignClientResult<java.util.Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyModelArea.getSequenceNbr());
//如果是公司则获取所有片区
FeignClientResult<java.util.Collection<CompanyModel>> de = Privilege.companyClient
.querySubAgencyTree(companyModelArea.getSequenceNbr());
// 如果是公司则获取所有片区
ArrayList<CompanyModel> companyModels = (ArrayList<CompanyModel>) de.getResult();
if (companyModels.size() > 0) {
for (int i = 0; i < companyModels.size(); i++) {
......@@ -1601,7 +1631,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize, String keyWord) {
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", "车牌号"));
......@@ -1609,7 +1639,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
colModels.add(new ColModel("bizOrgName", "所属单位"));
colModels.add(new ColModel("total", "当月里程"));
List<MileageDto> mileageDtoList = new ArrayList<>();
List<Car> list = this.list();
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
if (StringUtils.isNotEmpty(keyWord)) {
list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
}
......@@ -1633,19 +1663,22 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
mileageDtoList.add(mileageDto);
}
}
mileageDtoList = mileageDtoList.stream().sorted(Comparator.comparing(MileageDto::getTotalTravel).reversed()).collect(Collectors.toList());
Integer from = (current - 1) * pageSize > mileageDtoList.size() ? mileageDtoList.size() : (current - 1) * pageSize;
mileageDtoList = mileageDtoList.stream().sorted(Comparator.comparing(MileageDto::getTotalTravel).reversed())
.collect(Collectors.toList());
Integer from = (current - 1) * pageSize > mileageDtoList.size() ? mileageDtoList.size()
: (current - 1) * pageSize;
Integer to = current * pageSize > mileageDtoList.size() ? mileageDtoList.size() : current * pageSize;
DataGridMock mypageDto = new DataGridMock(current, mileageDtoList.size(), true, current, mileageDtoList.subList(from, to));
DataGridMock mypageDto = new DataGridMock(current, mileageDtoList.size(), true, current,
mileageDtoList.subList(from, to));
basicTableDataDto.setDataGridMock(mypageDto);
basicTableDataDto.setColModel(colModels);
return basicTableDataDto;
}
@Override
public List<CarExportDto> exportCarMileageInfoByMoth(String date, String keyWord) {
public List<CarExportDto> exportCarMileageInfoByMoth(String date, String keyWord,String orgCode) {
List<CarExportDto> carExportDtos = new ArrayList<>();
List<Car> list = this.list();
List<Car> list = this.list(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
if (StringUtils.isNotEmpty(keyWord)) {
list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
}
......@@ -1671,14 +1704,15 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carExportDtos.add(carExportDto);
}
}
Collections.sort(carExportDtos, (e1, e2) -> Double.valueOf(e2.getTotalTravelValue()).compareTo(Double.valueOf(e1.getTotalTravelValue())));
Collections.sort(carExportDtos, (e1, e2) -> Double.valueOf(e2.getTotalTravelValue())
.compareTo(Double.valueOf(e1.getTotalTravelValue())));
return carExportDtos;
}
@Override
public ZZChartsDto getCarMileageInfoByMothOFDay(String iotCode) {
ZZChartsDto zzChartsDto = new ZZChartsDto();
//X轴数据
// X轴数据
List<String> x = new ArrayList<>();
// Y轴数据
List<Double> y = new ArrayList<>();
......@@ -1703,13 +1737,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public Page<CarExceptionDto> getCarExcepitonTrack(Integer type, String keyWord) {
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"));
String endDate = localDate.toString();
String startDate = localDate.plusDays((0 - type)).toString();
List<Car> list = carMapper.selectList(new QueryWrapper<>());
List<Car> list = carMapper.selectList(new LambdaQueryWrapper<Car>().likeRight(Car::getBizOrgCode, orgCode));
if (StringUtils.isNotEmpty(keyWord)) {
list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
}
......@@ -1717,7 +1751,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
for (int i = 0; i < list.size(); i++) {
CarExceptionDto carExceptionDto = new CarExceptionDto();
Car car = list.get(i);
Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDateProd(startDate, endDate, list.get(i).getIotCode());
Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDateProd(startDate, endDate,
list.get(i).getIotCode());
if (totalTravel <= 0.0) {
carExceptionDto.setCarId(String.valueOf(car.getId()));
carExceptionDto.setCarNumber(car.getCarNum());
......@@ -1734,8 +1769,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
}
@Override
public BasicTableDataDto getCarWarningRecord(String keyWord, Integer current, Integer pageSize) {
BasicTableDataDto basicTableDataDto=new BasicTableDataDto();
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<>();
colModels.add(new ColModel("carNum", "车牌号"));
......@@ -1751,18 +1786,28 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
queryWrapper.like("biz_org_name", keyWord);
}
queryWrapper.orderByDesc("over_speed");
queryWrapper.last("limit "+ (current-1)*pageSize+","+current*pageSize);
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)
{
queryWrapper.in("car_num", carnums);
}
List<CarSpeedWarningRecord> list = wlCarSpeedWaringRecordMapper.selectList(queryWrapper);
DataGridMock dataGridMock = new DataGridMock(current,wlCarSpeedWaringRecordMapper.getCountOfRecords(),true,current,list);
DataGridMock dataGridMock = new DataGridMock(current, wlCarSpeedWaringRecordMapper.getCountOfRecords(), true,
current, list);
basicTableDataDto.setDataGridMock(dataGridMock);
basicTableDataDto.setColModel(colModels);
return basicTableDataDto;
}
@Override
public List<Map<String, String>> getBizOrgName() {
public List<Map<String, String>> getBizOrgName(String orgCode) {
List<Map<String, String>> result = new ArrayList<>();
List<Car> cars = this.list(new QueryWrapper<Car>().groupBy("biz_org_name"));
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));
......@@ -1783,7 +1828,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public void updateCarQrCode(List<Map<String, String>> mapList, String status) {
if (!CollectionUtils.isEmpty(mapList)) {
List<String> carIds = mapList.stream().map(m -> m.get("sourceId")).filter(Objects::nonNull).collect(Collectors.toList());
List<String> carIds = mapList.stream().map(m -> m.get("sourceId")).filter(Objects::nonNull)
.collect(Collectors.toList());
carMapper.updateStatusByIds(carIds, status);
}
}
......
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