车辆预警

performance-api/src/main/java/com/clx/performance/enums/vehiclewarn/VehicleWarnLogEnum.java

+package com.clx.performance.enums.vehiclewarn;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum VehicleWarnLogEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        SUSPEND(1, "暂停预警"),
+        RESOLVE(2, "处理预警"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Type::getMsg).orElse(null);
+        }
+    }
+    @Getter
+    @AllArgsConstructor
+    public enum WarnRang {
+        CHILD(1, "本运单不再提示该预警"),
+        ORDER(2, "相同货单不再提示该预警"),
+        NONE(3, "不再提示该预警"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+        public static Optional<WarnRang> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(WarnRang::getMsg).orElse(null);
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/vehiclewarn/VehicleWarnLogVO.java

+package com.clx.performance.vo.pc.vehiclewarn;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 预警日志
+* @Date: 2024/04/26 11:21:25
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class VehicleWarnLogVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "预警信息id", example = "1")
+    private Integer infoId;
+    @ApiModelProperty(value = "类型：1暂停预警 2处理预警", example = "1")
+    private Integer type;
+    @ApiModelProperty(value = "运单编号", example = "100000")
+    private String childNo;
+    @ApiModelProperty(value = "预警名称", example = "超时")
+    private String warnName;
+    @ApiModelProperty(value = "预警时间", example = "")
+    private String warnTime;
+    @ApiModelProperty(value = "预警屏蔽范围：1运单 2货单 3无预警", example = "1")
+    private Integer warnRang;
+    @ApiModelProperty(value = "预警屏蔽结束时间", example = "")
+    private LocalDateTime warnEndTime;
+    @ApiModelProperty(value = "内容", example = "预警处理")
+    private String content;
+    @ApiModelProperty(value = "创建人", example = "")
+    private String createBy;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/pc/vehiclewarn/VehicleWarnInfoController.java

@@ -3,7 +3,10 @@ package com.clx.performance.controller.pc.vehiclewarn;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
+import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoResolveUpdateParam;
+import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoSuspendUpdateParam;
 import com.clx.performance.service.vehiclewarn.VehicleWarnInfoService;
+import com.clx.performance.vo.pc.vehiclewarn.VehicleTraceVO;
 import com.clx.performance.vo.pc.vehiclewarn.VehicleWarnInfoVO;
 import com.msl.common.base.PageData;
 import com.msl.common.result.Result;
@@ -27,6 +30,27 @@ public class VehicleWarnInfoController {
     @Autowired
     private VehicleWarnInfoService vehicleWarnInfoService;
 
+
+    @ApiOperation(value = "更新预警暂停", notes = "<br>By:艾庆国")
+    @PostMapping("/updateSuspend")
+    public Result<Void> updateSuspend(@RequestBody @Validated VehicleWarnInfoSuspendUpdateParam param) {
+        vehicleWarnInfoService.updateSuspend(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新处理", notes = "<br>By:艾庆国")
+    @PostMapping("/updateResolve")
+    public Result<Void> updateConfig(@RequestBody @Validated VehicleWarnInfoResolveUpdateParam param) {
+        vehicleWarnInfoService.updateResolve(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "获取轨迹",notes = "<br>By:艾庆国")
+    @GetMapping("/getTrace")
+    public Result<VehicleTraceVO> getTrace(@NotNull(message = "id不能为空") @Validated Integer id) {
+        return Result.ok(vehicleWarnInfoService.getTrace(id));
+    }
+
     @ApiOperation(value = "获取预警信息",notes = "<br>By:艾庆国")
     @GetMapping("/getInfo")
     public Result<VehicleWarnInfoVO> getInfo(@NotNull(message = "id不能为空") @Validated Integer id) {

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

+package com.clx.performance.dao.impl.vehiclewarn;
+
+
+import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao;
+import com.clx.performance.mapper.vehiclewarn.VehicleWarnLogMapper;
+import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class VehicleWarnLogDaoImpl extends BaseDaoImpl<VehicleWarnLogMapper, VehicleWarnLog, Integer> implements VehicleWarnLogDao {
+
+    @Override
+    public Optional<VehicleWarnLog> findById(Integer id) {
+        return null;
+    }
+}

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

+package com.clx.performance.dao.vehiclewarn;
+
+import com.clx.performance.mapper.vehiclewarn.VehicleWarnLogMapper;
+import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+
+public interface VehicleWarnLogDao extends BaseDao<VehicleWarnLogMapper, VehicleWarnLog, Integer> {
+
+    Optional<VehicleWarnLog> findById(Integer id);
+
+}

performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java

@@ -2,17 +2,11 @@ package com.clx.performance.esplus.model;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.dromara.easyes.annotation.IndexField;
 import org.dromara.easyes.annotation.IndexId;
 import org.dromara.easyes.annotation.IndexName;
 import org.dromara.easyes.annotation.rely.FieldType;
 import org.dromara.easyes.annotation.rely.IdType;
-import org.elasticsearch.common.geo.GeoPoint;
-import org.springframework.data.annotation.Id;
 
 import java.math.BigDecimal;
 

performance-web/src/main/java/com/clx/performance/mapper/vehiclewarn/VehicleWarnLogMapper.java

+package com.clx.performance.mapper.vehiclewarn;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
+import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface VehicleWarnLogMapper extends BaseMapper<VehicleWarnLog> {
+    String TABLE = "vehicle_warn_log";
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnLog.java

+package com.clx.performance.model.vehiclewarn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 预警日志
+* @Date: 2024/04/26 10:32:01
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class VehicleWarnLog  implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private Integer infoId;                         //预警信息id
+    private Integer type;                           //类型：1暂停预警 2处理预警
+    private String childNo;                         //运单编号
+    private String warnName;                        //预警名称
+    private LocalDateTime warnTime;                 //预警时间
+    private Integer warnRang;                       //预警屏蔽范围：1运单 2货单 3无预警
+    private LocalDateTime warnEndTime;              //预警屏蔽结束时间
+    private String content;                         //内容
+    private String createBy;                        //创建人
+    private LocalDateTime createTime;               //创建时间
+    private LocalDateTime modifiedTime;             //修改时间
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+        return this.id;
+    }
+}

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

 package com.clx.performance.service.impl.vehiclewarn;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
+import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao;
+import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnLogEnum;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
+import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
+import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoResolveUpdateParam;
+import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoSuspendUpdateParam;
+import com.clx.performance.service.trace.TruckTraceService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnInfoService;
 import com.clx.performance.struct.vehiclewarn.VehicleWarnInfoStruct;
+import com.clx.performance.utils.LocalDateTimeUtils;
+import com.clx.performance.vo.pc.trace.DriverTraceVO;
+import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
+import com.clx.performance.vo.pc.vehiclewarn.VehicleTraceVO;
 import com.clx.performance.vo.pc.vehiclewarn.VehicleWarnInfoVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -16,10 +37,85 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
 
     @Autowired
     private VehicleWarnInfoDao vehicleWarnInfoDao;
+    @Autowired
+    private VehicleWarnLogDao vehicleWarnLogDao;
+    @Autowired
+    private OrderChildDao orderChildDao;
 
     @Autowired
     private VehicleWarnInfoStruct vehicleWarnInfoStruct;
 
+    @Autowired
+    private TruckTraceService truckTraceService;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateSuspend(VehicleWarnInfoSuspendUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
+        vehicleWarnInfo.setStatus(VehicleWarnInfoEnum.Status.SUSPEND.getCode());
+        vehicleWarnInfoDao.updateStatus(vehicleWarnInfo);
+
+        VehicleWarnLog vehicleWarnLog = new VehicleWarnLog();
+        vehicleWarnLog.setInfoId(vehicleWarnInfo.getId());
+        vehicleWarnLog.setType(VehicleWarnLogEnum.Type.SUSPEND.getCode());
+        vehicleWarnLog.setContent(VehicleWarnLogEnum.Type.SUSPEND.getMsg());
+        vehicleWarnLog.setChildNo(vehicleWarnInfo.getChildNo());
+        vehicleWarnLog.setWarnName(vehicleWarnInfo.getWarnName());
+        vehicleWarnLog.setWarnRang(param.getWarnRang());
+        vehicleWarnLog.setWarnEndTime(param.getWarnEndTime());
+        vehicleWarnLog.setCreateBy(loginUserInfo.getUserName());
+
+        vehicleWarnLogDao.saveEntity(vehicleWarnLog);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateResolve(VehicleWarnInfoResolveUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
+        vehicleWarnInfo.setStatus(VehicleWarnInfoEnum.Status.RESOLVE.getCode());
+        vehicleWarnInfoDao.updateStatus(vehicleWarnInfo);
+
+        VehicleWarnLog vehicleWarnLog = new VehicleWarnLog();
+        vehicleWarnLog.setInfoId(vehicleWarnInfo.getId());
+        vehicleWarnLog.setType(VehicleWarnLogEnum.Type.RESOLVE.getCode());
+        vehicleWarnLog.setContent(VehicleWarnLogEnum.Type.RESOLVE.getMsg());
+        vehicleWarnLog.setChildNo(vehicleWarnInfo.getChildNo());
+        vehicleWarnLog.setWarnName(vehicleWarnInfo.getWarnName());
+        vehicleWarnLog.setCreateBy(loginUserInfo.getUserName());
+
+        vehicleWarnLogDao.saveEntity(vehicleWarnLog);
+    }
+
+    @Override
+    public VehicleTraceVO getTrace(Integer id) {
+        VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findById(id).orElseThrow(ResultEnum.DATA_NOT_FIND);
+        OrderChild orderChild = orderChildDao.getByChildNo(vehicleWarnInfo.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
+
+        LocalDateTime beginTime = vehicleWarnInfo.getTakeTime();
+        LocalDateTime endTime = vehicleWarnInfo.getTakeTime();
+        if (orderChild.getArriveSendTime() != null) {endTime = orderChild.getArriveSendTime();}
+        if (orderChild.getLoadTime() != null) {endTime = orderChild.getLoadTime();}
+        if (orderChild.getArriveReceiveTime() != null) {endTime = orderChild.getArriveReceiveTime();}
+        if (orderChild.getUnloadTime() != null) {endTime = orderChild.getUnloadTime();}
+        if (orderChild.getConfirmTime() != null) {endTime = orderChild.getConfirmTime();}
+        if (orderChild.getSettleTime() != null) {endTime = orderChild.getSettleTime();}
+        if (orderChild.getFinishTime() != null) {endTime = orderChild.getFinishTime();}
+        if (endTime.isAfter(beginTime.plusDays(3))) {endTime = beginTime.plusDays(3);}      //最多查询3天
+
+        List<DriverTruckTraceVO> truckTraceList = truckTraceService.listTruckTraceByTime(orderChild.getTruckNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime));
+        List<DriverTraceVO> driverTraceList = truckTraceService.listDriverTraceByTime(orderChild.getDriverUserNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime));
+
+        VehicleTraceVO result = new VehicleTraceVO();
+        result.setDriverTraceList(driverTraceList);
+        result.setTruckTraceList(truckTraceList);
+
+        return result;
+    }
+
     @Override
     public VehicleWarnInfoVO getInfo(Integer id) {
         return vehicleWarnInfoStruct.convert(vehicleWarnInfoDao.findById(id).orNull());

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

@@ -7,6 +7,12 @@ import com.clx.performance.vo.pc.vehiclewarn.VehicleWarnInfoVO;
 
 public interface VehicleWarnInfoService {
 
+    void updateSuspend(VehicleWarnInfoSuspendUpdateParam param);
+
+    void updateResolve(VehicleWarnInfoResolveUpdateParam param);
+
+    VehicleTraceVO getTrace(Integer id);
+
     VehicleWarnInfoVO getInfo(Integer id);
     IPage<VehicleWarnInfoVO> pageInfo(PageVehicleWarnInfoParam param);