Merge branch 'develop_dl' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl

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

@@ -116,13 +116,18 @@ public class Car extends BaseEntity {
 	@ApiModelProperty(value = "机构编码")
 	@TableField("biz_org_code")
 	private String bizOrgCode;
-
-
-
-
-
-
-
+    // 2023年11月6日 11点16分添加
+	@ApiModelProperty(value = "司机")
+	@TableField("driver")
+	private String driver;
+	// 2023年11月6日 11点16分添加
+	@ApiModelProperty(value = "联系电话")
+	@TableField("phone")
+	private String phone;
+	// 2023年11月6日 11点16分添加
+	@ApiModelProperty(value = "速度阈值")
+	@TableField("max_speed")
+	private Double maxSpeed;
 	@ApiModelProperty(value = "图片")
 	@TableField(exist = false)
 	private List<UploadFile> img;
@@ -177,7 +182,6 @@ public class Car extends BaseEntity {
 	@TableField(exist = false)
 	private String iotStatus;
 
-
 	@TableField(exist = false)
 	private Long categoryId;
 
@@ -232,4 +236,6 @@ public class Car extends BaseEntity {
 	@TableField(exist = false)
 	private String iotDeviceName;
 
+	@TableField(exist = false)
+	private Double monthTravel;
 }

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

+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentOnCarAppVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 消防车信息
+ *
+ * @author wujiang
+ * @date 2020-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value="wl_car_speed_warning_record",autoResultMap = true)
+@ApiModel(value = "车辆告警信息实体类", description = "车辆告警信息")
+public class CarSpeedWarningRecord extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "车牌号")
+	private String carNum;
+	@ApiModelProperty(value = "告警时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date waringDate;
+	@ApiModelProperty(value = "超速值")
+	@TableField("over_speed")
+	private Double overSpeed;
+	@ApiModelProperty(value = "机构/部门名称")
+	@TableField("biz_org_name")
+	private String bizOrgName;
+    // 2023年11月6日 11点16分添加
+	@ApiModelProperty(value = "司机")
+	@TableField("driver")
+	private String driver;
+	// 2023年11月6日 11点16分添加
+	@ApiModelProperty(value = "联系电话")
+	@TableField("phone")
+	private String phone;
+	@ApiModelProperty(value = "联系电话")
+	@TableField("ownership")
+	private String ownership;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml

@@ -75,6 +75,11 @@
             <version>2.4</version>
             <classifier>jdk15</classifier>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.10</version>
+        </dependency>
     </dependencies>
 
 </project>

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

 package com.yeejoin.equipmanage.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -73,22 +74,14 @@ public class CarController extends AbstractBaseController {
     @Lazy
     ICarService iCarService;
     @Autowired
-    private EquipmentMapper equipmentMapper;
-    @Autowired
     ISystemDicService iSystemDicService;
     @Autowired
-    private EquipmentCategoryMapper equipmentCategoryMapper;
-    @Autowired
     ICarInfoService iCarInfoService;
     @Autowired
     ICarPropertyService iCarPropertyService;
     @Autowired
     CarInfoMapper carInfoMapper;
     @Autowired
-    private ManufacturerInfoMapper manufacturerInfoMapper;
-    @Autowired
-    private CarPropertyMapper carPropertyMapper;
-    @Autowired
     IEquipmentOnCarService iEquipmentOnCarService;
     @Autowired
     ExtinguishantOnCarMapper extinguishantOnCarMapper;
@@ -97,35 +90,42 @@ public class CarController extends AbstractBaseController {
     @Autowired
     CarMapper carMapper;
     @Autowired
-    private EquipmentIndexMapper equipmentIndexMapper;
-    @Autowired
     EquipmentDetailMapper equipmentDetailMapper;
     @Autowired
     EquipmentQrcodeMapper equipmentQrcodeMapper;
-    @Resource(name = "productionQRCodeFactoryMap")
-    private Map<String, ProductionQRCode> messageHandMap;
-
     @Autowired
     ICarLonAndLatDataService iCarLonAndLatDataService;
-
     @Lazy
     @Autowired
     IEquipmentService iEquipmentService;
-
     @Autowired
     IEquipmentDetailService iEquipmentDetailService;
-
     @Autowired
     IEquipmentQrcodeService iEquipmentQrcodeService;
-
     @Autowired
     IEquipmentIndexService iEquipmentIndexService;
-
+    @Autowired
+    ISourceStatistics iSourceStatistics;
+    @Autowired
+    JcsFeign jcsFeign;
+    @Autowired
+    FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
+    @Autowired
+    private EquipmentMapper equipmentMapper;
+    @Autowired
+    private EquipmentCategoryMapper equipmentCategoryMapper;
+    @Autowired
+    private ManufacturerInfoMapper manufacturerInfoMapper;
+    @Autowired
+    private CarPropertyMapper carPropertyMapper;
+    @Autowired
+    private EquipmentIndexMapper equipmentIndexMapper;
+    @Resource(name = "productionQRCodeFactoryMap")
+    private Map<String, ProductionQRCode> messageHandMap;
     @Autowired
     private ISyncDataService syncDataService;
     @Value("${redis_equip_type_count}")
     private String equipTypeAndCount;
-
     @Value("${redis_car_type_count}")
     private String carTypeAndCount;
     @Autowired
@@ -136,26 +136,14 @@ public class CarController extends AbstractBaseController {
     private String appKeyApp;
     @Value("${iot.vehicle.track}")
     private String iotServerName;
-
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
-
     @Value("${auth-key-fire-car}")
     private String carAuthKey;
-
     @Value("${auth-key-fire-iot-equip:fire_iot-equip_info}")
     private String iotAuthKey;
-
-    @Autowired
-    ISourceStatistics iSourceStatistics;
-
     @Autowired
     private RedisUtils redisUtils;
-    @Autowired
-    JcsFeign jcsFeign;
-    @Autowired
-    FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
-
     @Value("${iot.code.prefix.have.used:20210003,20210004,20210005}")
     private String haveUsedIotPrefix;
 
@@ -198,12 +186,12 @@ public class CarController extends AbstractBaseController {
         }
         // 验证车辆code唯一性
         String iotCode = car.getIotCode();
-        if(StringUtils.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())){
-            Car ar= carMapper.getCarsByIotCode(car.getIotCode());
-            if(ar!=null){
+        if (StringUtils.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())) {
+            Car ar = carMapper.getCarsByIotCode(car.getIotCode());
+            if (ar != null) {
                 throw new BadRequest("物联编码重复");
             }
-            if(StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)){
+            if (StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)) {
                 throw new BadRequest("物联编码航班已占用");
             }
         }
@@ -270,7 +258,6 @@ public class CarController extends AbstractBaseController {
 //    }
 
 
-
     @Async("equipAsyncExecutor")
     public void refreshAllCount() {
         // 清空单位装备分类树缓存
@@ -349,26 +336,25 @@ public class CarController extends AbstractBaseController {
         // saveFile(carInstance);视频图片文件后期统一处理
 
         String iotCode = car.getIotCode();
-        if(StringUtil.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())){
-            Car ar= carMapper.getCarsByIotCodeExcludeCarId(car.getIotCode(),car.getId());
-            if(ar != null){
+        if (StringUtil.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())) {
+            Car ar = carMapper.getCarsByIotCodeExcludeCarId(car.getIotCode(), car.getId());
+            if (ar != null) {
                 throw new BadRequest("物联编码重复");
             }
-            if(StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)){
+            if (StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)) {
                 throw new BadRequest("物联编码航班已占用");
             }
         }
 
 
-
         //用来解绑车辆
-        if (!ObjectUtils.isEmpty(car.getTeamId())){
-            jcsFeign.getUserCar(car.getId(),car.getTeamId());
+        if (!ObjectUtils.isEmpty(car.getTeamId())) {
+            jcsFeign.getUserCar(car.getId(), car.getTeamId());
         }
 
         Equipment equipment = iEquipmentService.getById(car.getEquipmentId());
         car.setName(equipment != null ? equipment.getName() : null);
-        
+
         if (ObjectUtils.isEmpty(car.getBizOrgName()) && !ObjectUtils.isEmpty(car.getBizOrgCode())) {
             FeignClientResult<Map<String, Object>> result = Privilege.companyClient.queryByOrgcode(car.getBizOrgCode());
             System.out.println("==============================" + JSONObject.toJSONString(result.getResult()));
@@ -421,7 +407,7 @@ public class CarController extends AbstractBaseController {
      * @return
      */
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public Car selectById(HttpServletRequest request, @PathVariable Long id) {
         return iCarService.selectOneById(id);
@@ -429,6 +415,7 @@ public class CarController extends AbstractBaseController {
 
     /**
      * 电建项目-车辆信息详情（表单组件格式导致白屏修复）
+     *
      * @param request
      * @param id
      * @return
@@ -466,7 +453,7 @@ public class CarController extends AbstractBaseController {
     @RequestMapping(value = "/peoperty", method = RequestMethod.POST)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "根据id查询", notes = "根据id查询")
-    public Map<String, Object>  getCarPropertyByCarIds(@RequestBody List<Long> carIds) {
+    public Map<String, Object> getCarPropertyByCarIds(@RequestBody List<Long> carIds) {
         return iCarPropertyService.getCarPropertyByCarIds(carIds);
     }
 
@@ -486,7 +473,7 @@ public class CarController extends AbstractBaseController {
     /**
      * 根据车辆id查询车辆详情信息，供iot_tree展示
      *
-     * @param carNum
+     * @param id
      * @return
      */
     @RequestMapping(value = "/threeDimensional/getCarDetailById/{id}", method = RequestMethod.GET)
@@ -1176,8 +1163,8 @@ public class CarController extends AbstractBaseController {
         Map<Long, List<CarIndexVo>> map = null;
 //        String orgCode = getOrgCode();
 
-        ReginParams ReginParams=getSelectedOrgInfo();
-        String   orgCode= ReginParams.getPersonIdentity().getBizOrgCode();
+        ReginParams ReginParams = getSelectedOrgInfo();
+        String orgCode = ReginParams.getPersonIdentity().getBizOrgCode();
 
         List<CarIndexVo> carVoList = iCarService.getCarsIotInfo(orgCode);
         if (!carVoList.isEmpty()) {
@@ -1331,7 +1318,7 @@ public class CarController extends AbstractBaseController {
     public ResponseModel getTeamCarList(@RequestParam(required = false) Long id,
                                         @RequestParam(required = false) String sequenceNbr,
                                         @RequestParam(required = false) Double longitude, @RequestParam(required = false) Double latitude) {
-        return CommonResponseUtil.success(iCarService.getTeamCarList(sequenceNbr,id, longitude, latitude));
+        return CommonResponseUtil.success(iCarService.getTeamCarList(sequenceNbr, id, longitude, latitude));
     }
 
     /**
@@ -1350,7 +1337,7 @@ public class CarController extends AbstractBaseController {
     /**
      * 根据查询车辆简要信息
      *
-     * @param id
+     * @param carNum
      * @return
      */
     @RequestMapping(value = "/state/info", method = RequestMethod.GET)
@@ -1396,82 +1383,100 @@ public class CarController extends AbstractBaseController {
         return ResponseHelper.buildResponse(iCarService.getQRCode(id));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/location", method = RequestMethod.GET)
-        @ApiOperation(httpMethod = "GET", value = "获取二维码图片", notes = "获取二维码图片")
-        public ResponseModel<Object> location() throws Exception {
+    @ApiOperation(httpMethod = "GET", value = "获取二维码图片", notes = "获取二维码图片")
+    public ResponseModel<Object> location() throws Exception {
         return ResponseHelper.buildResponse(iCarService.location());
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCountOfCar", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆总数", notes = "车辆统计-获取车辆总数")
-    public Map<String, Integer>  getCountOfCar() {
+    public Map<String, Integer> getCountOfCar() {
         return iCarService.getCountOfCar();
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @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());
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarCategoryInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆分类用途信息", notes = "车辆统计-获取车辆分类用途信息")
     public List<ChartIntegerDto> getCarCategoryInfo() {
         return iCarService.getCarCategoryInfo();
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarEquipStateInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备状态信息", notes = "车辆统计-获取设备状态信息")
     public Page<CarEquipStateInfoDto> getCarEquipStateInfo() {
         return iCarService.getCarEquipStateInfo();
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarEquipAlarmInfoDto", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备告警信息", notes = "车辆统计-获取设备告警信息")
-    public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto() {
-        return iCarService.getCarEquipAlarmInfoDto();
+    public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(@RequestParam(required = false) String keyWord) {
+        return iCarService.getCarEquipAlarmInfoDto(keyWord);
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarBelongAreaInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取车辆归属信息接口", notes = "车辆统计-获取车辆归属信息接口")
     public List<ChartIntegerDto> getCarBelongAreaInfo() {
         return iCarService.getCarBelongAreaInfo();
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @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);
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarMileageInfoByMoth", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计车辆里程", notes = "车辆统计-按照月份统计车辆里程")
-    public Page<MileageDto> getCarMileageInfoByMoth(@RequestParam String date) {
-        return iCarService.getCarMileageInfoByMoth(date);
+    public BasicTableDataDto getCarMileageInfoByMoth(@RequestParam(required = false) String date, @RequestParam Integer current, @RequestParam Integer size,@RequestParam(required = false) String keyWord) {
+        return iCarService.getCarMileageInfoByMoth(date, current, size, keyWord);
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/exportCarMileageInfoByMoth", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计导出车辆里程", notes = "车辆统计-按照月份统计导出车辆里程")
-    public void exportCarMileageInfoByMoth(@RequestParam String date, HttpServletResponse response) {
-            List<CarExportDto> list = this.iCarService.exportCarMileageInfoByMoth(date);
-            String name = "车辆里程月度统计表-"+date;
-            FileHelper.exportExcel(list,name,name,CarExportDto.class,UUID.randomUUID().toString()+".xls",response);
+    public void exportCarMileageInfoByMoth(@RequestParam(required = false) String date,@RequestParam(required = false) String keyWord, HttpServletResponse response) {
+        List<CarExportDto> list = this.iCarService.exportCarMileageInfoByMoth(date,keyWord);
+        if (org.springframework.util.StringUtils.isEmpty(date)) {
+            date = DateUtil.format(new Date(), "yyyy-MM");
+        }
+        String name = "车辆里程月度统计表-" + date;
+        FileHelper.exportExcel(list, name, name, CarExportDto.class, UUID.randomUUID().toString() + ".xls", response);
     }
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarMileageInfoByMothOFDay", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-按照月份统计每天的车辆里程", notes = "车辆统计-按照月份统计每天的车辆里程")
     public ZZChartsDto getCarMileageInfoByMothOFDay(@RequestParam String iotCode) {
         return iCarService.getCarMileageInfoByMothOFDay(iotCode);
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarExcepitonTrack", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-按照日期范围获取异常车辆", notes = "车辆统计-按照日期范围获取异常车辆")
-    public Page<CarExceptionDto> getCarExcepitonTrack(@RequestParam Integer type) {
-        return iCarService.getCarExcepitonTrack(type);
+    public Page<CarExceptionDto> getCarExcepitonTrack(@RequestParam Integer type,@RequestParam(required = false) String keyWord) {
+        return iCarService.getCarExcepitonTrack(type,keyWord);
     }
+    @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) {
+        return iCarService.getCarWarningRecord(keyWord);
+    }
+
 }

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

@@ -86,7 +86,7 @@ public class BasicTableDataDto {
 //        }
 //	]
 //    }
-    private MypageDto dataGridMock;
+    private DataGridMock  dataGridMock;
     private List<ColModel> colModel ;
 
 }

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

@@ -9,6 +9,10 @@ public class CarExportDto {
     private String code;
     @Excel(name="车牌号")
     private String carNumber;
+    @Excel(name = "司机")
+    private String driver;
+    @Excel(name = "联系电话")
+    private String phone;
     @Excel(name="所属单位")
     private String orgName;
     @Excel(name="车辆型号")
@@ -17,4 +21,5 @@ public class CarExportDto {
     private String displacement;
     @Excel(name = "里程数(km)")
     private String totalTravel;
+
 }

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

+package com.yeejoin.equipmanage.dto;
+
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataGridMock {
+    private int current;
+    private int total;
+    private boolean  pagination;
+    private int  totalPage;
+    private List   dataList;
+
+    public DataGridMock(int current, int total, boolean pagination, int totalPage, List dataList) {
+        this.current = current;
+        this.total = total;
+        this.pagination = pagination;
+        this.totalPage = totalPage;
+        this.dataList = dataList;
+    }
+}

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

@@ -4,10 +4,18 @@ import lombok.Data;
 
 @Data
 public class MileageDto {
-private String carCode;
-private String carNum;
-private Double totalTravel;
-private String total;
-//iotCode+date
-private String iotCode;
+    //车辆编号
+    private String carCode;
+    //车牌号
+    private String carNum;
+    //百分比
+    private Double totalTravel;
+    //当月总里程
+    private String total;
+    //车辆排名
+    private String number;
+    //iotCode+date
+    private String iotCode;
+    //所属单位
+    private String bizOrgName;
 }

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

-package com.yeejoin.equipmanage.dto;
-
-
-import io.swagger.models.auth.In;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class MypageDto {
-    private Integer current ;
-    private Integer total;
-    private Boolean pagination;
-    private Integer totalPage;
-    private List dataList;
-    private Integer pageSize;
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/listener/CarIotNewListener.java

 package com.yeejoin.equipmanage.listener;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.equipmanage.common.entity.Car;
+import com.yeejoin.equipmanage.common.entity.CarSpeedWarningRecord;
 import com.yeejoin.equipmanage.common.entity.WlCarMileage;
 import com.yeejoin.equipmanage.fegin.IotFeign;
+import com.yeejoin.equipmanage.mapper.WlCarSpeedWaringRecordMapper;
 import com.yeejoin.equipmanage.service.ICarService;
 import com.yeejoin.equipmanage.service.IWlCarMileageService;
 import com.yeejoin.equipmanage.thread.ThreadCar;
@@ -43,8 +47,13 @@ public class CarIotNewListener extends EmqxListener {
 
     @Autowired
     private IotFeign iotFeign;
+    @Autowired
+    private WlCarSpeedWaringRecordMapper wlCarSpeedWaringRecordMapper;
     @Value("${mileage.clippingtime:600000}")
     private Long clipping_time;
+
+    @Value("${default.maxspeed:70.0}")
+    private Double defaultMaxSpeed;
     private final String GUIDE_KEY = "813684495d9a3981dd2c7694916fe404";
 
     private final String GUIDE_URL = "https://restapi.amap.com/v3/geocode/regeo?";
@@ -191,7 +200,9 @@ public class CarIotNewListener extends EmqxListener {
             double startLongitude = jsonObject.getDoubleValue("FireCar_Longitude");
             double startLatitude = jsonObject.getDoubleValue("FireCar_Latitude");
             int direction = jsonObject.getIntValue("direction");
-
+            String waringDate = jsonObject.getString("createdTime");
+            Double speed=jsonObject.getDoubleValue("FireCar_Speed");
+            Double maxSpeed = defaultMaxSpeed;
             // 地图推送消息
             Car car = iCarService.getOne(new LambdaQueryWrapper<Car>().eq(Car::getIotCode, iotCode));
             if (car != null && startLongitude != 0 && startLatitude != 0) {
@@ -208,7 +219,22 @@ public class CarIotNewListener extends EmqxListener {
                 mqttMessage.setPayload(sendArr.toJSONString().getBytes());
                 car.setLongitude(startLongitude);
                 car.setLatitude(startLatitude);
+                if(!ObjectUtils.isEmpty(car.getMaxSpeed())){
+                    maxSpeed =car.getMaxSpeed();
+                }
                 iCarService.updateById(car);
+                if(speed > maxSpeed){
+                    CarSpeedWarningRecord carSpeedWarningRecord = new CarSpeedWarningRecord();
+                    carSpeedWarningRecord.setCarNum(car.getCarNum());
+                    carSpeedWarningRecord.setDriver(car.getDriver());
+                    carSpeedWarningRecord.setPhone(car.getPhone());
+                    carSpeedWarningRecord.setOverSpeed(speed-maxSpeed);
+                    carSpeedWarningRecord.setOwnership(car.getOwnership());
+                    carSpeedWarningRecord.setBizOrgName(car.getBizOrgName());
+                    carSpeedWarningRecord.setWaringDate(DateUtil.parse(waringDate, DatePattern.NORM_DATETIME_PATTERN));
+                    wlCarSpeedWaringRecordMapper.insert(carSpeedWarningRecord);
+                    logger.info("-----------触发车辆超速告警成功--------");
+                }
                 logger.info("-----------推送车辆位置消息到到地图成功--------");
                 try {
                     emqkeeper.getMqttClient().publish("car/location", mqttMessage);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/WlCarSpeedWaringRecordMapper.java

+package com.yeejoin.equipmanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.equipmanage.common.entity.CarSpeedWarningRecord;
+
+public interface WlCarSpeedWaringRecordMapper extends BaseMapper<CarSpeedWarningRecord> {
+}

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

@@ -8,10 +8,7 @@ import com.yeejoin.equipmanage.common.datasync.entity.FireVehicle;
 import com.yeejoin.equipmanage.common.dto.CarFusionDto;
 import com.yeejoin.equipmanage.common.dto.CarInfoDto;
 import com.yeejoin.equipmanage.common.dto.CarStatusInfoDto;
-import com.yeejoin.equipmanage.common.entity.Car;
-import com.yeejoin.equipmanage.common.entity.CarInfo;
-import com.yeejoin.equipmanage.common.entity.CarProperty;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.CarDto;
 import com.yeejoin.equipmanage.common.entity.dto.CarEquipAlarmInfoDto;
 import com.yeejoin.equipmanage.common.entity.dto.CarEquipStateInfoDto;
@@ -19,6 +16,7 @@ import com.yeejoin.equipmanage.common.entity.vo.CarIndexVo;
 import com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.dto.*;
+import javassist.compiler.ast.Keyword;
 
 import java.util.HashMap;
 import java.util.List;
@@ -200,19 +198,18 @@ public interface ICarService extends IService<Car> {
     Map<String,Integer> getCountOfCarBelongCompany();
      List<ChartIntegerDto> getCarCategoryInfo() ;
     Page<CarEquipStateInfoDto> getCarEquipStateInfo();
-    Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto();
+    Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord);
     List<ChartIntegerDto>getCarBelongAreaInfo() ;
     Page<CarAreaInfoDto> getCarAreaInfo(String areaName ) ;
-    Page<MileageDto> getCarMileageInfoByMoth(String date);
-    List<CarExportDto> exportCarMileageInfoByMoth(String date);
+    BasicTableDataDto getCarMileageInfoByMoth(String date, Integer current, Integer pageSize,String keyWord);
+    List<CarExportDto> exportCarMileageInfoByMoth(String date,String keyWord);
     ZZChartsDto getCarMileageInfoByMothOFDay(String iotCode);
-    Page<CarExceptionDto> getCarExcepitonTrack(Integer type);
-
+    Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord);
+    Page<CarSpeedWarningRecord> getCarWarningRecord(String keyWord);
     /**
      * 查询车辆启动状态，赋码
      */
     List<Map<String, String>> updateCarStartStatus();
-
     /**
      * 赋码
      */

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

 package com.yeejoin.equipmanage.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -20,7 +21,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.equipmanage.common.datasync.entity.FireVehicle;
 import com.yeejoin.equipmanage.common.dto.CarFusionDto;
@@ -67,7 +67,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -141,7 +140,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
 
     @Autowired
     EquipmentSpecificMapper equipmentSpecificMapper;
-
+    @Autowired
+    WlCarSpeedWaringRecordMapper wlCarSpeedWaringRecordMapper;
     @Autowired
     private RemoteSecurityService remoteSecurityService;
 
@@ -1380,7 +1380,9 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
 
 
         if (!ObjectUtils.isEmpty(car.getIotCode())) {
+            Double monthTravel=0.0;
             Double totalTravel = 0.0;
+            String currentYearAndMonth = DateUtil.format(new Date(), "yyyy-MM");
             LambdaQueryWrapper<WlCarMileage> wrapper = new LambdaQueryWrapper<WlCarMileage>();
             wrapper.eq(WlCarMileage::getIotCode, car.getIotCode());
             wrapper.ge(WlCarMileage::getTravel, 0.5);
@@ -1392,9 +1394,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
                 //判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
                 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();
+                    }
                 }
             }
             car.setTotalTravel(Double.valueOf(String.format("%.1f",totalTravel)));
+            car.setMonthTravel(Double.valueOf(String.format("%.1f",monthTravel)));
             WlCarMileage last = iWlCarMileageService
                     .getOne(new LambdaQueryWrapper<WlCarMileage>().eq(WlCarMileage::getIotCode, car.getIotCode())
                             .orderByDesc(WlCarMileage::getEndTime).last("limit 1"));
@@ -1814,14 +1820,20 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
     }
 
     @Override
-    public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto() {
+    public Page<CarEquipAlarmInfoDto> getCarEquipAlarmInfoDto(String keyWord) {
         Page<CarEquipAlarmInfoDto> page = new Page<>();
-        List<CarEquipAlarmInfoDto> list = carMapper.getCarEquipAlarmInfo(carEquipAlarmBatteryNumber);
+        List<Car> list =this.list().stream().filter(car -> Integer.valueOf(car.getExtra2())< carEquipAlarmBatteryNumber).collect(Collectors.toList());
+        if(StringUtils.isNotEmpty(keyWord)){
+            list=list.stream().filter(car -> car.getBizOrgName().contains(keyWord)||car.getOwnership().contains(keyWord)).collect(Collectors.toList());
+        }
+        List<CarEquipAlarmInfoDto> carEquipAlarmInfoDtoList = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
-            list.get(i).setNo(i+1);
-            list.get(i).setAlarmMessage("该设备电量低于"+carEquipAlarmBatteryNumber+"%!");
+            CarEquipAlarmInfoDto carEquipAlarmInfoDto=new CarEquipAlarmInfoDto();
+            carEquipAlarmInfoDto.setCarNum(list.get(i).getCarNum());
+            carEquipAlarmInfoDto.setNo(i+1);
+            carEquipAlarmInfoDto.setAlarmMessage("该设备电量低于"+carEquipAlarmBatteryNumber+"%!");
         }
-        page.setRecords(list);
+        page.setRecords(carEquipAlarmInfoDtoList);
         page.setTotal(list.size());
         page.setCurrent(1);
         page.setSize(10);
@@ -1878,57 +1890,75 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
     }
 
     @Override
-    public Page<MileageDto> getCarMileageInfoByMoth(String date) {
-        Page<MileageDto> page = new Page<>();
+    public BasicTableDataDto getCarMileageInfoByMoth(String date,Integer current,Integer pageSize,String keyWord) {
+        BasicTableDataDto basicTableDataDto = new BasicTableDataDto();
+        List<ColModel> colModels = new ArrayList<>();
+        colModels.add(new ColModel("carNum","车牌号"));
+        colModels.add(new ColModel("carCode","编号"));
+        colModels.add(new ColModel("bizOrgName","所属单位"));
+        colModels.add(new ColModel("total","当月里程"));
         List<MileageDto> mileageDtoList = new ArrayList<>();
         List<Car> list = this.list();
+        if(StringUtils.isNotEmpty(keyWord)){
+            list=list.stream().filter(car -> car.getBizOrgName().contains(keyWord)||car.getOwnership().contains(keyWord)).collect(Collectors.toList());
+        }
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
                 MileageDto mileageDto = new MileageDto();
-                Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, list.get(i).getIotCode());
-                mileageDto.setCarNum(list.get(i).getCarNum());
-                mileageDto.setCarCode(list.get(i).getRemark());
-                mileageDto.setIotCode(date + "::" + list.get(i).getIotCode());
+                Car car = list.get(i);
+                Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, car.getIotCode());
+                mileageDto.setCarNum(car.getCarNum());
+                mileageDto.setCarCode(car.getRemark());
+                mileageDto.setBizOrgName(car.getBizOrgName());
+                mileageDto.setIotCode(date + "::" + car.getIotCode());
                 if (totalTravel != null) {
-                    mileageDto.setTotalTravel((totalTravel / carMaxTravel) * 100);
+//                    mileageDto.setTotalTravel((totalTravel / carMaxTravel) * 100);
+                    mileageDto.setTotalTravel(totalTravel);
                 } else {
                     totalTravel= 0.0;
                     mileageDto.setTotalTravel(totalTravel);
                 }
-                mileageDto.setTotal(totalTravel+"KM");
+                mileageDto.setTotal(String.format("%.1f",totalTravel)+"KM");
                 mileageDtoList.add(mileageDto);
             }
         }
         mileageDtoList = mileageDtoList.stream().sorted(Comparator.comparing(MileageDto::getTotalTravel).reversed()).collect(Collectors.toList());
-        page.setRecords(mileageDtoList);
-        page.setTotal(mileageDtoList.size());
-        page.setCurrent(1);
-        page.setSize(10);
-        return page;
+        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));
+        basicTableDataDto.setDataGridMock(mypageDto);
+        basicTableDataDto.setColModel(colModels);
+        return basicTableDataDto;
     }
 
     @Override
-    public List<CarExportDto> exportCarMileageInfoByMoth(String date) {
+    public List<CarExportDto> exportCarMileageInfoByMoth(String date,String keyWord) {
         List<CarExportDto> carExportDtos = new ArrayList<>();
         List<Car> list = this.list();
+        if(StringUtils.isNotEmpty(keyWord)){
+            list=list.stream().filter(car -> car.getBizOrgName().contains(keyWord)||car.getOwnership().contains(keyWord)).collect(Collectors.toList());
+        }
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
                 CarExportDto carExportDto = new CarExportDto();
-                Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, list.get(i).getIotCode());
                 Car car  = list.get(i);
-                carExportDto.setCode(car.getCode());
+                Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, car.getIotCode());
+                carExportDto.setCode(car.getRemark());
                 carExportDto.setCarNumber(car.getCarNum());
+                carExportDto.setDriver(car.getDriver());
+                carExportDto.setPhone(car.getPhone());
                 carExportDto.setOrgName(car.getBizOrgName());
                 carExportDto.setStandard(car.getStandard());
                 carExportDto.setDisplacement(car.getDisplacement());
                 if(totalTravel!=null){
-                    carExportDto.setTotalTravel(String.valueOf(totalTravel));
+                    carExportDto.setTotalTravel(String.format("%.1f",totalTravel)+"KM");
                 }else {
-                    carExportDto.setTotalTravel("0");
+                    carExportDto.setTotalTravel("0.0KM");
                 }
                 carExportDtos.add(carExportDto);
             }
         }
+        Collections.sort(carExportDtos,(e1,e2)->Double.valueOf(e2.getTotalTravel()).compareTo(Double.valueOf(e1.getTotalTravel())));
         return carExportDtos;
     }
 
@@ -1960,21 +1990,25 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
     }
 
     @Override
-    public Page<CarExceptionDto> getCarExcepitonTrack(Integer type) {
+    public Page<CarExceptionDto> getCarExcepitonTrack(Integer type,String keyWord) {
         Page<CarExceptionDto> page = new Page<>();
         List<CarExceptionDto> carExceptionDtos = new ArrayList<>();
         LocalDate localDate = LocalDate.now(ZoneId.of("+8"));
         String startDate = localDate.plusDays(-1).toString();
         String endDate  = localDate.plusDays((0- type)).toString();
         List<Car> list = this.list();
+        if(StringUtils.isNotEmpty(keyWord)){
+            list=list.stream().filter(car -> car.getBizOrgName().contains(keyWord)||car.getOwnership().contains(keyWord)).collect(Collectors.toList());
+        }
         if (list.size() > 0) {
             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());
                 if (!(totalTravel != null && totalTravel> 0.0)) {
-                    carExceptionDto.setCarId(String.valueOf(list.get(i).getId()));
-                    carExceptionDto.setCarNumber(list.get(i).getCarNum());
-                    carExceptionDto.setBelongStation(list.get(i).getBizOrgName());
+                    carExceptionDto.setCarId(String.valueOf(car.getId()));
+                    carExceptionDto.setCarNumber(car.getCarNum());
+                    carExceptionDto.setBelongStation(car.getBizOrgName());
                     carExceptionDtos.add(carExceptionDto);
                 }
             }
@@ -1987,6 +2021,25 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
     }
 
     @Override
+    public Page<CarSpeedWarningRecord> getCarWarningRecord(String keyWord) {
+        Page<CarSpeedWarningRecord> carSpeedWarningRecordPage = new Page<>();
+        Date date = new Date();
+        String endTime = DateUtil.format(date, DatePattern.NORM_DATETIME_FORMAT);
+        date = DateUtil.offsetDay(date,-15);
+        String startTime = DateUtil.format(date, DatePattern.NORM_DATETIME_FORMAT);
+        List<CarSpeedWarningRecord>  list = wlCarSpeedWaringRecordMapper.selectList(new QueryWrapper<CarSpeedWarningRecord>().ge("waring_date",startTime).le("waring_date",endTime));
+        if(StringUtils.isNotEmpty(keyWord)){
+            list=list.stream().filter(carSpeedWarningRecord -> carSpeedWarningRecord.getBizOrgName().contains(keyWord)||carSpeedWarningRecord.getOwnership().contains(keyWord)).collect(Collectors.toList());
+        }
+        Collections.sort(list,(e1,e2)->e2.getOverSpeed().compareTo(e1.getOverSpeed()));
+        carSpeedWarningRecordPage.setRecords(list);
+        carSpeedWarningRecordPage.setTotal(list.size());
+        carSpeedWarningRecordPage.setSize(1);
+        carSpeedWarningRecordPage.setCurrent(1);
+        return carSpeedWarningRecordPage;
+    }
+
+    @Override
     public List<Map<String, String>> updateCarStartStatus() {
         return carPropertyMapper.selectIndexByTime(CAR_START_INDEX_KEY);
     }

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

 package com.yeejoin.equipmanage.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,11 +26,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -75,7 +79,9 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
     private Double mileageParameter;
     @Resource
     private EmqKeeper emqKeeper;
-
+    @Autowired
+    @Lazy
+    private IWlCarMileageService iWlCarMileageService;
     public static List<String> getDayByMonth(Date date) {
         List<String> data = new ArrayList<>();
         try {
@@ -478,12 +484,44 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
 
     @Override
     public Double getTotalTravelByIotCodeAndDate(String date, String iotCode) {
-        return this.baseMapper.getTotalTravelByIotCodeAndDate(date, iotCode);
+        if(StringUtils.isEmpty(date)){
+           date = DateUtil.format(new Date(),"yyyy-MM");
+        }
+        Double totalTravel = 0.0;
+        LambdaQueryWrapper<WlCarMileage> wrapper = new LambdaQueryWrapper<WlCarMileage>();
+        wrapper.eq(WlCarMileage::getIotCode,iotCode);
+        wrapper.ge(WlCarMileage::getTravel, 0.5);
+        wrapper.isNotNull(WlCarMileage::getEndTime);
+        wrapper.isNotNull(WlCarMileage::getStartTime);
+        wrapper.like(WlCarMileage::getStartTime,date);
+        List<WlCarMileage>  list = iWlCarMileageService.list(wrapper);
+        for (WlCarMileage wl : list) {
+            //判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
+            if (!org.springframework.util.ObjectUtils.isEmpty(wl.getTakeTime()) && !org.springframework.util.ObjectUtils.isEmpty(wl.getTravel()) && ((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED))            {
+                totalTravel += wl.getTravel();
+            }
+        }
+        return totalTravel;
     }
 
     @Override
     public Double getTotalTravelByIotCodeAndDateProd(String startDate, String endDate, String iotCode) {
-        return this.baseMapper.getTotalTravelByIotCodeAndDateProd(startDate, endDate, iotCode);
+        Double totalTravel = 0.0;
+        LambdaQueryWrapper<WlCarMileage> wrapper = new LambdaQueryWrapper<WlCarMileage>();
+        wrapper.eq(WlCarMileage::getIotCode,iotCode);
+        wrapper.ge(WlCarMileage::getTravel, 0.5);
+        wrapper.isNotNull(WlCarMileage::getEndTime);
+        wrapper.isNotNull(WlCarMileage::getStartTime);
+        wrapper.ge(WlCarMileage::getEndTime,endDate);
+        wrapper.le(WlCarMileage::getStartTime,startDate);
+        List<WlCarMileage>  list = iWlCarMileageService.list(wrapper);
+        for (WlCarMileage wl : list) {
+            //判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
+            if (!org.springframework.util.ObjectUtils.isEmpty(wl.getTakeTime()) && !org.springframework.util.ObjectUtils.isEmpty(wl.getTravel()) && ((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED))            {
+                totalTravel += wl.getTravel();
+            }
+        }
+        return totalTravel;
     }
 
     /**

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -1950,7 +1950,11 @@
             And wlc.equip_status = #{equipTypeAmountPage.equipStatus}
         </if>
         <if test="equipTypeAmountPage.keyword!=null and equipTypeAmountPage.keyword!=''">
-            And (wlc.`NAME` LIKE CONCAT('%',#{equipTypeAmountPage.keyword},'%') OR wlc.car_num LIKE CONCAT('%',#{equipTypeAmountPage.keyword},'%'))
+            And (wlc.`NAME` LIKE CONCAT('%',#{equipTypeAmountPage.keyword},'%')
+            OR wlc.car_num LIKE CONCAT('%',#{equipTypeAmountPage.keyword},'%')
+            OR wlc.biz_org_name LIKE CONCAT('%',#{equipTypeAmountPage.keyword},'%')
+            OR wlc.ownership LIKE CONCAT('%',#{equipTypeAmountPage.keyword},'%')
+            )
         </if>
         )s2
         <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">

amos-boot-system-equip/src/main/resources/mapper/WlCarMileageMapper.xml

@@ -58,8 +58,7 @@
 		SELECT SUM(travel)
 		FROM wl_car_mileage
 		WHERE date  LIKE concat('%',#{date},'%')
-		AND
-		iot_code = #{iotCode}
+		AND iot_code = #{iotCode}
 	</select>
 
 	<select id ="getTotalTravelByIotCodeAndDateProd" resultType="Double">