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/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/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">