Merge branch 'v16.0_screen_20240522' of https://t.clxkj.cn/clx-java/clx-performance into test

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildPoundInfoVO.java

@@ -42,11 +42,8 @@ public class OrderChildPoundInfoVO {
     private Integer poundStatus;
     @ApiModelProperty(value = "磅单审核驳回原因", example = "交货信息错误")
     private String poundRemark;
-    @ApiModelProperty(value = "审核驳回类型：1装车 2卸车 3装车+卸车", example = "1")
+    @ApiModelProperty(value = "磅单审核驳回类型：1装车 2卸车 3装车+卸车", example = "1")
     private Integer poundRejectType;
-    public Integer getPoundRejectType() {
-        return rejectType;
-    }
 
     @ApiModelProperty(value = "状态", example = "0")
     private Integer status;
@@ -57,8 +54,4 @@ public class OrderChildPoundInfoVO {
     @ApiModelProperty(value = "卸车磅单图片列表")
     private List<String> unloadImageList;
 
-    @JsonIgnore
-    @ApiModelProperty(value = "审核驳回类型：1装车 2卸车 3装车+卸车", example = "1", hidden = true)
-    private Integer rejectType;
-
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -182,13 +182,6 @@ public class OrderChildVO {
     private String lastLoadTime;
 
 
-    //运单详情增加字段
-    @ApiModelProperty(value = "亏吨重量", example = "1.23")
-    private BigDecimal lossWeight;
-    @ApiModelProperty(value = "亏吨扣款", example = "1.23")
-    @MoneyOutConvert
-    private BigDecimal lossAmount;
-
     //结算信息
     @ApiModelProperty(value = "实际运费", example = "1.23")
     @MoneyOutConvert
@@ -204,6 +197,14 @@ public class OrderChildVO {
     private BigDecimal settlementFreight;
 
 
+
+    //运单详情增加字段
+    @ApiModelProperty(value = "亏吨重量", example = "1.23")
+    private BigDecimal lossWeight;
+    @ApiModelProperty(value = "亏吨扣款", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossAmount;
+
     @ApiModelProperty("可卸车时间段开始")
     private String unloadBeginTime;
 
@@ -219,4 +220,4 @@ public class OrderChildVO {
     private String notOpenZJXLMsg;
 
 
-}
\ No newline at end of file
+}

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckWaitVO.java

@@ -77,9 +77,6 @@ public class CollectTruckWaitVO {
 
     @ApiModelProperty(value = "预计等待时长", example = "")
     private BigDecimal stationTime;
-    public BigDecimal getStationTime() {
-        return stationInTime;
-    }
 
     @ApiModelProperty(value = "预计等待时长图片", example = "")
     private List<String> stationImageList;

performance-web/pom.xml

@@ -303,6 +303,7 @@
         </dependency>
 
 
+
     </dependencies>
 
 

performance-web/src/main/java/com/clx/performance/dao/TruckPositionDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.TruckPositionMapper;
+import com.clx.performance.model.TruckPosition;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * 车辆位置;
+ *
+ * @author : jiangwenye
+ * @date : 2024-05-29
+ */
+public interface TruckPositionDao extends BaseDao<TruckPositionMapper, TruckPosition, Integer> {
+
+    void updateTruckPositionStatus(Integer deleteStatus, List<String> truckNoList);
+
+    void replaceTruckPosition(List<TruckPosition> truckPositionList);
+
+}

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

+package com.clx.performance.dao.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.dao.TruckPositionDao;
+import com.clx.performance.mapper.TruckPositionMapper;
+import com.clx.performance.model.TruckPosition;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 车辆位置;
+ *
+ * @author : jiangwenye
+ * @date : 2024-05-29
+ */
+@Repository
+public class TruckPositionDaoImpl extends BaseDaoImpl<TruckPositionMapper, TruckPosition, Integer>
+        implements TruckPositionDao {
+
+    @Override
+    public void updateTruckPositionStatus(Integer deleteStatus, List<String> truckNoList) {
+        update(lUdWrapper()
+                .set(TruckPosition::getDeleteStatus, deleteStatus)
+                .set(TruckPosition::getChildNo, "")
+                .set(TruckPosition::getChildStatus, "")
+                .set(TruckPosition::getChildProvince, "")
+                .set(TruckPosition::getTruckProvince, "")
+                .set(TruckPosition::getLatitude, "")
+                .set(TruckPosition::getLongitude, "")
+                .notIn(CollectionUtil.isNotEmpty(truckNoList), TruckPosition::getTruckNo, truckNoList)
+        );
+    }
+
+    @Override
+    public void replaceTruckPosition(List<TruckPosition> truckPositionList) {
+        baseMapper.replaceTruckPosition(truckPositionList);
+    }
+}

performance-web/src/main/java/com/clx/performance/job/position/TruckPositionJob.java

+package com.clx.performance.job.position;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.order.enums.DeleteStatusEnum;
+import com.clx.performance.constant.RedisConstants;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.TruckPositionDao;
+import com.clx.performance.dto.zjxl.TruckTraceDTO;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.TruckPosition;
+import com.clx.performance.service.trace.TruckTraceService;
+import com.clx.performance.utils.zjxl.ZjxlGpsService;
+import com.clx.performance.vo.pc.trace.DriverTraceVO;
+import com.clx.user.feign.UserClxFeign;
+import com.msl.common.enums.ResultCodeEnum;
+import com.msl.common.job.JobLog;
+import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 车辆位置;
+ *
+ * @author : jiangwenye
+ * @date : 2024-05-29
+ */
+@Slf4j
+@Component
+public class TruckPositionJob {
+
+    @Autowired(required = false)
+    UserClxFeign userClxFeign;
+    @Autowired
+    ZjxlGpsService zjxlGpsService;
+    @Autowired
+    RedisTemplate redisTemplate;
+    @Autowired
+    OrderChildDao orderChildDao;
+    @Autowired
+    TruckTraceService truckTraceService;
+    @Autowired
+    TruckPositionDao truckPositionDao;
+
+    /**
+     * 车辆位置
+     */
+    @XxlJob("truckPosition")
+    public void truckPosition() {
+        try {
+            getPlatformTruckPosition();
+        } catch (Exception e) {
+            log.warn("定时任务获取平台车辆当前定位信息失败，异常原因:{}",e);
+            JobLog.error("定时任务获取平台车辆当前定位信息失败，异常原因=====================", e);
+        }
+    }
+
+    /**
+     * @Author kavin
+     * @Description 定时获取平台车辆的定位
+     * @Param []
+     * @return
+     **/
+    public void getPlatformTruckPosition(){
+        Result<List<String>> result = userClxFeign.getPlatformTruckList();
+        log.info("通过clx-user服务获取平台认证成功车辆，返回结果:{}", JSON.toJSONString(result));
+
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime beginTime = now.plus(-5, ChronoUnit.MINUTES);
+        String beginTimeStr = DateUtils.formatDateTime(beginTime, "yyyy-MM-dd HH:mm:ss").get();
+        String endTimeStr = DateUtils.formatDateTime(now, "yyyy-MM-dd HH:mm:ss").get();
+        if(Objects.equals(result.getCode(), ResultCodeEnum.SUCCESS.getCode())){
+            List<TruckPosition> truckPositionList = new ArrayList<>();
+            List<String> truckNos = result.getData();
+            //批量处理不在内的车牌号均至为失效，位置为空
+            truckPositionDao.updateTruckPositionStatus(DeleteStatusEnum.YES.getCode(),truckNos);
+
+            //有效运单集合
+            List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
+            Map<String, OrderChild> truckChildStatusMap = orderChildList.stream()
+                    .collect(Collectors.toMap(item -> item.getTruckNo(), item -> item,(v1,v2) -> v1));
+
+            //获取缓存中所有车辆位置信息
+            Map<String, TruckTraceDTO> truckTraceMap =
+                    redisTemplate.opsForHash().entries(RedisConstants.ZJXL_TRUCK_TRACE_LIST);
+
+            //既没接单 又没有中交兴路坐标的车辆集合
+            List<String> noZJXLNoChildTruckNos = new ArrayList<>();
+
+            for(String truckNo : truckNos){
+
+                TruckTraceDTO trace = truckTraceMap.get(truckNo);
+                OrderChild child = truckChildStatusMap.get(truckNo);
+
+                if(Objects.isNull(trace)){
+                    //无中交轨迹
+                    if(Objects.isNull(child)){
+                        noZJXLNoChildTruckNos.add(truckNo);
+                    }else{
+                        List<DriverTraceVO> traceVOS =
+                                truckTraceService.listDriverTraceByTime(child.getDriverUserNo(),beginTimeStr,endTimeStr);
+                        TruckPosition position = new TruckPosition();
+                        position.setTruckNo(truckNo);
+                        position.setChildNo(child.getChildNo());
+                        position.setLatitude(traceVOS.get(0).getLatitude());
+                        position.setLongitude(traceVOS.get(0).getLongitude());
+                        position.setDeleteStatus(DeleteStatusEnum.NO.getCode());
+                        truckPositionList.add(position);
+                    }
+                }else{
+                    //有中交轨迹
+                    BigDecimal[] location = trace.getLocation();
+                    TruckPosition position = new TruckPosition();
+                    position.setTruckNo(truckNo);
+                    position.setLatitude(location[0]);
+                    position.setLongitude(location[1]);
+                    position.setDeleteStatus(DeleteStatusEnum.NO.getCode());
+                    if(Objects.nonNull(child)){
+                        position.setChildNo(child.getChildNo());
+                    }
+                    truckPositionList.add(position);
+                }
+            }
+            //保存
+            truckPositionDao.replaceTruckPosition(truckPositionList);
+        }else{
+            log.info("通过clx-user服务获取平台认证成功车辆，获取失败");
+        }
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/mapper/TruckPositionMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.TruckPosition;
+import com.clx.performance.sqlProvider.TruckPositionProvider;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆位置;
+ *
+ * @author : jiangwenye
+ * @date : 2024-05-29
+ */
+@Mapper
+public interface TruckPositionMapper extends BaseMapper<TruckPosition> {
+
+    @InsertProvider(type = TruckPositionProvider.class, method = "replaceTruckPosition")
+    void replaceTruckPosition(List<TruckPosition> truckPositionList);
+
+}

performance-web/src/main/java/com/clx/performance/model/TruckPosition.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 车辆位置;
+ *
+ * @author : jiangwenye
+ * @date : 2024-05-29
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("truck_position")
+public class TruckPosition implements HasKey<Integer> {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 车牌号
+     */
+    @TableField("truck_no")
+    private String truckNo;
+    /**
+     * 运单编号
+     */
+    @TableField("child_no")
+    private String childNo;
+    /**
+     * 运单状态
+     */
+    @TableField("child_status")
+    private Integer childStatus;;
+    /**
+     * 运单目的地所在省份
+     */
+    @TableField("child_province")
+    private String childProvince;
+    /**
+     * 车辆位置所在省份
+     */
+    @TableField("truck_province")
+    private String truckProvince;
+    /**
+     * 经度
+     */
+    @TableField("longitude")
+    private BigDecimal longitude;
+    /**
+     * 纬度
+     */
+    @TableField("latitude")
+    private BigDecimal latitude;
+    /**
+     * 删除状态: 0-否;1-是
+     */
+    @TableField("delete_status")
+    private Integer deleteStatus;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    private LocalDateTime modifiedTime;
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+}

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

 package com.clx.performance.service.impl;
 
 import cn.hutool.json.JSONUtil;
+import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.OrderEnum;
@@ -63,8 +64,8 @@ import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;
@@ -1195,7 +1196,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.SETTLEMENT.getCode(),
                 OrderChildLogEnum.Type.SETTLEMENT.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
-        
+
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/sqlProvider/TruckPositionProvider.java

+package com.clx.performance.sqlProvider;
+
+import com.clx.order.enums.DeleteStatusEnum;
+import com.clx.performance.model.TruckPosition;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 车辆位置;
+ *
+ * @author : jiangwenye
+ * @date : 2024-05-29
+ */
+public class TruckPositionProvider {
+
+    public String replaceTruckPosition(List<TruckPosition> truckPositionList) {
+        StringBuffer sqlList = new StringBuffer();
+
+        sqlList.append(" REPLACE INTO truck_position " +
+                "(truck_no,child_no,child_status,child_province,truck_province," +
+                "longitude,latitude,delete_status) " +
+                " VALUES ");
+        for (int i = 0; i < truckPositionList.size(); i++) {
+            TruckPosition tp = truckPositionList.get(i);
+            sqlList.append(" ('")
+                    .append(tp.getTruckNo()).append("','")
+                    .append(StringUtils.isEmpty(tp.getChildNo())?"":tp.getChildNo()).append("',")
+                    .append(Objects.isNull(tp.getChildStatus())?0:tp.getChildStatus()).append(",'")
+                    .append(StringUtils.isEmpty(tp.getChildProvince())?"":tp.getChildProvince()).append("','")
+                    .append(StringUtils.isEmpty(tp.getTruckProvince())?"":tp.getTruckProvince()).append("',")
+                    .append(Objects.isNull(tp.getLongitude())?0:tp.getLongitude()).append(",")
+                    .append(Objects.isNull(tp.getLatitude())?0:tp.getLatitude()).append(",")
+                    .append(DeleteStatusEnum.NO.getCode())
+                    .append(")");
+            if (i < truckPositionList.size() - 1) {
+                sqlList.append(",");
+            }
+        }
+        return sqlList.toString();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckWaitStruct.java

@@ -4,12 +4,14 @@ import com.clx.performance.model.collect.CollectTruckWait;
 import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 import java.util.Objects;
 
 @Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {Objects.class})
 public interface CollectTruckWaitStruct {
 
+    @Mapping(target = "stationTime", source = "stationInTime")
     CollectTruckWaitVO convert(CollectTruckWait item);
 
 }