Merge remote-tracking branch 'origin/test' into test

performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTraceVO.java

@@ -26,4 +26,6 @@ public class DriverTraceVO {
     private String stayEndTime;
     @ApiModelProperty(value = "车辆状态：1空车 2重车", example = "1")
     private Integer truckStatus;
+    @ApiModelProperty(value = "时间")
+    private String createTime;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTruckTraceVO.java

@@ -32,4 +32,6 @@ public class DriverTruckTraceVO {
     private BigDecimal stayTime=BigDecimal.ZERO;
     @ApiModelProperty(value = "车辆状态：1空车 2重车", example = "1")
     private Integer truckStatus;
+    @ApiModelProperty(value = "时间")
+    private String createTime;
 }

performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java

 package com.clx.performance.controller.temp;
 
 import com.clx.performance.dto.gd.GdRouteDTO;
+import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.param.temp.DriverTraceAddParam;
 import com.clx.performance.param.temp.TruckTraceAddParam;
+import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.clx.performance.service.trace.TruckTraceService;
 import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.vo.pc.trace.DriverTraceVO;
@@ -40,6 +42,21 @@ public class TempTraceController {
     @Autowired
     private GdService gdService;
 
+    @Autowired
+    private TruckTraceMqHandlerService truckTraceMqHandlerService;
+
+    @ApiOperation(value = "test", notes = "<br>By:艾庆国")
+    @PostMapping("/test")
+    public Result test(String truckNo, String beginTime, String endTime) {
+        TruckTraceSyncMqParam mq = new TruckTraceSyncMqParam();
+        mq.setTruckNo(truckNo);
+        mq.setBeginTime(beginTime);
+        mq.setEndTime(endTime);
+
+        truckTraceMqHandlerService.truckTracSync(mq);
+
+        return Result.ok();
+    }
     @ApiOperation(value = "车辆轨迹同步", notes = "<br>By:艾庆国")
     @PostMapping("/truckTraceSync")
     public Result truckTraceSync(@RequestBody TruckTraceAddParam param) {

performance-web/src/main/java/com/clx/performance/dao/impl/vehiclewarn/VehicleWarnInfoDaoImpl.java

@@ -70,6 +70,16 @@ public class VehicleWarnInfoDaoImpl extends BaseDaoImpl<VehicleWarnInfoMapper, V
         );
     }
 
+    @Override
+    public boolean updateByConfig(Integer warnConfigId, String warnName, Integer warnLevel) {
+        return update(lUdWrapper()
+                .eq(VehicleWarnInfo::getWarnConfigId, warnConfigId)
+                .ne(VehicleWarnInfo::getStatus, VehicleWarnInfoEnum.Status.RESOLVE.getCode())
+                .set(VehicleWarnInfo::getWarnName, warnName)
+                .set(VehicleWarnInfo::getWarnLevel, warnLevel)
+        );
+    }
+
     @Override
     public Optional<VehicleWarnInfo> findById(Integer id) {
         return Optional.of(id)

performance-web/src/main/java/com/clx/performance/dao/vehiclewarn/VehicleWarnInfoDao.java

@@ -15,6 +15,7 @@ public interface VehicleWarnInfoDao extends BaseDao<VehicleWarnInfoMapper, Vehic
     boolean batchUpdateStatus(List<Integer> idList, Integer status);
     boolean updateSuspendTime(VehicleWarnInfo item, Integer warnRang);
     boolean updateWarnTime(VehicleWarnInfo item);
+    boolean updateByConfig(Integer warnConfigId, String warnName, Integer warnLevel);
 
     Optional<VehicleWarnInfo> findById(Integer id);
 

performance-web/src/main/java/com/clx/performance/job/trace/PlatTruckTraceJob.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 
 @Slf4j
@@ -29,7 +30,9 @@ public class PlatTruckTraceJob {
     @XxlJob("platTruckTraceSync")
     public void platTruckTraceSync() {
         try {
-            Result<List<String>> result = userClxFeign.getPlatformTruckList();
+//            Result<List<String>> result = userClxFeign.getPlatformTruckList();
+            Result<List<String>> result = new Result<>();
+            result.setData(Arrays.asList("陕KJ9799", "陕KM5365"));
             if(result.succeed()){
                 log.info("平台车辆轨迹开始同步, size:{}", result.getData().size());
 

performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java

@@ -283,19 +283,20 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .orderByDesc("gpsTime")
                 .limit(1)
         );
-        if (!list.isEmpty()){
+
+        String time = beginTime;
+        if (!list.isEmpty()){list.get(0).getGpsTime();}
         // 停留时间段
         list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
                 .eq(TruckTraceESPlus::getTruckNo, truckNo)
                 .lt(TruckTraceESPlus::getSpeed, PARK_SPEED)
-                    .gt(TruckTraceESPlus::getGpsTime, list.get(0).getGpsTime())
+                .gt(TruckTraceESPlus::getGpsTime, time)
                 .le(TruckTraceESPlus::getGpsTime, endTime)
                 .orderByDesc("gpsTime")
         );
         if (!list.isEmpty()) {
             // 停留时长
-                return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(0).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime())).toMinutes();
-            }
+            return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(0).getGpsTime())).toMinutes();
         }
 
         // 司机
@@ -307,17 +308,17 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .orderByDesc("positionTime")
                 .limit(1)
         );
-        if (!list1.isEmpty()){
+        time = beginTime;
+        if (!list1.isEmpty()){list1.get(0).getPositionTime();}
         list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                 .eq(DriverTraceESPlus::getUserNo, userNo)
                 .lt(DriverTraceESPlus::getSpeed, PARK_SPEED)
-                    .gt(DriverTraceESPlus::getPositionTime, list1.get(0).getPositionTime())
+                .gt(DriverTraceESPlus::getPositionTime, time)
                 .le(DriverTraceESPlus::getPositionTime, endTime)
                 .orderByDesc("positionTime")
         );
         if (!list1.isEmpty()) {
-                return (int) Duration.between(LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime())).toMinutes();
-            }
+            return (int) Duration.between(LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime())).toMinutes();
         }
 
         return 0;

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnInfoServiceImpl.java

@@ -174,10 +174,10 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
             List<OrderChild> list = orderChildDao.listByChildNoList(childNoList);
             Map<String, OrderChild> map = list.stream().collect(Collectors.toMap(item -> item.getChildNo(), item -> item));
             for (VehicleWarnInfoVO record : page.getRecords()) {
-                record.setStatus(map.get(record.getChildNo()).getStatus());
+                record.setChildStatus(map.get(record.getChildNo()).getStatus());
             }
         }
-        return vehicleWarnInfoStruct.convertPage(vehicleWarnInfoDao.pageByParam(param));
+        return page;
 
     }
 }

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java

@@ -82,7 +82,7 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         int arriveReceiveExpectTime = vehicleWarnCommonService.getNeedTime(currentPosition, orderGoods.getReceiveLongitude(), orderGoods.getReceiveLatitude());
 
         VehicleWarnChild vehicleWarnChild = new VehicleWarnChild();
-        vehicleWarnChild.setOrderGoodsNo(orderChild.getOrderNo());
+        vehicleWarnChild.setOrderGoodsNo(orderChild.getOrderGoodsNo());
         vehicleWarnChild.setChildNo(orderChild.getChildNo());
         vehicleWarnChild.setTruckNo(orderChild.getTruckNo());
         vehicleWarnChild.setDriverUserNo(orderChild.getDriverUserNo());

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java

@@ -27,6 +27,7 @@ import java.util.Objects;
 public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnService {
     private static final Integer MIN_FER_HOUR = 60;
     private static final Integer DISTANCE_DEFAULT = 2000;
+    private static final Integer PARK_TIMEOUT_DEFAULT = 5;
     @Autowired
     private VehicleWarnConfigDao vehicleWarnConfigDao;
     @Autowired
@@ -61,6 +62,7 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
 
         // 停留时间
         int parkTime = truckTraceService.getParkTime(vehicleWarnChild.getTruckNo(), vehicleWarnChild.getDriverUserNo());
+        log.info("停留超时,停留时间:{}", parkTime);
         if (parkTime == 0) {return;}
 
         List<VehicleWarnConfig> vehicleWarnConfigList = vehicleWarnConfigDao.listByWarnType(VehicleWarnConfigEnum.WarnType.PARK_TIMEOUT.getCode());
@@ -92,6 +94,9 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
 
     }
 
+    /**
+     * 敏感区停留超时
+     */
     @Override
     public void sensitiveAreaParkTimeout(OrderChild orderChild, VehicleWarnChild vehicleWarnChild, VehicleWarnCommonInfoDTO commonInfo) {
 
@@ -113,7 +118,8 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
 
         // 停留时间
         int parkTime = truckTraceService.getParkTime(vehicleWarnChild.getTruckNo(), vehicleWarnChild.getDriverUserNo());
-        if (parkTime == 0) {return;}
+        log.info("敏感区停留超时,停留时间:{}", parkTime);
+        if (parkTime < PARK_TIMEOUT_DEFAULT) {return;}
 
         List<VehicleWarnConfig> vehicleWarnConfigList = vehicleWarnConfigDao.listByWarnType(VehicleWarnConfigEnum.WarnType.SENSITIVE_AREA_PARK_TIMEOUT.getCode());
         if (vehicleWarnConfigList.isEmpty()) {return;}

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnInfoSqlProvider.java

 package com.clx.performance.sqlProvider.vehiclewarn;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -22,7 +23,19 @@ public class VehicleWarnInfoSqlProvider {
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (Objects.nonNull(param.getWarnType())) {WHERE("warn_type = #{param.warnType}");}
             if (Objects.nonNull(param.getWarnLevel())) {WHERE("warn_level = #{param.warnLevel}");}
-            if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
+            if (Objects.nonNull(param.getStatus())) {
+
+                if (Objects.equals(param.getStatus(), VehicleWarnInfoEnum.Status.RESOLVE.getCode())) {
+                    WHERE("status = #{param.status}");
+                }
+                else if (Objects.equals(param.getStatus(), VehicleWarnInfoEnum.Status.INIT.getCode())) {
+                    WHERE("(status = 1 and (suspend_time is null or suspend_time < now()))");
+                }
+                else {
+                    WHERE("(status = 1 and(suspend_time is not null and suspend_time > now()))");
+                }
+
+            }
 
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT('%',#{param.sendAddress},'%')");}
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT('%',#{param.receiveAddress},'%')");}

performance-web/src/main/java/com/clx/performance/utils/zjxl/ZjxlGpsService.java

@@ -170,7 +170,7 @@ public class ZjxlGpsService {
      */
     public ZjxlResultDTO postHttps(String api, String token, Map<String, String> map){
         if ("dev".equals(active)
-                || "test".equals(active)
+//                || "test".equals(active)
                 || "release".equals(active)) {
             String result = "{\"status\":1001,\"result\":{\"mileage\":\"177.3\",\"parkSize\":\"5\",\"cityArray\":[],\"parkArray\":[{\"parkMins\":\"136\",\"parkBte\":\"1686731162000\",\"parkEte\":\"1686739373000\",\"parkLon\":\"66528174\",\"parkLat\":\"23798859\",\"parkAdr\":\"内蒙古自治区鄂尔多斯市准格尔旗安通驾校,西北方向,37.2米\"},{\"parkMins\":\"703\",\"parkBte\":\"1686739723000\",\"parkEte\":\"1686781943000\",\"parkLon\":\"66536286\",\"parkLat\":\"23780995\",\"parkAdr\":\"内蒙古自治区鄂尔多斯市准格尔旗准格尔南路与林荫街交叉口北正东方向150米远昇汽车服务站,东方向,158.3米\"},{\"parkMins\":\"6\",\"parkBte\":\"1686787930000\",\"parkEte\":\"1686788310000\",\"parkLon\":\"66846810\",\"parkLat\":\"23680326\",\"parkAdr\":\"山西省忻州市偏关县华部石化吕家窑站,西北方向,45.2米\"},{\"parkMins\":\"23\",\"parkBte\":\"1686794098000\",\"parkEte\":\"1686795526000\",\"parkLon\":\"67017985\",\"parkLat\":\"23472582\",\"parkAdr\":\"山西省忻州市五寨县索家沟村,西北方向,914.3米\"},{\"parkMins\":\"8\",\"parkBte\":\"1686795541000\",\"parkEte\":\"1686796074000\",\"parkLon\":\"67018158\",\"parkLat\":\"23472493\",\"parkAdr\":\"山西省忻州市五寨县索家沟村,西北方向,884.6米\"}],\"trackArray\":[{\"lat\":\"23821540\",\"lon\":\"66283857\",\"gtm\":\"20230614/153826\",\"spd\":\"64.8\",\"mlg\":\"240353.5\",\"hgt\":\"1303\",\"agl\":\"98\"},{\"lat\":\"23821095\",\"lon\":\"66287817\",\"gtm\":\"20230614/153856\",\"spd\":\"72.2\",\"mlg\":\"240354.1\",\"hgt\":\"1296\",\"agl\":\"98\"},{\"lat\":\"23820847\",\"lon\":\"66290056\",\"gtm\":\"20230614/153912\",\"spd\":\"79.6\",\"mlg\":\"240354.5\",\"hgt\":\"1288\",\"agl\":\"97\"},{\"lat\":\"23820588\",\"lon\":\"66292374\",\"gtm\":\"20230614/153926\",\"spd\":\"79.6\",\"mlg\":\"240354.9\",\"hgt\":\"1281\",\"agl\":\"98\"},{\"lat\":\"23820537\",\"lon\":\"66292831\",\"gtm\":\"20230614/153928\",\"spd\":\"77.7\",\"mlg\":\"240354.9\",\"hgt\":\"1281\",\"agl\":\"97\"},{\"lat\":\"23820378\",\"lon\":\"66296466\",\"gtm\":\"20230614/153956\",\"spd\":\"62.9\",\"mlg\":\"240355.5\",\"hgt\":\"1282\",\"agl\":\"87\"},{\"lat\":\"23820952\",\"lon\":\"66300832\",\"gtm\":\"20230614/154027\",\"spd\":\"87.0\",\"mlg\":\"240356.2\",\"hgt\":\"1279\",\"agl\":\"76\"},{\"lat\":\"23821167\",\"lon\":\"66302023\",\"gtm\":\"20230614/154034\",\"spd\":\"90.7\",\"mlg\":\"240356.4\",\"hgt\":\"1280\",\"agl\":\"76\"},{\"lat\":\"23821960\",\"lon\":\"66305943\",\"gtm\":\"20230614/154058\",\"spd\":\"79.6\",\"mlg\":\"240357.1\",\"hgt\":\"1297\",\"agl\":\"72\"},{\"lat\":\"23823291\",\"lon\":\"66310339\",\"gtm\":\"20230614/154129\",\"spd\":\"72.2\",\"mlg\":\"240357.8\",\"hgt\":\"1310\",\"agl\":\"69\"}]}}";
             //String result = "{\"status\":1006,\"result\":\"无数据\"}";