From 9bde3b8cce8c4d61824e5ff2db2ec0ab751a5253 Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Thu, 27 Mar 2025 15:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8D=95=E4=BD=8D=E5=86=85=E5=A4=96=E7=9A=84=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3sql,=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E8=BE=86=E5=9C=B0=E5=9D=80=E5=92=8C=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ykMap/entity/response/CarGPSResponse.java | 10 ++++++
 .../entity/response/CarPageResponse.java      | 12 +++++++
 .../ykMap/service/impl/CarServiceImpl.java    | 12 +++++++
 .../com/ykMap/mapper/TaskMissionMapper.xml    | 33 ++++++++++---------
 4 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ykMap/entity/response/CarGPSResponse.java b/src/main/java/com/ykMap/entity/response/CarGPSResponse.java
index 2327706..3f682cf 100644
--- a/src/main/java/com/ykMap/entity/response/CarGPSResponse.java
+++ b/src/main/java/com/ykMap/entity/response/CarGPSResponse.java
@@ -28,4 +28,14 @@ public class CarGPSResponse implements Serializable {
      * 84坐标系纬度
      */
     public String lng;
+
+    /**
+     * 车辆所在地址
+     */
+    public String addr;
+
+    /**
+     * 车辆在线状态
+     */
+    public String stateCn;
 }
diff --git a/src/main/java/com/ykMap/entity/response/CarPageResponse.java b/src/main/java/com/ykMap/entity/response/CarPageResponse.java
index 748cd0d..89d45b0 100644
--- a/src/main/java/com/ykMap/entity/response/CarPageResponse.java
+++ b/src/main/java/com/ykMap/entity/response/CarPageResponse.java
@@ -27,4 +27,16 @@ public class CarPageResponse implements Serializable {
      */
     @ApiModelProperty(value = "车辆关联任务")
     public String taskTitle;
+
+    /**
+     * 车辆所在地址
+     */
+    @ApiModelProperty(value = "车辆所在地址")
+    public String addr;
+
+    /**
+     * 车辆在线状态
+     */
+    @ApiModelProperty(value = "车辆在线状态")
+    public String stateCn;
 }
diff --git a/src/main/java/com/ykMap/service/impl/CarServiceImpl.java b/src/main/java/com/ykMap/service/impl/CarServiceImpl.java
index e4c55b0..63a9293 100644
--- a/src/main/java/com/ykMap/service/impl/CarServiceImpl.java
+++ b/src/main/java/com/ykMap/service/impl/CarServiceImpl.java
@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -95,6 +96,17 @@ public class CarServiceImpl implements CarService {
         colDTOS.add(colDTO);
         colDTOS.add(colDTO2);
         contentResponse.setCol(colDTOS);
+        // 将第一个列表转换为Map，以getCarPlate为键
+        Map<String, CarGPSResponse> map1 = list.stream()
+                .collect(Collectors.toMap(CarGPSResponse::getCarPlate, car -> car));
+        // 遍历第二个列表，找到匹配的carNumber并赋值addr和stateCn
+        for (CarPageResponse car2 : carPageResponsePage.getRecords()) {
+            CarGPSResponse car1 = map1.get(car2.getCarNumber());
+            if (car1 != null) {
+                car2.setAddr(car1.getAddr());
+                car2.setStateCn(car1.getStateCn());
+            }
+        }
         contentResponse.setData(carPageResponsePage.getRecords());
         return contentResponse;
     }
diff --git a/src/main/resources/com/ykMap/mapper/TaskMissionMapper.xml b/src/main/resources/com/ykMap/mapper/TaskMissionMapper.xml
index 036e4bc..1e5262a 100644
--- a/src/main/resources/com/ykMap/mapper/TaskMissionMapper.xml
+++ b/src/main/resources/com/ykMap/mapper/TaskMissionMapper.xml
@@ -34,21 +34,24 @@
     </select>
 
     <select id="pageByPlateNums" resultType="com.ykMap.entity.response.CarPageResponse">
-        SELECT COALESCE(tm.name, '-') as taskTitle,vi.plate_num as carNumber
-        FROM vehicle_info vi
-        INNER JOIN (
-        SELECT original_vehicle_id, MAX(update_time) AS latest_update_time
-        FROM task_mission
-        WHERE update_time IS NOT NULL
-        GROUP BY original_vehicle_id
-        ) AS latest_tasks ON vi.id = latest_tasks.original_vehicle_id
-        INNER JOIN task_mission tm ON latest_tasks.original_vehicle_id = tm.original_vehicle_id
-        AND latest_tasks.latest_update_time = tm.update_time
-        WHERE vi.plate_num IN
-        <foreach item="plateNum" collection="list" open="(" separator="," close=")">
-            #{plateNum}
-        </foreach>
-        ORDER BY tm.update_time DESC
+        SELECT COALESCE
+        ( tm.NAME, '-' ) AS taskTitle,
+        vi.plate_num AS carNumber
+        FROM
+        ( SELECT * FROM vehicle_info WHERE `state` IN ( '保养中', '损坏', '正常' ) AND `category` IN ( '维护车', '文物车',
+        '硬币车', '运钞车' )
+        <if test="list.size > 0 and list != null">
+            and vi.plate_num IN
+            <foreach item="plateNum" collection="list" open="(" separator="," close=")">
+                #{plateNum}
+            </foreach>
+        </if>
+        ) AS vi
+        LEFT JOIN ( SELECT original_vehicle_id, MAX( departure_time ) AS latest_departure_time FROM task_mission
+        WHERE departure_time<= CURRENT_TIME
+        GROUP BY original_vehicle_id ) AS latest_tasks ON VI.ID = latest_tasks.original_vehicle_id
+        LEFT JOIN task_mission AS tm ON latest_tasks.original_vehicle_id = tm.original_vehicle_id
+        AND latest_tasks.latest_departure_time = tm.departure_time
     </select>