修改车辆里程计算bug

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

@@ -185,12 +185,10 @@ public class Car extends BaseEntity {
 	private String importStr;
 
 	@TableField(exist = false)
-	private Integer totalTravel;
+	private Double totalTravel;
 
-	@TableField(exist = false)
 	private double longitude;
 
-	@TableField(exist = false)
 	private double latitude;
 
 	@TableField(exist = false)

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

@@ -12,7 +12,7 @@ public class CarTravelDto {
 	
 	String totalTime;
 	
-	Integer totalTravel;
+	Double totalTravel;
 	
 	List<WlCarMileageDto> records;
 

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

@@ -159,7 +159,7 @@ public class WlCarMileageController {
 		CarTravelDto carTravelDto = new CarTravelDto();
 		carTravelDto.setTotal(page.getTotal());
 		long totalTime = 0;
-		int totalTravel = 0;
+		double totalTravel = 0;
 		List<WlCarMileageDto> list = new ArrayList<WlCarMileageDto>();
 		for (WlCarMileage wl : page.getRecords()) {
 			WlCarMileageDto wlCarMileageDto = new WlCarMileageDto();

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

@@ -15,6 +15,6 @@ public interface WlCarMileageMapper extends BaseMapper<WlCarMileage> {
 
 	Page<WlCarMileage> page(Page<WlCarMileage> page,@Param("wlCarMileage") WlCarMileage wlCarMileage);
 
-	Integer totalMileage(String iotCode);
+	Double totalMileage(String iotCode);
 
 }

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

@@ -19,7 +19,7 @@ public interface IWlCarMileageService extends IService<WlCarMileage> {
 
 	Page<WlCarMileage> page(Page<WlCarMileage> page, WlCarMileage wlCarMileage);
 
-	Integer totalMileage(String iotCode);
+	Double totalMileage(String iotCode);
 
 	List<Coordinate> getCoordinateList(long id);
 	

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

@@ -1355,7 +1355,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
             car.setImportStr(car.getIsImport() ? "进口" : "国产");
         }
         if (!ObjectUtils.isEmpty(car.getIotCode())) {
-            Integer totalTravel = iWlCarMileageService.totalMileage(car.getIotCode());
+            Double totalTravel = iWlCarMileageService.totalMileage(car.getIotCode());
             car.setTotalTravel(totalTravel);
             WlCarMileage last = iWlCarMileageService
                     .getOne(new LambdaQueryWrapper<WlCarMileage>().eq(WlCarMileage::getIotCode, car.getIotCode())

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

@@ -59,7 +59,7 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
 	}
 
 	@Override
-	public Integer totalMileage(String iotCode) {
+	public Double totalMileage(String iotCode) {
 		return this.baseMapper.totalMileage(iotCode);
 	}
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper
 	namespace="com.yeejoin.equipmanage.mapper.WlCarMileageMapper">
-	<select id="totalMileage" resultType="Integer">
+	<select id="totalMileage" resultType="Double">
 		SELECT SUM(travel) FROM wl_car_mileage WHERE iot_code = #{iotCode}
 	</select>