提交

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

@@ -34,5 +34,5 @@ public interface IWlCarMileageService extends IService<WlCarMileage> {
 	Boolean getUncompleteMileagByIotCode(String iotCode);
 
 	Double getTotalTravelByIotCodeAndDate(String date,String iotCode);
-	Double getTotalTravelByIotCodeAndDateProd(String StartDate,String endDate,String iotCode);
+	Map<String,Double> getTotalTravelByIotCodeAndDateProd(String StartDate,String endDate);
 }

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

@@ -1752,12 +1752,12 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
 			list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
 		}
 		if (list.size() > 0) {
+			Map<String,Double> map = iWlCarMileageService.getTotalTravelByIotCodeAndDateProd(startDate, endDate);
 			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 <= 0.0) {
+				Double totalTravel = map.get(car.getIotCode());
+				if (totalTravel==null||totalTravel <= 0.0) {
 					carExceptionDto.setCarId(String.valueOf(car.getId()));
 					carExceptionDto.setCarNumber(car.getCarNum());
 					carExceptionDto.setBelongStation(car.getBizOrgName());

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

@@ -557,23 +557,33 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
     }
 
     @Override
-    public Double getTotalTravelByIotCodeAndDateProd(String startDate, String endDate, String iotCode) {
+    public Map<String,Double>  getTotalTravelByIotCodeAndDateProd(String startDate, String endDate) {
         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::getDate, startDate);
-        wrapper.le(WlCarMileage::getDate, endDate);
-        List<WlCarMileage> list = this.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();
-            }
+        QueryWrapper<WlCarMileage> wrapper = new QueryWrapper<WlCarMileage>();
+        wrapper.select("sum(travel) AS travel","iot_code AS iotCode");
+       // wrapper.lambda().eq(WlCarMileage::getIotCode, iotCode);
+        wrapper.lambda().isNotNull(WlCarMileage::getTravel);
+        wrapper.lambda().ge(WlCarMileage::getTravel, 0.5);
+        wrapper.lambda().isNotNull(WlCarMileage::getEndTime);
+        wrapper.lambda().isNotNull(WlCarMileage::getStartTime);
+        wrapper.lambda().ge(WlCarMileage::getDate, startDate);
+        wrapper.lambda().le(WlCarMileage::getDate, endDate);
+        wrapper.lambda().isNotNull(WlCarMileage::getTakeTime);
+        wrapper.le("travel/(take_time/3600000)",CAR_MAX_SPEED);
+        wrapper.lambda().groupBy(WlCarMileage::getIotCode);
+        List<Map<String,Object>> list = this.baseMapper.selectMaps(wrapper);
+//        for (WlCarMileage wl : list) {
+//            //判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
+//            if (((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED)) {
+//                totalTravel += wl.getTravel();
+//            }
+//        }
+        Map<String,Double> rmap = new HashMap<>();
+        for(Map<String,Object> map : list)
+        {
+            rmap.put(String.valueOf(map.get("iotCode")),Double.valueOf(String.valueOf(map.get("travel"))));
         }
-        return totalTravel;
+        return rmap;
     }
 
     /**

amos-boot-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java

@@ -84,7 +84,7 @@ public class AmostEquipApplication {
 	 *
 	 * @throws MqttException
 	 */
-	@Bean
+	//@Bean
 	void initMqtt() throws MqttException {
 		try {
 			if(jxiop.equals("false")){