From 52b80b988e1c97a375293a428f8ba4c1ac068162 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 22 Mar 2023 14:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/basetyre/domain/BaseCar.java     | 13 ++++++++-----
 .../resources/mapper/basetyre/BaseCarMapper.xml     | 13 +++++++++----
 .../mapper/basetyre/BaseCarQueueMapper.xml          | 10 ++++++----
 .../resources/mapper/basetyre/BaseCarTypeMapper.xml |  2 +-
 .../resources/mapper/basetyre/BaseDeviceMapper.xml  |  2 +-
 .../realTimeMonitoring/carMonitoring/index.vue      |  8 ++++----
 ruoyi-ui/src/views/report/temppresspeed/index.vue   |  9 +++++++--
 ruoyi-ui/src/views/report/tyremileage/index.vue     | 13 +++++++++++++
 ruoyi-ui/src/views/tireManagement/info/index.vue    |  2 ++
 9 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 ruoyi-ui/src/views/report/tyremileage/index.vue

diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseCar.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseCar.java
index 121d2eb..d4ff4f4 100644
--- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseCar.java
+++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseCar.java
@@ -24,7 +24,7 @@ public class BaseCar extends BaseEntity
 
     /** 主键 */
     private String id;
-    private String tyreid;
+
 
     /** 企业编号 */
     @Excel(name = "企业编号")
@@ -135,14 +135,17 @@ public class BaseCar extends BaseEntity
     //车队id
     private String queueId;
 
+    private String carQueue;
+
     private List<BaseTyre> TyreList;
 
-    public String getTyreid() {
-        return tyreid;
+
+    public String getCarQueue() {
+        return carQueue;
     }
 
-    public void setTyreid(String tyreid) {
-        this.tyreid = tyreid;
+    public void setCarQueue(String carQueue) {
+        this.carQueue = carQueue;
     }
 
     public String getCartype() {
diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
index d3fdba4..9130b6a 100644
--- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
+++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="companyCode"    column="company_code"    />
         <result property="carQueueId"    column="car_queue_id"    />
+        <result property="carQueue"    column="car_queue"    />
         <result property="carTypeId"    column="car_type_id"    />
         <result property="cartype"    column="cartype"    />
         <result property="carLicense"    column="car_license"    />
@@ -76,9 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN base_car_queue bcq ON bc.car_queue_id = bcq.id
             LEFT JOIN base_car_type bct ON bct.id = bc.car_type_id
             <where>
+                bc.is_delete != '1'
                 <if test="id != null  and id != ''"> and  bc.id = #{id} </if>
                 <if test="carLicense != null  and carLicense != ''"> and  bc.car_license like concat('%', #{carLicense}, '%') </if>
-
             </where>
     </select>
 
@@ -129,13 +130,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bt.current_texture_depth,
         bt.state,
         bt.tyre_position,
-        bct.title as cartype
+        bct.title as cartype,
+        bcq.title as car_queue
         FROM
         base_car bc
         LEFT JOIN base_device bd ON bc.device_id = bd.internet_things_no
         LEFT JOIN base_car_type bct ON bc.car_type_id=bct.id
         LEFT JOIN base_tyre bt on bt.car_id=bc.id
-
+        LEFT JOIN base_car_queue bcq ON bc.car_queue_id = bcq.id
         <where>
             bc.is_delete != '1'
             <if test="id != null "> and bc.id = #{id}</if>
@@ -256,7 +258,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        </foreach>-->
 <!--    </delete>-->
     <update id="deleteBaseCarByIds" parameterType="String">
-
+        update base_car set is_delete = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </update>
     <update id="updateCarGPS" parameterType="BaseCar">
         update base_car
diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarQueueMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarQueueMapper.xml
index d41fed6..60c29f4 100644
--- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarQueueMapper.xml
+++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarQueueMapper.xml
@@ -26,7 +26,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="BaseCar" id="baseCarResult">
         <result property="id"    column="car_id"    />
         <result property="carLicense"    column="car_license"    />
-        <result property="isDelete"    column="is_delete"    />
     </resultMap>
 
     <sql id="selectBaseCarQueueVo">
@@ -65,11 +64,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 bcq.create_by,
                 bcq.create_name,
                 bc.id as car_id,
-                bc.car_license,
-                bc.is_delete
+                bc.car_license
             FROM
                 base_car_queue bcq
                 LEFT JOIN base_car bc on bcq.id = bc.car_queue_id
+        <where>
+            bcq.is_delete = '0' and bc.is_delete = '0'
+        <if test="title != null  and title != ''"> and bcq.title = #{title}</if>
+        </where>
     </select>
 
     <insert id="insertBaseCarQueue" parameterType="BaseCarQueue">
@@ -139,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBaseCarQueueByIds" parameterType="String">
-        delete from base_car_queue where id in 
+        update base_car_queue set is_delete = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarTypeMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarTypeMapper.xml
index c46d492..c555d6b 100644
--- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarTypeMapper.xml
+++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarTypeMapper.xml
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBaseCarTypeByIds" parameterType="String">
-        delete from base_car_type where id in 
+        update base_car_type set is_delete = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseDeviceMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseDeviceMapper.xml
index 91fec58..d99bf49 100644
--- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseDeviceMapper.xml
+++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseDeviceMapper.xml
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBaseDeviceByIds" parameterType="String">
-        delete from base_device where id in 
+        update base_device set is_delete = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
index f377499..83e95a2 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
@@ -270,7 +270,7 @@
 </template>
 
 <script setup>
-import {listBaseCar, getCarGpsList, getTyreList} from '@/api/realTimeMonitoring/carMonitoring'
+import {listBaseCar, getCarGpsList,getTyreList} from '@/api/realTimeMonitoring/carMonitoring'
 import AMapLoader from '@amap/amap-jsapi-loader';
 import {useI18n} from "vue-i18n";
 import {ref} from 'vue'
@@ -365,14 +365,14 @@ const tableChange = async (e) => {
     title.push(parseInt(res.split('-')[1]))
   })
   TireRow.value = title
-  let tyreListData = info[0].tyreList.map(e => {
+  let tyreListData = info[0].tyreList.map(e=>{
     return {
       ...e,
-      tyrePositionS: e.tyrePosition?.split('-')[0] + '-' + e.tyrePosition?.split('-')[1] + '-' + e.tyrePosition?.split('-')[2]
+      tyrePositionS : e.tyrePosition?.split('-')[0] + '-' + e.tyrePosition?.split('-')[1] + '-' + e.tyrePosition?.split('-')[2]
     }
   })
   tyreList.value = tyreListData
-  tyreDataList.value = tyreListData.map(e => e.tyrePositionS)
+  tyreDataList.value = tyreListData.map(e=>e.tyrePositionS)
   console.log(tyreList.value)
   let timeOut = () => {
     setTimeout(() => {
diff --git a/ruoyi-ui/src/views/report/temppresspeed/index.vue b/ruoyi-ui/src/views/report/temppresspeed/index.vue
index ded3939..554cabe 100644
--- a/ruoyi-ui/src/views/report/temppresspeed/index.vue
+++ b/ruoyi-ui/src/views/report/temppresspeed/index.vue
@@ -12,7 +12,7 @@
                 @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px;">
+      <el-form-item label="时间" style="width: 308px;">
         <el-date-picker
                 v-model="dateRange"
                 value-format="YYYY-MM-DD"
@@ -40,7 +40,7 @@
       <temp  />
     </el-row>
     <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
+      <el-col :xs="24" :sm="24" :lg="8" @click="handleTyreMileage">
         <div class="chart-wrapper">
           <raddar-chart />
         </div>
@@ -104,6 +104,11 @@
     });
     //getList();
   }
+  /** 搜索按钮操作 */
+  function handleTyreMileage() {
+
+    // this.$tab.openPage("用户管理", "/system/user");
+  }
   /** 重置按钮操作 */
   const resetQuery = () => {
     proxy.resetForm("queryRef");
diff --git a/ruoyi-ui/src/views/report/tyremileage/index.vue b/ruoyi-ui/src/views/report/tyremileage/index.vue
new file mode 100644
index 0000000..7d94b09
--- /dev/null
+++ b/ruoyi-ui/src/views/report/tyremileage/index.vue
@@ -0,0 +1,13 @@
+<template>
+    
+</template>
+
+<script>
+    export default {
+        name: "index"
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/tireManagement/info/index.vue b/ruoyi-ui/src/views/tireManagement/info/index.vue
index 2c2b918..bdf408a 100644
--- a/ruoyi-ui/src/views/tireManagement/info/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/info/index.vue
@@ -242,10 +242,12 @@
 <script setup name="basetyre">
 import {addBasetyre, delBasetyre, getBasetyre, listBasetyre, updateBasetyre} from "@/api/tireManagement/info";
 
+
 import {useI18n} from 'vue-i18n';
 import Cookies from "js-cookie";
 import { getToken } from "@/utils/auth";
 
+
 const {t} = useI18n();
 
 const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'