From 13796df077a2ccba587667e233f7cb48ea6c73b6 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 29 十二月 2025 16:59:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java | 3 +
tms/src/main/java/com/ruoyi/tms/domain/vo/DpDriverDispatchVo.java | 18 +++++++++
tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml | 21 ++++++++++
tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java | 6 +++
tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java | 3 +
api/src/main/java/com/ruoyi/api/third/controller/DpApiController.java | 39 +++++++++++++++++++
6 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/DpApiController.java b/api/src/main/java/com/ruoyi/api/third/controller/DpApiController.java
new file mode 100644
index 0000000..e366121
--- /dev/null
+++ b/api/src/main/java/com/ruoyi/api/third/controller/DpApiController.java
@@ -0,0 +1,39 @@
+package com.ruoyi.api.third.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.cwgl.domain.RequestLog;
+import com.ruoyi.cwgl.domain.dto.ReturnReportDto;
+import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
+import com.ruoyi.cwgl.service.IKeyCollectionInfoService;
+import com.ruoyi.cwgl.service.IRequestLogService;
+import com.ruoyi.tms.domain.TmsCarKeyDispatch;
+import com.ruoyi.tms.service.ITmsCarKeyDispatchService;
+import com.ruoyi.tms.service.ITmsDispatchOrderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Random;
+
+
+/**
+ * 澶у睆api
+ * @author wjw
+ */
+@RestController
+@RequestMapping("/api/third/dp")
+public class DpApiController {
+
+ private static Logger logger = LoggerFactory.getLogger(DpApiController.class);
+
+ @Autowired
+ private ITmsDispatchOrderService dispatchOrderService;
+
+ @GetMapping("/data1")
+ public AjaxResult dpData(){
+
+ return AjaxResult.success(dispatchOrderService.selectDpData());
+ }
+}
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/vo/DpDriverDispatchVo.java b/tms/src/main/java/com/ruoyi/tms/domain/vo/DpDriverDispatchVo.java
new file mode 100644
index 0000000..ef14118
--- /dev/null
+++ b/tms/src/main/java/com/ruoyi/tms/domain/vo/DpDriverDispatchVo.java
@@ -0,0 +1,18 @@
+package com.ruoyi.tms.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class DpDriverDispatchVo {
+
+ private String driverName;
+ private String licensePlate;
+ private String status;
+ private String startRegionName;
+ private String endRegionName;
+
+}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java
index ad3fffe..475232f 100644
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java
+++ b/tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
import com.ruoyi.tms.domain.vo.DriverDispatchVo;
@@ -88,4 +89,6 @@
public List<DriverDispatchVo> selectAssignedItineraryList(DriverDispatchVo vo);
public DriverDispatchVo selectAssignedItineraryDetail(DriverDispatchVo vo);
+
+ List<DpDriverDispatchVo> selectselectDpData();
}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
index bf4c077..70d3f05 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -6,6 +6,7 @@
import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tms.domain.TmsDriverDispatch;
+import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
/**
* 璋冨害鍗曠鐞哠ervice鎺ュ彛
@@ -129,4 +130,6 @@
public AjaxResult ysGenerateTmsDispatchOrder(List<Integer> ids);
public AjaxResult yfGenerateTmsDispatchOrder(List<Integer> ids);
public AjaxResult getServiceProvider(Integer id);
+
+ List<DpDriverDispatchVo> selectDpData();
}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
index f3945f2..a4d4696 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.ISystemDataNoService;
import com.ruoyi.tms.domain.*;
+import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
import com.ruoyi.tms.domain.vo.DriverDispatchVo;
import com.ruoyi.tms.domain.vo.ServiceProviderVo;
import com.ruoyi.tms.mapper.*;
@@ -1052,4 +1053,9 @@
}
return AjaxResult.success();
}
+
+ @Override
+ public List<DpDriverDispatchVo> selectDpData() {
+ return tmsDispatchOrderMapper.selectselectDpData();
+ }
}
diff --git a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
index f874eb2..6f6739d 100644
--- a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
@@ -621,5 +621,26 @@
where tdo.id = #{dispatchId} and tdd.driver_id = #{driverId};
</select>
+ <select id="selectselectDpData" resultType="com.ruoyi.tms.domain.vo.DpDriverDispatchVo">
+ SELECT
+ tdo.main_driver_name as driverName,
+ tdo.license_plate as licensePlate,
+ tdo.status,
+ src.region_name AS startRegionName,
+
+ erc.region_name AS endRegionName
+FROM (
+ SELECT id
+ FROM tms_dispatch_order
+ WHERE `status` IN (2, 3)
+ and is_customs=0
+ ORDER BY confirm_time DESC
+ LIMIT 50
+) tmp
+JOIN tms_dispatch_order tdo ON tmp.id = tdo.id
+LEFT JOIN tms_region src ON SUBSTRING_INDEX(tdo.start_region_code, ',', -1) = src.region_code
+LEFT JOIN tms_region erc ON SUBSTRING_INDEX(tdo.end_region_code, ',', -1) = erc.region_code
+ORDER BY tdo.confirm_time DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0