Skip to content

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

修改车辆统计过滤

parent a3344114
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 16 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 { ...@@ -1400,20 +1400,41 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCountOfCar", method = RequestMethod.GET) @RequestMapping(value = "/getCountOfCar", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆总数", notes = "车辆统计-获取车辆总数") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆总数", notes = "车辆统计-获取车辆总数")
public Map<String, Integer> getCountOfCar() { 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) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getCountOfCarBelongCompany", method = RequestMethod.GET) @RequestMapping(value = "/getCountOfCarBelongCompany", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆归属单位总数", notes = "车辆统计-获取车辆归属单位总数") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆归属单位总数", notes = "车辆统计-获取车辆归属单位总数")
public ResponseModel<Integer> getCountOfCarBelongCompany() { 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) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getCarCategoryInfo", method = RequestMethod.GET) @RequestMapping(value = "/getCarCategoryInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆分类用途信息", notes = "车辆统计-获取车辆分类用途信息") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆分类用途信息", notes = "车辆统计-获取车辆分类用途信息")
public List<ChartIntegerDto> getCarCategoryInfo() { 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(); return iCarService.getCarCategoryInfo();
} }
...@@ -1421,6 +1442,13 @@ public class CarController extends AbstractBaseController { ...@@ -1421,6 +1442,13 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCarEquipStateInfo", method = RequestMethod.GET) @RequestMapping(value = "/getCarEquipStateInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备状态信息", notes = "车辆统计-获取设备状态信息") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备状态信息", notes = "车辆统计-获取设备状态信息")
public Page<CarEquipStateInfoDto> getCarEquipStateInfo(@RequestParam(required = false) String keyWord) { 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); return iCarService.getCarEquipStateInfo(keyWord);
} }
...@@ -1429,6 +1457,13 @@ public class CarController extends AbstractBaseController { ...@@ -1429,6 +1457,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备告警信息", notes = "车辆统计-获取设备告警信息") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备告警信息", notes = "车辆统计-获取设备告警信息")
public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(@RequestParam(required = false) String keyWord, public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(@RequestParam(required = false) String keyWord,
@RequestParam String flag) { @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); return iCarService.getCarEquipAlarmInfoDto(keyWord);
} }
...@@ -1451,6 +1486,13 @@ public class CarController extends AbstractBaseController { ...@@ -1451,6 +1486,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计车辆里程", notes = "车辆统计-按照月份统计车辆里程") @ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计车辆里程", notes = "车辆统计-按照月份统计车辆里程")
public BasicTableDataDto getCarMileageInfoByMoth(@RequestParam(required = false) String date, public BasicTableDataDto getCarMileageInfoByMoth(@RequestParam(required = false) String date,
@RequestParam Integer current, @RequestParam Integer size, @RequestParam(required = false) String keyWord) { @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); return iCarService.getCarMileageInfoByMoth(date, current, size, keyWord);
} }
...@@ -1459,6 +1501,13 @@ public class CarController extends AbstractBaseController { ...@@ -1459,6 +1501,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计导出车辆里程", notes = "车辆统计-按照月份统计导出车辆里程") @ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计导出车辆里程", notes = "车辆统计-按照月份统计导出车辆里程")
public void exportCarMileageInfoByMoth(@RequestParam(required = false) String date, public void exportCarMileageInfoByMoth(@RequestParam(required = false) String date,
@RequestParam(required = false) String keyWord, HttpServletResponse response) { @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); List<CarExportDto> list = this.iCarService.exportCarMileageInfoByMoth(date, keyWord);
if (org.springframework.util.StringUtils.isEmpty(date)) { if (org.springframework.util.StringUtils.isEmpty(date)) {
date = DateUtil.format(new Date(), "yyyy-MM"); date = DateUtil.format(new Date(), "yyyy-MM");
...@@ -1471,7 +1520,7 @@ public class CarController extends AbstractBaseController { ...@@ -1471,7 +1520,7 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getCarMileageInfoByMothOFDay", method = RequestMethod.GET) @RequestMapping(value = "/getCarMileageInfoByMothOFDay", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计每天的车辆里程", notes = "车辆统计-按照月份统计每天的车辆里程") @ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计每天的车辆里程", notes = "车辆统计-按照月份统计每天的车辆里程")
public ZZChartsDto getCarMileageInfoByMothOFDay(@RequestParam String iotCode) { public ZZChartsDto getCarMileageInfoByMothOFDay(@RequestParam String iotCode) {
return iCarService.getCarMileageInfoByMothOFDay(iotCode); return iCarService.getCarMileageInfoByMothOFDay();
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
...@@ -1479,6 +1528,13 @@ public class CarController extends AbstractBaseController { ...@@ -1479,6 +1528,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-按照日期范围获取异常车辆", notes = "车辆统计-按照日期范围获取异常车辆") @ApiOperation(httpMethod = "GET", value = "车辆统计-按照日期范围获取异常车辆", notes = "车辆统计-按照日期范围获取异常车辆")
public Page<CarExceptionDto> getCarExcepitonTrack(@RequestParam Integer type, public Page<CarExceptionDto> getCarExcepitonTrack(@RequestParam Integer type,
@RequestParam(required = false) String keyWord) { @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); return iCarService.getCarExcepitonTrack(type, keyWord);
} }
...@@ -1487,6 +1543,13 @@ public class CarController extends AbstractBaseController { ...@@ -1487,6 +1543,13 @@ public class CarController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取超速信息", notes = "车辆统计-获取超速信息") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取超速信息", notes = "车辆统计-获取超速信息")
public BasicTableDataDto getCarWarningRecord(@RequestParam(required = false) String keyWord, public BasicTableDataDto getCarWarningRecord(@RequestParam(required = false) String keyWord,
@RequestParam Integer current, @RequestParam Integer size) { @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); return iCarService.getCarWarningRecord(keyWord, current, size);
} }
...@@ -1494,6 +1557,13 @@ public class CarController extends AbstractBaseController { ...@@ -1494,6 +1557,13 @@ public class CarController extends AbstractBaseController {
@RequestMapping(value = "/getBizOrgName", method = RequestMethod.GET) @RequestMapping(value = "/getBizOrgName", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "车辆统计-获取归属单位下拉框值", notes = "车辆统计-获取归属单位下拉框值") @ApiOperation(httpMethod = "GET", value = "车辆统计-获取归属单位下拉框值", notes = "车辆统计-获取归属单位下拉框值")
public List<Map<String, String>> getBizOrgName(@RequestParam(required = false) String keyWord) { 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(); 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> { ...@@ -85,7 +85,7 @@ public interface CarMapper extends BaseMapper<Car> {
List<Map<String, Object>> getCarState(); List<Map<String, Object>> getCarState();
List<Map<String, Object>> getFirePowerInfo(); List<Map<String, Object>> getFirePowerInfo();
Integer getCarCategoryCountByCategoryID(Long categoryID); Integer getCarCategoryCountByCategoryID(@Param("categoryID")Long categoryID,@Param("orgCode")String orgCode);
List<CarEquipStateInfoDto> getCarEquipStateInfo(); List<CarEquipStateInfoDto> getCarEquipStateInfo();
List<CarEquipAlarmInfoDto> getCarEquipAlarmInfo(Integer batteryNumber); 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> { ...@@ -190,21 +190,21 @@ public interface ICarService extends IService<Car> {
List<Car> location(String orgCode); List<Car> location(String orgCode);
// 获取车辆总数 // 获取车辆总数
Map<String,Integer> getCountOfCar(); Map<String,Integer> getCountOfCar(String orgCode);
// 获取车辆归属单位总数 // 获取车辆归属单位总数
Map<String,Integer> getCountOfCarBelongCompany(); Map<String,Integer> getCountOfCarBelongCompany(String orgCode);
List<ChartIntegerDto> getCarCategoryInfo() ; List<ChartIntegerDto> getCarCategoryInfo(String orgCode) ;
Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord); Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord,String orgCode);
Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord); Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord,String orgCode);
List<ChartIntegerDto>getCarBelongAreaInfo() ; List<ChartIntegerDto>getCarBelongAreaInfo() ;
Page<CarAreaInfoDto> getCarAreaInfo(String areaName ) ; Page<CarAreaInfoDto> getCarAreaInfo(String areaName) ;
BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize,String keyWord); BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize,String keyWord,String orgCode);
List<CarExportDto> exportCarMileageInfoByMoth(String date,String keyWord); List<CarExportDto> exportCarMileageInfoByMoth(String date,String keyWord,String orgCode);
ZZChartsDto getCarMileageInfoByMothOFDay(String iotCode); ZZChartsDto getCarMileageInfoByMothOFDay(String iotCode);
Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord); Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord,String orgCode);
BasicTableDataDto getCarWarningRecord(String keyWord,Integer current, Integer pageSize); 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/FireFightingSystemServiceImpl.java
View file @ 04aadfd1
...@@ -978,7 +978,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -978,7 +978,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
equipTypeAmountPage.setStatus(null); equipTypeAmountPage.setStatus(null);
} }
IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
.getColaCategoryAmountCarListJxiop(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage); .getColaCategoryAmountCarListJxiop(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
list.getRecords().forEach(x -> { list.getRecords().forEach(x -> {
if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) { if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
x.setAmount(x.getAmount().split("\\.")[0]); x.setAmount(x.getAmount().split("\\.")[0]);
......
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