1.按月统计里程接口增加筛选、异常轨迹接口增加筛选。

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/CarSpeedWarningRecord.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -1415,14 +1415,14 @@ public class CarController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarEquipStateInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备状态信息", notes = "车辆统计-获取设备状态信息")
-    public Page<CarEquipStateInfoDto> getCarEquipStateInfo() {
-        return iCarService.getCarEquipStateInfo();
+    public Page<CarEquipStateInfoDto> getCarEquipStateInfo(@RequestParam(required = false) String keyWord,@RequestParam String flag) {
+        return iCarService.getCarEquipStateInfo(keyWord);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarEquipAlarmInfoDto", method = RequestMethod.GET)
     @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) {
         return iCarService.getCarEquipAlarmInfoDto(keyWord);
     }
 
@@ -1475,8 +1475,13 @@ public class CarController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarWarningRecord", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取超速信息", notes = "车辆统计-获取超速信息")
-    public Page<CarSpeedWarningRecord> getCarWarningRecord(@RequestParam(required = false) String keyWord) {
+    public Page<CarSpeedWarningRecord> getCarWarningRecord(@RequestParam(required = false) String keyWord,@RequestParam String flag) {
         return iCarService.getCarWarningRecord(keyWord);
     }
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/getBizOrgName", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "车辆统计-获取归属单位下拉框值", notes = "车辆统计-获取归属单位下拉框值")
+    public List<Map<String,String>> getBizOrgName(@RequestParam(required = false) String keyWord) {
+        return iCarService.getBizOrgName();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/CarExportDto.java

@@ -22,4 +22,6 @@ public class CarExportDto {
     @Excel(name = "里程数(km)")
     private String totalTravel;
 
+    private String totalTravelValue;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ICarService.java

@@ -18,10 +18,7 @@ import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.dto.*;
 import javassist.compiler.ast.Keyword;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 消防车信息 服务类
@@ -197,7 +194,7 @@ public interface ICarService extends IService<Car> {
     //  获取车辆归属单位总数
     Map<String,Integer> getCountOfCarBelongCompany();
      List<ChartIntegerDto> getCarCategoryInfo() ;
-    Page<CarEquipStateInfoDto> getCarEquipStateInfo();
+    Page<CarEquipStateInfoDto> getCarEquipStateInfo(String keyWord);
     Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord);
     List<ChartIntegerDto>getCarBelongAreaInfo() ;
     Page<CarAreaInfoDto> getCarAreaInfo(String areaName ) ;
@@ -206,6 +203,8 @@ public interface ICarService extends IService<Car> {
     ZZChartsDto getCarMileageInfoByMothOFDay(String iotCode);
     Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord);
     Page<CarSpeedWarningRecord> getCarWarningRecord(String keyWord);
+
+    List<Map<String,String>> getBizOrgName();
     /**
      * 查询车辆启动状态，赋码
      */